Use #ifdef HAVE_CCTK_* instead of #ifdef CCTK_* to check for variable types.

git-svn-id: http://svn.cactuscode.org/arrangements/CactusNumerical/ReflectionSymmetry/trunk@14 082bdb00-0f4f-0410-b49e-b1835e5f2039

1 files changed, 30 insertions, 29 deletions

diff --git a/src/apply.c b/src/apply.c
index ea1df0c..20f8993 100644
--- a/src/apply.c
+++ b/src/apply.c
@@ -70,31 +70,31 @@ CCTK_FILEVERSION(AEIDevelopment_ReflectionSymmetry_apply_c);
 #define RE /* nothing */
 #define IM /* nothing */
 
-#ifdef CCTK_INT1
+#ifdef HAVE_CCTK_INT1
 COPY(CCTK_INT1)
 #endif
 
-#ifdef CCTK_INT2
+#ifdef HAVE_CCTK_INT2
 COPY(CCTK_INT2)
 #endif
 
-#ifdef CCTK_INT4
+#ifdef HAVE_CCTK_INT4
 COPY(CCTK_INT4)
 #endif
 
-#ifdef CCTK_INT8
+#ifdef HAVE_CCTK_INT8
 COPY(CCTK_INT8)
 #endif
 
-#ifdef CCTK_REAL4
+#ifdef HAVE_CCTK_REAL4
 COPY(CCTK_REAL4)
 #endif
 
-#ifdef CCTK_REAL8
+#ifdef HAVE_CCTK_REAL8
 COPY(CCTK_REAL8)
 #endif
 
-#ifdef CCTK_REAL16
+#ifdef HAVE_CCTK_REAL16
 COPY(CCTK_REAL16)
 #endif
 
@@ -108,15 +108,15 @@ COPY(CCTK_REAL16)
 #define RE .Re
 #define IM .Im
 
-#ifdef CCTK_REAL4
+#ifdef HAVE_CCTK_COMPLEX8
 COPY(CCTK_COMPLEX8)
 #endif
 
-#ifdef CCTK_REAL8
+#ifdef HAVE_CCTK_COMPLEX16
 COPY(CCTK_COMPLEX16)
 #endif
 
-#ifdef CCTK_REAL16
+#ifdef HAVE_CCTK_COMPLEX32
 COPY(CCTK_COMPLEX32)
 #endif
 
