diff options
| -rw-r--r-- | Carpet/Carpet/src/typecase | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/Carpet/Carpet/src/typecase b/Carpet/Carpet/src/typecase index f126af887..d702a5537 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.5 2003/01/07 22:17:32 schnetter Exp $ +// $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/typecase,v 1.6 2003/08/03 17:09:21 schnetter Exp $ // Usage: // Define the macro TYPECASE(N,T) to be a typecase for the type T with name N, @@ -52,7 +52,7 @@ # define CARPET_COMPLEX32 #endif -#if !defined(CARPET_BYTE) && !defined(CARPET_INT2) && !defined(CARPET_INT4) && !defined(CARPET_INT8) && !defined(CARPET_REAL4) && !defined(CARPET_REAL8) && !defined(CARPET_REAL16) && !defined(CARPET_COMPLEX8) && !defined(CARPET_COMPLEX16) && !defined(CARPET_COMPLEX32) +#if !defined(CARPET_BYTE) && !defined(CARPET_INT) && !defined(CARPET_INT1) && !defined(CARPET_INT2) && !defined(CARPET_INT4) && !defined(CARPET_INT8) && !defined(CARPET_REAL) && !defined(CARPET_REAL4) && !defined(CARPET_REAL8) && !defined(CARPET_REAL16) && !defined(CARPET_COMPLEX) && !defined(CARPET_COMPLEX8) && !defined(CARPET_COMPLEX16) && !defined(CARPET_COMPLEX32) // Assume the user just wants INT and REAL # undef CARPET_INT # define CARPET_INT @@ -118,6 +118,8 @@ // Typecase the desired types +#ifndef WANT_NO_INT + #ifdef CARPET_BYTE TYPECASE(CCTK_VARIABLE_BYTE, CCTK_BYTE) #endif @@ -146,6 +148,9 @@ TYPECASE(CCTK_VARIABLE_INT8, CCTK_INT8) # endif #endif +#endif +#ifndef WANT_NO_REAL + #ifdef CARPET_REAL TYPECASE(CCTK_VARIABLE_REAL, CCTK_REAL) #endif @@ -165,21 +170,30 @@ TYPECASE(CCTK_VARIABLE_REAL16, CCTK_REAL16) # endif #endif +#endif +#ifndef WANT_NO_COMPLEX + #ifdef CARPET_COMPLEX -TYPECASE(CCTK_VARIABLE_COMPLEX, complex<CCTK_REAL>) +/* TYPECASE(CCTK_VARIABLE_COMPLEX, complex<CCTK_REAL>) */ +TYPECASE(CCTK_VARIABLE_COMPLEX, CCTK_COMPLEX) #endif #ifdef CARPET_COMPLEX8 # ifdef CCTK_REAL4 -TYPECASE(CCTK_VARIABLE_COMPLEX8, complex<CCTK_REAL4>) +/* TYPECASE(CCTK_VARIABLE_COMPLEX8, complex<CCTK_REAL4>) */ +TYPECASE(CCTK_VARIABLE_COMPLEX8, CCTK_COMPLEX8) # endif #endif #ifdef CARPET_COMPLEX16 # ifdef CCTK_REAL8 -TYPECASE(CCTK_VARIABLE_COMPLEX16, complex<CCTK_REAL8>) +/* TYPECASE(CCTK_VARIABLE_COMPLEX16, complex<CCTK_REAL8>) */ +TYPECASE(CCTK_VARIABLE_COMPLEX16, CCTK_COMPLEX16) # endif #endif #ifdef CARPET_COMPLEX32 # ifdef CCTK_REAL16 -TYPECASE(CCTK_VARIABLE_COMPLEX32, complex<CCTK_REAL16>) +/* TYPECASE(CCTK_VARIABLE_COMPLEX32, complex<CCTK_REAL8>) */ +TYPECASE(CCTK_VARIABLE_COMPLEX32, CCTK_COMPLEX32) # endif #endif + +#endif |