Convert expressions explicitly to int before passing them to printf.

Use #ifdef HAVE_CCTK_REAL4 instead of #ifdef CCTK_REAL4.


git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/Boundary/trunk@290 6a38eb6e-646e-4a02-a296-d141613ad6c4

5 files changed, 11 insertions, 11 deletions

diff --git a/src/CopyBoundary.c b/src/CopyBoundary.c
index 2caaf66..1f285fb 100644
--- a/src/CopyBoundary.c
+++ b/src/CopyBoundary.c
@@ -132,7 +132,7 @@ CCTK_INT BndCopy(const cGH *GH, CCTK_INT num_vars, CCTK_INT *vars,
       CCTK_VWarn(1, __LINE__, __FILE__, CCTK_THORNSTRING,
                  "Faces specification %d for Copy boundary conditions on "
                  "%s is not implemented yet.  "
-                 "Applying Copy bcs to all (external) faces.", faces[i],
+                 "Applying Copy bcs to all (external) faces.", (int)faces[i],
                  CCTK_VarName(vars[i]));
     }
     dir = 0; /* apply bc to all faces */
diff --git a/src/FlatBoundary.c b/src/FlatBoundary.c
index e6cb733..dd597de 100644
--- a/src/FlatBoundary.c
+++ b/src/FlatBoundary.c
@@ -127,7 +127,7 @@ CCTK_INT BndFlat(const cGH *GH, CCTK_INT num_vars, CCTK_INT *vars,
       CCTK_VWarn(1, __LINE__, __FILE__, CCTK_THORNSTRING,
                  "Faces specification %d for Flat boundary conditions on "
                  "%s is not implemented yet.  "
-                 "Applying Flat bcs to all (external) faces.", faces[i],
+                 "Applying Flat bcs to all (external) faces.", (int)faces[i],
                  CCTK_VarName(vars[i]));
     }
     dir = 0; /* apply bc to all faces */
diff --git a/src/RadiationBoundary.c b/src/RadiationBoundary.c
index 479c8bf..f61b4b2 100644
--- a/src/RadiationBoundary.c
+++ b/src/RadiationBoundary.c
@@ -210,7 +210,7 @@ CCTK_INT BndRadiative(const cGH *GH, CCTK_INT num_vars, CCTK_INT *vars,
       CCTK_VWarn(1, __LINE__, __FILE__, CCTK_THORNSTRING,
                  "Faces specification %d for Radiative boundary conditions on "
                  "%s is not implemented yet.  "
-                 "Applying Radiative bcs to all (external) faces.", faces[i],
+                 "Applying Radiative bcs to all (external) faces.", (int)faces[i],
                  CCTK_VarName(vars[i]));
     }
     dir = 0; /* apply bc to all faces */
@@ -1620,19 +1620,19 @@ static int ApplyBndRadiative (const cGH *GH,
         RADIATIVE_BOUNDARY (GH->cctk_lsh, widths, CCTK_REAL);
         break;
 
-#ifdef CCTK_REAL4
+#ifdef HAVE_CCTK_REAL4
       case CCTK_VARIABLE_REAL4:
         RADIATIVE_BOUNDARY (GH->cctk_lsh, widths, CCTK_REAL4);
         break;
 #endif
 
-#ifdef CCTK_REAL8
+#ifdef HAVE_CCTK_REAL8
       case CCTK_VARIABLE_REAL8:
         RADIATIVE_BOUNDARY (GH->cctk_lsh, widths, CCTK_REAL8);
         break;
 #endif
 
-#ifdef CCTK_REAL16
+#ifdef HAVE_CCTK_REAL16
       case CCTK_VARIABLE_REAL16:
         RADIATIVE_BOUNDARY (GH->cctk_lsh, widths, CCTK_REAL16);
         break;
diff --git a/src/RobinBoundary.c b/src/RobinBoundary.c
index c40e155..23de67e 100644
--- a/src/RobinBoundary.c
+++ b/src/RobinBoundary.c
@@ -133,7 +133,7 @@ CCTK_INT BndRobin(const cGH *GH, CCTK_INT num_vars, CCTK_INT *vars,
       CCTK_VWarn(1, __LINE__, __FILE__, CCTK_THORNSTRING,
                  "Faces specification %d for Robin boundary conditions on "
                  "%s is not implemented yet.  "
-                 "Applying Robin bcs to all (external) faces.", faces[i],
+                 "Applying Robin bcs to all (external) faces.", (int)faces[i],
                  CCTK_VarName(vars[i]));
     }
 
@@ -983,17 +983,17 @@ static int ApplyBndRobin (const cGH *GH,
       case CCTK_VARIABLE_REAL:
         ROBIN_BOUNDARY (CCTK_REAL); break;
 
-#ifdef CCTK_REAL4
+#ifdef HAVE_CCTK_REAL4
       case CCTK_VARIABLE_REAL4:
         ROBIN_BOUNDARY (CCTK_REAL4); break;
 #endif
 
-#ifdef CCTK_REAL8
+#ifdef HAVE_CCTK_REAL8
       case CCTK_VARIABLE_REAL8:
         ROBIN_BOUNDARY (CCTK_REAL8); break;
 #endif
 
-#ifdef CCTK_REAL16
+#ifdef HAVE_CCTK_REAL16
       case CCTK_VARIABLE_REAL16:
         ROBIN_BOUNDARY (CCTK_REAL16); break;
 #endif
diff --git a/src/StaticBoundary.c b/src/StaticBoundary.c
index 1fe5656..fdd11ac 100644
--- a/src/StaticBoundary.c
+++ b/src/StaticBoundary.c
@@ -122,7 +122,7 @@ CCTK_INT BndStatic(const cGH *GH, CCTK_INT num_vars, CCTK_INT *vars,
       CCTK_VWarn(1, __LINE__, __FILE__, CCTK_THORNSTRING,
                  "Faces specification %d for Static boundary conditions on "
                  "%s is not implemented yet.  "
-                 "Applying Static bcs to all (external) faces.", faces[i],
+                 "Applying Static bcs to all (external) faces.", (int)faces[i],
                  CCTK_VarName(vars[i]));
     }
     dir = 0;