@@ -141,7 +141,6 @@ BndReflectVI (cGH const * restrict const cctkGH,
   cGroupDynamicData data;
   int firstvar, numvars;
   char * restrict fullname;
-  char * restrict groupname;
   
   void * restrict varptr;
   
@@ -237,17 +236,19 @@ BndReflectVI (cGH const * restrict const cctkGH,
       }
       if (! didwarn[gi]) {
         didwarn[gi] = 1;
-        groupname = CCTK_GroupName(gi);
-        assert (groupname);
-        CCTK_VWarn (2, __LINE__, __FILE__, CCTK_THORNSTRING,
-                    "Group \"%s\" has no tensor type and contains more than one element -- treating these as \"scalar\"",
-                    groupname);
-        free (groupname);
+        {
+          char * groupname = CCTK_GroupName(gi);
+          assert (groupname);
+          CCTK_VWarn (2, __LINE__, __FILE__, CCTK_THORNSTRING,
+                      "Group \"%s\" has no tensor type and contains more than one element -- treating these as \"scalar\"",
+                      groupname);
+          free (groupname);
+        }
       }
     }
     strcpy (tensortypealias, "scalar");
   } else if (ierr<0) {
-    groupname = CCTK_GroupName(gi);
+    char * groupname = CCTK_GroupName(gi);
     assert (groupname);
     CCTK_VWarn (0, __LINE__, __FILE__, CCTK_THORNSTRING,
                 "Error in tensor type alias declaration for group \"%s\"",
@@ -304,7 +305,7 @@ BndReflectVI (cGH const * restrict const cctkGH,
   if (ierr == UTIL_ERROR_TABLE_NO_SUCH_KEY) {
     tensorparity = +1;
   } else if (ierr<0) {
-    groupname = CCTK_GroupName(gi);
+    char * groupname = CCTK_GroupName(gi);
     assert (groupname);
     CCTK_VWarn (0, __LINE__, __FILE__, CCTK_THORNSTRING,
                 "Error in tensor parity declaration for group \"%s\"",
@@ -397,7 +398,7 @@ BndReflectVI (cGH const * restrict const cctkGH,
           switch (group.vartype)
           {
             
-#ifdef CCTK_INT1
+#ifdef HAVE_CCTK_INT1
           case CCTK_VARIABLE_INT1:
 #ifdef CCTK_INTEGER_PRECISION_1
           case CCTK_VARIABLE_INT:
@@ -412,7 +413,7 @@ BndReflectVI (cGH const * restrict const cctkGH,
             break;
 #endif
             
-#ifdef CCTK_INT2
+#ifdef HAVE_CCTK_INT2
           case CCTK_VARIABLE_INT2:
 #ifdef CCTK_INTEGER_PRECISION_2
           case CCTK_VARIABLE_INT:
@@ -427,7 +428,7 @@ BndReflectVI (cGH const * restrict const cctkGH,
             break;
 #endif
             
-#ifdef CCTK_INT4
+#ifdef HAVE_CCTK_INT4
           case CCTK_VARIABLE_INT4:
 #ifdef CCTK_INTEGER_PRECISION_4
           case CCTK_VARIABLE_INT:
@@ -442,7 +443,7 @@ BndReflectVI (cGH const * restrict const cctkGH,
             break;
 #endif
             
-#ifdef CCTK_INT8
+#ifdef HAVE_CCTK_INT8
           case CCTK_VARIABLE_INT8:
 #ifdef CCTK_INTEGER_PRECISION_8
           case CCTK_VARIABLE_INT:
@@ -457,7 +458,7 @@ BndReflectVI (cGH const * restrict const cctkGH,
             break;
 #endif
             
-#ifdef CCTK_REAL4
+#ifdef HAVE_CCTK_REAL4
           case CCTK_VARIABLE_REAL4:
 #ifdef CCTK_REAL_PRECISION_4
           case CCTK_VARIABLE_REAL:
@@ -472,7 +473,7 @@ BndReflectVI (cGH const * restrict const cctkGH,
             break;
 #endif
             
-#ifdef CCTK_REAL8
+#ifdef HAVE_CCTK_REAL8
           case CCTK_VARIABLE_REAL8:
 #ifdef CCTK_REAL_PRECISION_8
           case CCTK_VARIABLE_REAL:
@@ -487,7 +488,7 @@ BndReflectVI (cGH const * restrict const cctkGH,
             break;
 #endif
             
-#ifdef CCTK_REAL16
+#ifdef HAVE_CCTK_REAL16
           case CCTK_VARIABLE_REAL16:
 #ifdef CCTK_REAL_PRECISION_16
           case CCTK_VARIABLE_REAL:
@@ -502,7 +503,7 @@ BndReflectVI (cGH const * restrict const cctkGH,
             break;
 #endif
             
-#ifdef CCTK_REAL4
+#ifdef HAVE_CCTK_COMPLEX8
           case CCTK_VARIABLE_COMPLEX8:
 #ifdef CCTK_COMPLEX_PRECISION_8
           case CCTK_VARIABLE_COMPLEX:
@@ -517,7 +518,7 @@ BndReflectVI (cGH const * restrict const cctkGH,
             break;
 #endif
             
-#ifdef CCTK_REAL8
+#ifdef HAVE_CCTK_COMPLEX16
           case CCTK_VARIABLE_COMPLEX16:
 #ifdef CCTK_COMPLEX_PRECISION_16
           case CCTK_VARIABLE_COMPLEX:
@@ -532,7 +533,7 @@ BndReflectVI (cGH const * restrict const cctkGH,
             break;
 #endif
             
-#ifdef CCTK_REAL16
+#ifdef HAVE_CCTK_COMPLEX32
           case CCTK_VARIABLE_COMPLEX32:
 #ifdef CCTK_COMPLEX_PRECISION_32
           case CCTK_VARIABLE_COMPLEX: