Add a few casts to avoid trouble in C++.

git-svn-id: https://svn.dealii.org/trunk@14995 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/contrib/umfpack/AMD/Source/amd_order.c b/deal.II/contrib/umfpack/AMD/Source/amd_order.c
index d3f6853d16a7723194116b946c4f1c1e35b5faa0..f14fab541230d3fcdae70f36e2f98335a1b3ea45 100644 (file)
--- a/deal.II/contrib/umfpack/AMD/Source/amd_order.c
+++ b/deal.II/contrib/umfpack/AMD/Source/amd_order.c
@@ -90,8 +90,8 @@ GLOBAL Int AMD_order
     }
 
     /* allocate two size-n integer workspaces */
-    Len = amd_malloc (n * sizeof (Int)) ;
-    Pinv = amd_malloc (n * sizeof (Int)) ;
+    Len = (Int*)amd_malloc (n * sizeof (Int)) ;
+    Pinv = (Int*)amd_malloc (n * sizeof (Int)) ;
     mem += n ;
     mem += n ;
     if (!Len || !Pinv)
@@ -107,8 +107,8 @@ GLOBAL Int AMD_order
     {
        /* sort the input matrix and remove duplicate entries */
        AMD_DEBUG1 (("Matrix is jumbled\n")) ;
-       Rp = amd_malloc ((n+1) * sizeof (Int)) ;
-       Ri = amd_malloc (MAX (nz,1) * sizeof (Int)) ;
+       Rp = (Int*)amd_malloc ((n+1) * sizeof (Int)) ;
+       Ri = (Int*)amd_malloc (MAX (nz,1) * sizeof (Int)) ;
        mem += (n+1) ;
        mem += MAX (nz,1) ;
        if (!Rp || !Ri)
@@ -161,7 +161,7 @@ GLOBAL Int AMD_order
     ok = ok && (slen < Int_MAX) ;      /* S[i] for Int i must be OK */
     if (ok)
     {
-       S = amd_malloc (slen * sizeof (Int)) ;
+       S = (Int*)amd_malloc (slen * sizeof (Int)) ;
     }
     AMD_DEBUG1 (("slen %g\n", (double) slen)) ;
     if (!S)