From 21272f1bfc64124794e1e02853fb8cca0a473b11 Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Mon, 22 Oct 2012 18:15:40 -0400 Subject: Carpet: Correct #ifdefs in CarpetSimpleMPIDatatypeLength --- Carpet/Carpet/src/helpers.cc | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/Carpet/Carpet/src/helpers.cc b/Carpet/Carpet/src/helpers.cc index 52e943d0e..3b5ebb292 100644 --- a/Carpet/Carpet/src/helpers.cc +++ b/Carpet/Carpet/src/helpers.cc @@ -379,23 +379,15 @@ namespace Carpet { int CarpetSimpleMPIDatatypeLength (const int vartype) { switch (vartype) { -#ifdef CARPET_COMPLEX case CCTK_VARIABLE_COMPLEX: -#endif -#ifdef CARPET_COMPLEX8 -# ifdef HAVE_CCTK_COMPLEX8 +#ifdef HAVE_CCTK_COMPLEX8 case CCTK_VARIABLE_COMPLEX8: -# endif #endif -#ifdef CARPET_COMPLEX16 -# ifdef HAVE_CCTK_COMPLEX16 +#ifdef HAVE_CCTK_COMPLEX16 case CCTK_VARIABLE_COMPLEX16: -# endif #endif -#ifdef CARPET_COMPLEX32 -# ifdef HAVE_CCTK_COMPLEX32 +#ifdef HAVE_CCTK_COMPLEX32 case CCTK_VARIABLE_COMPLEX32: -# endif #endif return 2; default: -- cgit v1.2.3