diff options
| -rw-r--r-- | src/DatatypeConversion.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/DatatypeConversion.c b/src/DatatypeConversion.c index 1073205..d083a01 100644 --- a/src/DatatypeConversion.c +++ b/src/DatatypeConversion.c @@ -62,44 +62,44 @@ static CCTK_INT Convert##source_type##to##dest_type (CCTK_INT nelems, \ #define CONVERT(src, dst, dst_type) (dst) = (CCTK_##dst_type) (src) /* predefined conversion functions for integers */ -#if defined(CCTK_INT1) && defined(CCTK_INT2) +#if defined(HAVE_CCTK_INT1) && defined(HAVE_CCTK_INT2) CONVERSION_FUNCTION (INT2, INT1, CONVERT) #endif -#if defined(CCTK_INT1) && defined(CCTK_INT4) +#if defined(HAVE_CCTK_INT1) && defined(HAVE_CCTK_INT4) CONVERSION_FUNCTION (INT4, INT1, CONVERT) #endif -#if defined(CCTK_INT2) && defined(CCTK_INT4) +#if defined(HAVE_CCTK_INT2) && defined(HAVE_CCTK_INT4) CONVERSION_FUNCTION (INT4, INT2, CONVERT) #endif -#if defined(CCTK_INT1) && defined(CCTK_INT8) +#if defined(HAVE_CCTK_INT1) && defined(HAVE_CCTK_INT8) CONVERSION_FUNCTION (INT8, INT1, CONVERT) #endif -#if defined(CCTK_INT2) && defined(CCTK_INT8) +#if defined(HAVE_CCTK_INT2) && defined(HAVE_CCTK_INT8) CONVERSION_FUNCTION (INT8, INT2, CONVERT) #endif -#if defined(CCTK_INT4) && defined(CCTK_INT8) +#if defined(HAVE_CCTK_INT4) && defined(HAVE_CCTK_INT8) CONVERSION_FUNCTION (INT8, INT4, CONVERT) #endif /* predefined conversion functions for reals */ -#if defined(CCTK_REAL4) && defined(CCTK_REAL8) +#if defined(HAVE_CCTK_REAL4) && defined(HAVE_CCTK_REAL8) CONVERSION_FUNCTION (REAL8, REAL4, CONVERT) #endif -#if defined(CCTK_REAL4) && defined(CCTK_REAL16) +#if defined(HAVE_CCTK_REAL4) && defined(HAVE_CCTK_REAL16) CONVERSION_FUNCTION (REAL16, REAL4, CONVERT) #endif -#if defined(CCTK_REAL8) && defined(CCTK_REAL16) +#if defined(HAVE_CCTK_REAL8) && defined(HAVE_CCTK_REAL16) CONVERSION_FUNCTION (REAL16, REAL8, CONVERT) #endif /* predefined conversion functions for complex */ -#if defined(CCTK_REAL4) && defined(CCTK_REAL8) +#if defined(HAVE_CCTK_REAL4) && defined(HAVE_CCTK_REAL8) CONVERSION_FUNCTION (COMPLEX16, COMPLEX8, CONVERT) #endif -#if defined(CCTK_REAL4) && defined(CCTK_REAL16) +#if defined(HAVE_CCTK_REAL4) && defined(HAVE_CCTK_REAL16) CONVERSION_FUNCTION (COMPLEX32, COMPLEX16, CONVERT) #endif -#if defined(CCTK_REAL8) && defined(CCTK_REAL16) +#if defined(HAVE_CCTK_REAL8) && defined(HAVE_CCTK_REAL16) CONVERSION_FUNCTION (COMPLEX32, COMPLEX8, CONVERT) #endif @@ -148,73 +148,73 @@ t_hslabConversionFn PUGHSlabi_GetDatatypeConversionFn (int src_type, { /* this is just because of the following #ifdef'ed else branches */ } -#if defined(CCTK_INT1) && defined(CCTK_INT2) +#if defined(HAVE_CCTK_INT1) && defined(HAVE_CCTK_INT2) else if (src_type == CCTK_VARIABLE_INT2 && dst_type == CCTK_VARIABLE_INT1) { retval = ConvertINT2toINT1; } #endif -#if defined(CCTK_INT1) && defined(CCTK_INT4) +#if defined(HAVE_CCTK_INT1) && defined(HAVE_CCTK_INT4) else if (src_type == CCTK_VARIABLE_INT4 && dst_type == CCTK_VARIABLE_INT1) { retval = ConvertINT4toINT1; } #endif -#if defined(CCTK_INT2) && defined(CCTK_INT4) +#if defined(HAVE_CCTK_INT2) && defined(HAVE_CCTK_INT4) else if (src_type == CCTK_VARIABLE_INT4 && dst_type == CCTK_VARIABLE_INT2) { retval = ConvertINT4toINT2; } #endif -#if defined(CCTK_INT1) && defined(CCTK_INT8) +#if defined(HAVE_CCTK_INT1) && defined(HAVE_CCTK_INT8) else if (src_type == CCTK_VARIABLE_INT8 && dst_type == CCTK_VARIABLE_INT1) { retval = ConvertINT8toINT1; } #endif -#if defined(CCTK_INT2) && defined(CCTK_INT8) +#if defined(HAVE_CCTK_INT2) && defined(HAVE_CCTK_INT8) else if (src_type == CCTK_VARIABLE_INT8 && dst_type == CCTK_VARIABLE_INT2) { retval = ConvertINT8toINT2; } #endif -#if defined(CCTK_INT4) && defined(CCTK_INT8) +#if defined(HAVE_CCTK_INT4) && defined(HAVE_CCTK_INT8) else if (src_type == CCTK_VARIABLE_INT8 && dst_type == CCTK_VARIABLE_INT4) { retval = ConvertINT8toINT4; } #endif -#if defined(CCTK_REAL4) && defined(CCTK_REAL8) +#if defined(HAVE_CCTK_REAL4) && defined(HAVE_CCTK_REAL8) else if (src_type == CCTK_VARIABLE_REAL8 && dst_type == CCTK_VARIABLE_REAL4) { retval = ConvertREAL8toREAL4; } #endif -#if defined(CCTK_REAL4) && defined(CCTK_REAL16) +#if defined(HAVE_CCTK_REAL4) && defined(HAVE_CCTK_REAL16) else if (src_type == CCTK_VARIABLE_REAL16 && dst_type == CCTK_VARIABLE_REAL4) { retval = ConvertREAL16toREAL4; } #endif -#if defined(CCTK_REAL8) && defined(CCTK_REAL16) +#if defined(HAVE_CCTK_REAL8) && defined(HAVE_CCTK_REAL16) else if (src_type == CCTK_VARIABLE_REAL16 && dst_type == CCTK_VARIABLE_REAL8) { retval = ConvertREAL16toREAL8; } #endif -#if defined(CCTK_REAL4) && defined(CCTK_REAL8) +#if defined(HAVE_CCTK_REAL4) && defined(HAVE_CCTK_REAL8) else if (src_type == CCTK_VARIABLE_COMPLEX16 && dst_type == CCTK_VARIABLE_COMPLEX8) { retval = ConvertCOMPLEX16toCOMPLEX8; } #endif -#if defined(CCTK_REAL8) && defined(CCTK_REAL16) +#if defined(HAVE_CCTK_REAL8) && defined(HAVE_CCTK_REAL16) else if (src_type == CCTK_VARIABLE_COMPLEX32 && dst_type == CCTK_VARIABLE_COMPLEX8) { retval = ConvertCOMPLEX32toCOMPLEX8; } #endif -#if defined(CCTK_REAL8) && defined(CCTK_REAL16) +#if defined(HAVE_CCTK_REAL8) && defined(HAVE_CCTK_REAL16) else if (src_type == CCTK_VARIABLE_COMPLEX32 && dst_type == CCTK_VARIABLE_COMPLEX16) { retval = ConvertCOMPLEX32toCOMPLEX16; |