diff options
author | Erik Schnetter <schnetter@cct.lsu.edu> | 2006-06-13 17:08:00 +0000 |
---|---|---|
committer | Erik Schnetter <schnetter@cct.lsu.edu> | 2006-06-13 17:08:00 +0000 |
commit | 7c76b00c585193418ae004f3dc9286bd2212b3dc (patch) | |
tree | 8e35fc52f3a317329bc666f9473365f40d2ac872 /Carpet/CarpetLib/src | |
parent | cdd8138a8065ad36eb4faefd4690c5e8e99977ec (diff) |
CarpetLib: Change #ifdef CCTK_* to #ifdef HAVE_CCTK_*
darcs-hash:20060613170802-dae7b-9f69116a70acbac95c7b7b4afa4282330b065602.gz
Diffstat (limited to 'Carpet/CarpetLib/src')
-rw-r--r-- | Carpet/CarpetLib/src/defs.hh | 20 | ||||
-rw-r--r-- | Carpet/CarpetLib/src/dist.cc | 6 | ||||
-rw-r--r-- | Carpet/CarpetLib/src/dist.hh | 12 | ||||
-rw-r--r-- | Carpet/CarpetLib/src/instantiate | 20 |
4 files changed, 29 insertions, 29 deletions
diff --git a/Carpet/CarpetLib/src/defs.hh b/Carpet/CarpetLib/src/defs.hh index 8da70b5cd..57d57a6b5 100644 --- a/Carpet/CarpetLib/src/defs.hh +++ b/Carpet/CarpetLib/src/defs.hh @@ -143,52 +143,52 @@ inline const char * typestring (const complex<long double>& dummy) #else -#ifdef CCTK_INT1 +#ifdef HAVE_CCTK_INT1 inline const char * typestring (const CCTK_INT1& dummy) { return "CCTK_INT1"; } #endif -#ifdef CCTK_INT2 +#ifdef HAVE_CCTK_INT2 inline const char * typestring (const CCTK_INT2& dummy) { return "CCTK_INT2"; } #endif -#ifdef CCTK_INT4 +#ifdef HAVE_CCTK_INT4 inline const char * typestring (const CCTK_INT4& dummy) { return "CCTK_INT4"; } #endif -#ifdef CCTK_INT8 +#ifdef HAVE_CCTK_INT8 inline const char * typestring (const CCTK_INT8& dummy) { return "CCTK_INT8"; } #endif -#ifdef CCTK_REAL4 +#ifdef HAVE_CCTK_REAL4 inline const char * typestring (const CCTK_REAL4& dummy) { return "CCTK_REAL4"; } #endif -#ifdef CCTK_REAL8 +#ifdef HAVE_CCTK_REAL8 inline const char * typestring (const CCTK_REAL8& dummy) { return "CCTK_REAL8"; } #endif -#ifdef CCTK_REAL16 +#ifdef HAVE_CCTK_REAL16 inline const char * typestring (const CCTK_REAL16& dummy) { return "CCTK_REAL16"; } #endif -#ifdef CCTK_REAL4 +#ifdef HAVE_CCTK_REAL4 inline const char * typestring (const CCTK_COMPLEX8& dummy) { return "CCTK_COMPLEX8"; } #endif -#ifdef CCTK_REAL8 +#ifdef HAVE_CCTK_REAL8 inline const char * typestring (const CCTK_COMPLEX16& dummy) { return "CCTK_COMPLEX16"; } #endif -#ifdef CCTK_REAL16 +#ifdef HAVE_CCTK_REAL16 inline const char * typestring (const CCTK_COMPLEX32& dummy) { return "CCTK_COMPLEX32"; } #endif diff --git a/Carpet/CarpetLib/src/dist.cc b/Carpet/CarpetLib/src/dist.cc index 8c5df2cdf..b8edac101 100644 --- a/Carpet/CarpetLib/src/dist.cc +++ b/Carpet/CarpetLib/src/dist.cc @@ -43,17 +43,17 @@ namespace dist { MPI_Type_contiguous (2, MPI_LONG_DOUBLE, &mpi_complex_long_double); MPI_Type_commit (&mpi_complex_long_double); #else -# ifdef CCTK_REAL4 +# ifdef HAVE_CCTK_REAL4 CCTK_REAL4 dummy4; MPI_Type_contiguous (2, datatype(dummy4), &mpi_complex8); MPI_Type_commit (&mpi_complex8); # endif -# ifdef CCTK_REAL8 +# ifdef HAVE_CCTK_REAL8 CCTK_REAL8 dummy8; MPI_Type_contiguous (2, datatype(dummy8), &mpi_complex16); MPI_Type_commit (&mpi_complex16); # endif -# ifdef CCTK_REAL16 +# ifdef HAVE_CCTK_REAL16 CCTK_REAL16 dummy16; MPI_Type_contiguous (2, datatype(dummy16), &mpi_complex32); MPI_Type_commit (&mpi_complex32); diff --git a/Carpet/CarpetLib/src/dist.hh b/Carpet/CarpetLib/src/dist.hh index d68c733ee..23c445430 100644 --- a/Carpet/CarpetLib/src/dist.hh +++ b/Carpet/CarpetLib/src/dist.hh @@ -131,17 +131,17 @@ namespace dist { #else -# ifdef CCTK_REAL4 +# ifdef HAVE_CCTK_COMPLEX8 inline unsigned int c_datatype (const CCTK_COMPLEX8&) { return 13; } # endif -# ifdef CCTK_REAL8 +# ifdef HAVE_CCTK_COMPLEX16 inline unsigned int c_datatype (const CCTK_COMPLEX16&) { return 14; } # endif -# ifdef CCTK_REAL16 +# ifdef HAVE_CCTK_COMPLEX32 inline unsigned int c_datatype (const CCTK_COMPLEX32&) { return 15; } # endif @@ -209,17 +209,17 @@ namespace dist { #else -# ifdef CCTK_REAL4 +# ifdef HAVE_CCTK_COMPLEX8 inline MPI_Datatype datatype (const CCTK_COMPLEX8&) { return mpi_complex8; } # endif -# ifdef CCTK_REAL8 +# ifdef HAVE_CCTK_COMPLEX16 inline MPI_Datatype datatype (const CCTK_COMPLEX16&) { return mpi_complex16; } # endif -# ifdef CCTK_REAL16 +# ifdef HAVE_CCTK_COMPLEX32 inline MPI_Datatype datatype (const CCTK_COMPLEX32&) { return mpi_complex32; } # endif diff --git a/Carpet/CarpetLib/src/instantiate b/Carpet/CarpetLib/src/instantiate index 8fa9812d1..047adc12c 100644 --- a/Carpet/CarpetLib/src/instantiate +++ b/Carpet/CarpetLib/src/instantiate @@ -123,54 +123,54 @@ INSTANTIATE(CCTK_BYTE) #endif #ifdef CARPET_INT1 -# ifdef CCTK_INT1 +# ifdef HAVE_CCTK_INT1 INSTANTIATE(CCTK_INT1) # endif #endif #ifdef CARPET_INT2 -# ifdef CCTK_INT2 +# ifdef HAVE_CCTK_INT2 INSTANTIATE(CCTK_INT2) # endif #endif #ifdef CARPET_INT4 -# ifdef CCTK_INT4 +# ifdef HAVE_CCTK_INT4 INSTANTIATE(CCTK_INT4) # endif #endif #ifdef CARPET_INT8 -# ifdef CCTK_INT8 +# ifdef HAVE_CCTK_INT8 INSTANTIATE(CCTK_INT8) # endif #endif #ifdef CARPET_REAL4 -# ifdef CCTK_REAL4 +# ifdef HAVE_CCTK_REAL4 INSTANTIATE(CCTK_REAL4) # endif #endif #ifdef CARPET_REAL8 -# ifdef CCTK_REAL8 +# ifdef HAVE_CCTK_REAL8 INSTANTIATE(CCTK_REAL8) # endif #endif #ifdef CARPET_REAL16 -# ifdef CCTK_REAL16 +# ifdef HAVE_CCTK_REAL16 INSTANTIATE(CCTK_REAL16) # endif #endif #ifdef CARPET_COMPLEX8 -# ifdef CCTK_REAL4 +# ifdef HAVE_CCTK_COMPLEX8 INSTANTIATE(CCTK_COMPLEX8) # endif #endif #ifdef CARPET_COMPLEX16 -# ifdef CCTK_REAL8 +# ifdef HAVE_CCTK_COMPLEX16 INSTANTIATE(CCTK_COMPLEX16) # endif #endif #ifdef CARPET_COMPLEX32 -# ifdef CCTK_REAL16 +# ifdef HAVE_CCTK_COMPLEX32 INSTANTIATE(CCTK_COMPLEX32) # endif #endif |