aboutsummaryrefslogtreecommitdiff
path: root/Carpet
diff options
context:
space:
mode:
authorschnetter <>2002-01-04 17:21:00 +0000
committerschnetter <>2002-01-04 17:21:00 +0000
commit256e557be5e299e1f23e99fd6d82b1f6e118eeac (patch)
tree1928eee639112b21845458ca9413d20b75d7f513 /Carpet
parente8176fefae61fb350d868bd425af279781d6a12f (diff)
#ifdef out all types like CCTK_INT2 etc. because they are not always defined.
darcs-hash:20020104172157-07bb3-7e8a1012a12a2aa3ae4cfe74261c210e5ad647de.gz
Diffstat (limited to 'Carpet')
-rw-r--r--Carpet/Carpet/src/typecase14
-rw-r--r--Carpet/CarpetLib/src/instantiate14
2 files changed, 26 insertions, 2 deletions
diff --git a/Carpet/Carpet/src/typecase b/Carpet/Carpet/src/typecase
index dbe0d8823..edd5cb4a4 100644
--- a/Carpet/Carpet/src/typecase
+++ b/Carpet/Carpet/src/typecase
@@ -1,7 +1,7 @@
// Instantiate type cases for all available types -*-C++-*-
// (C) 2001 Erik Schnetter <schnetter@uni-tuebingen.de>
-// $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/typecase,v 1.3 2001/03/22 18:42:05 eschnett Exp $
+// $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/typecase,v 1.4 2002/01/04 18:21:57 schnetter Exp $
// Usage:
// Define the macro TYPECASE(N,T) to be a typecase for the type T with name N,
@@ -120,10 +120,14 @@ TYPECASE(CCTK_VARIABLE_BYTE, CCTK_BYTE)
TYPECASE(CCTK_VARIABLE_INT, CCTK_INT)
#endif
#ifdef CARPET_INT2
+# ifdef CCTK_INT2
TYPECASE(CCTK_VARIABLE_INT2, CCTK_INT2)
+# endif
#endif
#ifdef CARPET_INT4
+# ifdef CCTK_INT4
TYPECASE(CCTK_VARIABLE_INT4, CCTK_INT4)
+# endif
#endif
#ifdef CARPET_INT8
# ifdef CCTK_INT8
@@ -135,10 +139,14 @@ TYPECASE(CCTK_VARIABLE_INT8, CCTK_INT8)
TYPECASE(CCTK_VARIABLE_REAL, CCTK_REAL)
#endif
#ifdef CARPET_REAL4
+# ifdef CCTK_REAL4
TYPECASE(CCTK_VARIABLE_REAL4, CCTK_REAL4)
+# endif
#endif
#ifdef CARPET_REAL8
+# ifdef CCTK_REAL8
TYPECASE(CCTK_VARIABLE_REAL8, CCTK_REAL8)
+# endif
#endif
#ifdef CARPET_REAL16
# ifdef CCTK_REAL16
@@ -150,10 +158,14 @@ TYPECASE(CCTK_VARIABLE_REAL16, CCTK_REAL16)
TYPECASE(CCTK_VARIABLE_COMPLEX, complex<CCTK_REAL>)
#endif
#ifdef CARPET_COMPLEX8
+# ifdef CCTK_REAL4
TYPECASE(CCTK_VARIABLE_COMPLEX8, complex<CCTK_REAL4>)
+# endif
#endif
#ifdef CARPET_COMPLEX16
+# ifdef CCTK_REAL8
TYPECASE(CCTK_VARIABLE_COMPLEX16, complex<CCTK_REAL8>)
+# endif
#endif
#ifdef CARPET_COMPLEX32
# ifdef CCTK_REAL16
diff --git a/Carpet/CarpetLib/src/instantiate b/Carpet/CarpetLib/src/instantiate
index f85d27c58..2bc9e7049 100644
--- a/Carpet/CarpetLib/src/instantiate
+++ b/Carpet/CarpetLib/src/instantiate
@@ -1,7 +1,7 @@
// Instantiate templates for all available types -*-C++-*-
// (C) 2001 Erik Schnetter <schnetter@uni-tuebingen.de>
-// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/instantiate,v 1.3 2001/03/22 18:42:06 eschnett Exp $
+// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/instantiate,v 1.4 2002/01/04 18:21:58 schnetter Exp $
// Usage:
// Define the macro INSTANTIATE(T) to instantiate for the type T,
@@ -121,10 +121,14 @@ INSTANTIATE(CCTK_BYTE)
#endif
#ifdef CARPET_INT2
+# ifdef CCTK_INT2
INSTANTIATE(CCTK_INT2)
+# endif
#endif
#ifdef CARPET_INT4
+# ifdef CCTK_INT4
INSTANTIATE(CCTK_INT4)
+# endif
#endif
#ifdef CARPET_INT8
# ifdef CCTK_INT8
@@ -133,10 +137,14 @@ INSTANTIATE(CCTK_INT8)
#endif
#ifdef CARPET_REAL4
+# ifdef CCTK_REAL4
INSTANTIATE(CCTK_REAL4)
+# endif
#endif
#ifdef CARPET_REAL8
+# ifdef CCTK_REAL8
INSTANTIATE(CCTK_REAL8)
+# endif
#endif
#ifdef CARPET_REAL16
# ifdef CCTK_REAL16
@@ -145,10 +153,14 @@ INSTANTIATE(CCTK_REAL16)
#endif
#ifdef CARPET_COMPLEX8
+# ifdef CCTK_REAL4
INSTANTIATE(complex<CCTK_REAL4>)
+# endif
#endif
#ifdef CARPET_COMPLEX16
+# ifdef CCTK_REAL8
INSTANTIATE(complex<CCTK_REAL8>)
+# endif
#endif
#ifdef CARPET_COMPLEX32
# ifdef CCTK_REAL16