diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5T.c | 104 | ||||
| -rw-r--r-- | src/H5Tconv.c | 134 | ||||
| -rw-r--r-- | src/H5Tpkg.h | 26 |
3 files changed, 132 insertions, 132 deletions
@@ -1001,16 +1001,16 @@ H5T_init_interface(void) */ /* floating point */ -#if FP_FP +#if H5T_CONV_INTERIM_FP_FP status |= H5T_register(H5T_PERS_HARD, "flt_dbl", native_float, native_double, H5T_conv_float_double, H5AC_dxpl_id); status |= H5T_register(H5T_PERS_HARD, "dbl_flt", native_double, native_float, H5T_conv_double_float, H5AC_dxpl_id); -#endif /*FP_FP*/ -#if FP_LDOUBLE +#endif /*H5T_CONV_INTERIM_FP_FP*/ +#if H5T_CONV_INTERIM_FP_LDOUBLE status |= H5T_register(H5T_PERS_HARD, "flt_ldbl", native_float, native_ldouble, H5T_conv_float_ldouble, H5AC_dxpl_id); status |= H5T_register(H5T_PERS_HARD, "dbl_ldbl", native_double, native_ldouble, H5T_conv_double_ldouble, H5AC_dxpl_id); status |= H5T_register(H5T_PERS_HARD, "ldbl_flt", native_ldouble, native_float, H5T_conv_ldouble_float, H5AC_dxpl_id); status |= H5T_register(H5T_PERS_HARD, "ldbl_dbl", native_ldouble, native_double, H5T_conv_ldouble_double, H5AC_dxpl_id); -#endif /*FP_LDOUBLE*/ +#endif /*H5T_CONV_INTERIM_FP_LDOUBLE*/ /* from long_long */ status |= H5T_register(H5T_PERS_HARD, "llong_ullong", native_llong, native_ullong, H5T_conv_llong_ullong, H5AC_dxpl_id); @@ -1115,149 +1115,149 @@ H5T_init_interface(void) /* From char to floats */ status |= H5T_register(H5T_PERS_HARD, "schar_flt", native_schar, native_float, H5T_conv_schar_float, H5AC_dxpl_id); status |= H5T_register(H5T_PERS_HARD, "schar_dbl", native_schar, native_double, H5T_conv_schar_double, H5AC_dxpl_id); -#if INTEGER_LDOUBLE +#if H5T_CONV_INTERIM_INTEGER_LDOUBLE status |= H5T_register(H5T_PERS_HARD, "schar_ldbl", native_schar, native_ldouble, H5T_conv_schar_ldouble, H5AC_dxpl_id); -#endif /* INTEGER_LDOUBLE */ +#endif /* H5T_CONV_INTERIM_INTEGER_LDOUBLE */ /* From unsigned char to floats */ status |= H5T_register(H5T_PERS_HARD, "uchar_flt", native_uchar, native_float, H5T_conv_uchar_float, H5AC_dxpl_id); status |= H5T_register(H5T_PERS_HARD, "uchar_dbl", native_uchar, native_double, H5T_conv_uchar_double, H5AC_dxpl_id); -#if INTEGER_LDOUBLE +#if H5T_CONV_INTERIM_INTEGER_LDOUBLE status |= H5T_register(H5T_PERS_HARD, "uchar_ldbl", native_uchar, native_ldouble, H5T_conv_uchar_ldouble, H5AC_dxpl_id); -#endif /* INTEGER_LDOUBLE */ +#endif /* H5T_CONV_INTERIM_INTEGER_LDOUBLE */ /* From short to floats */ status |= H5T_register(H5T_PERS_HARD, "short_flt", native_short, native_float, H5T_conv_short_float, H5AC_dxpl_id); status |= H5T_register(H5T_PERS_HARD, "short_dbl", native_short, native_double, H5T_conv_short_double, H5AC_dxpl_id); -#if INTEGER_LDOUBLE +#if H5T_CONV_INTERIM_INTEGER_LDOUBLE status |= H5T_register(H5T_PERS_HARD, "short_ldbl", native_short, native_ldouble, H5T_conv_short_ldouble, H5AC_dxpl_id); -#endif /* INTEGER_LDOUBLE */ +#endif /* H5T_CONV_INTERIM_INTEGER_LDOUBLE */ /* From unsigned short to floats */ status |= H5T_register(H5T_PERS_HARD, "ushort_flt", native_ushort, native_float, H5T_conv_ushort_float, H5AC_dxpl_id); status |= H5T_register(H5T_PERS_HARD, "ushort_dbl", native_ushort, native_double, H5T_conv_ushort_double, H5AC_dxpl_id); -#if INTEGER_LDOUBLE +#if H5T_CONV_INTERIM_INTEGER_LDOUBLE status |= H5T_register(H5T_PERS_HARD, "ushort_ldbl", native_ushort, native_ldouble, H5T_conv_ushort_ldouble, H5AC_dxpl_id); -#endif /* INTEGER_LDOUBLE */ +#endif /* H5T_CONV_INTERIM_INTEGER_LDOUBLE */ /* From int to floats */ status |= H5T_register(H5T_PERS_HARD, "int_flt", native_int, native_float, H5T_conv_int_float, H5AC_dxpl_id); status |= H5T_register(H5T_PERS_HARD, "int_dbl", native_int, native_double, H5T_conv_int_double, H5AC_dxpl_id); -#if INTEGER_LDOUBLE +#if H5T_CONV_INTERIM_INTEGER_LDOUBLE status |= H5T_register(H5T_PERS_HARD, "int_ldbl", native_int, native_ldouble, H5T_conv_int_ldouble, H5AC_dxpl_id); -#endif /* INTEGER_LDOUBLE */ +#endif /* H5T_CONV_INTERIM_INTEGER_LDOUBLE */ /* From unsigned int to floats */ status |= H5T_register(H5T_PERS_HARD, "uint_flt", native_uint, native_float, H5T_conv_uint_float, H5AC_dxpl_id); status |= H5T_register(H5T_PERS_HARD, "uint_dbl", native_uint, native_double, H5T_conv_uint_double, H5AC_dxpl_id); -#if INTEGER_LDOUBLE +#if H5T_CONV_INTERIM_INTEGER_LDOUBLE status |= H5T_register(H5T_PERS_HARD, "uint_ldbl", native_uint, native_ldouble, H5T_conv_uint_ldouble, H5AC_dxpl_id); -#endif /* INTEGER_LDOUBLE */ +#endif /* H5T_CONV_INTERIM_INTEGER_LDOUBLE */ /* From long to floats */ status |= H5T_register(H5T_PERS_HARD, "long_flt", native_long, native_float, H5T_conv_long_float, H5AC_dxpl_id); status |= H5T_register(H5T_PERS_HARD, "long_dbl", native_long, native_double, H5T_conv_long_double, H5AC_dxpl_id); -#if INTEGER_LDOUBLE +#if H5T_CONV_INTERIM_INTEGER_LDOUBLE status |= H5T_register(H5T_PERS_HARD, "long_ldbl", native_long, native_ldouble, H5T_conv_long_ldouble, H5AC_dxpl_id); -#endif /* INTEGER_LDOUBLE */ +#endif /* H5T_CONV_INTERIM_INTEGER_LDOUBLE */ /* From unsigned long to floats */ -#if ULONG_FP +#if H5T_CONV_INTERIM_ULONG_FP status |= H5T_register(H5T_PERS_HARD, "ulong_flt", native_ulong, native_float, H5T_conv_ulong_float, H5AC_dxpl_id); status |= H5T_register(H5T_PERS_HARD, "ulong_dbl", native_ulong, native_double, H5T_conv_ulong_double, H5AC_dxpl_id); -#endif /* ULONG_FP */ -#if ULONG_LDOUBLE +#endif /* H5T_CONV_INTERIM_ULONG_FP */ +#if H5T_CONV_INTERIM_ULONG_LDOUBLE status |= H5T_register(H5T_PERS_HARD, "ulong_ldbl", native_ulong, native_ldouble, H5T_conv_ulong_ldouble, H5AC_dxpl_id); -#endif /* ULONG_LDOUBLE */ +#endif /* H5T_CONV_INTERIM_ULONG_LDOUBLE */ /* From long long to floats */ status |= H5T_register(H5T_PERS_HARD, "llong_flt", native_llong, native_float, H5T_conv_llong_float, H5AC_dxpl_id); status |= H5T_register(H5T_PERS_HARD, "llong_dbl", native_llong, native_double, H5T_conv_llong_double, H5AC_dxpl_id); -#if INTEGER_LDOUBLE +#if H5T_CONV_INTERIM_INTEGER_LDOUBLE status |= H5T_register(H5T_PERS_HARD, "llong_ldbl", native_llong, native_ldouble, H5T_conv_llong_ldouble, H5AC_dxpl_id); -#endif /* INTEGER_LDOUBLE */ +#endif /* H5T_CONV_INTERIM_INTEGER_LDOUBLE */ /* From unsigned long long to floats */ -#if ULLONG_FP +#if H5T_CONV_INTERIM_ULLONG_FP status |= H5T_register(H5T_PERS_HARD, "ullong_flt", native_ullong, native_float, H5T_conv_ullong_float, H5AC_dxpl_id); status |= H5T_register(H5T_PERS_HARD, "ullong_dbl", native_ullong, native_double, H5T_conv_ullong_double, H5AC_dxpl_id); -#endif /* ULLONG_FP */ -#if ULLONG_LDOUBLE +#endif /* H5T_CONV_INTERIM_ULLONG_FP */ +#if H5T_CONV_INTERIM_ULLONG_LDOUBLE status |= H5T_register(H5T_PERS_HARD, "ullong_ldbl", native_ullong, native_ldouble, H5T_conv_ullong_ldouble, H5AC_dxpl_id); -#endif /* ULLONG_LDOUBLE */ +#endif /* H5T_CONV_INTERIM_ULLONG_LDOUBLE */ /* From floats to char */ status |= H5T_register(H5T_PERS_HARD, "flt_schar", native_float, native_schar, H5T_conv_float_schar, H5AC_dxpl_id); status |= H5T_register(H5T_PERS_HARD, "dbl_schar", native_double, native_schar, H5T_conv_double_schar, H5AC_dxpl_id); -#if LDOUBLE_INTEGER +#if H5T_CONV_INTERIM_LDOUBLE_INTEGER status |= H5T_register(H5T_PERS_HARD, "ldbl_schar", native_ldouble, native_schar, H5T_conv_ldouble_schar, H5AC_dxpl_id); -#endif /* LDOUBLE_INTEGER */ +#endif /* H5T_CONV_INTERIM_LDOUBLE_INTEGER */ /* From floats to unsigned char */ status |= H5T_register(H5T_PERS_HARD, "flt_uchar", native_float, native_uchar, H5T_conv_float_uchar, H5AC_dxpl_id); status |= H5T_register(H5T_PERS_HARD, "dbl_uchar", native_double, native_uchar, H5T_conv_double_uchar, H5AC_dxpl_id); -#if LDOUBLE_INTEGER +#if H5T_CONV_INTERIM_LDOUBLE_INTEGER status |= H5T_register(H5T_PERS_HARD, "ldbl_uchar", native_ldouble, native_uchar, H5T_conv_ldouble_uchar, H5AC_dxpl_id); -#endif /* LDOUBLE_INTEGER */ +#endif /* H5T_CONV_INTERIM_LDOUBLE_INTEGER */ /* From floats to short */ status |= H5T_register(H5T_PERS_HARD, "flt_short", native_float, native_short, H5T_conv_float_short, H5AC_dxpl_id); status |= H5T_register(H5T_PERS_HARD, "dbl_short", native_double, native_short, H5T_conv_double_short, H5AC_dxpl_id); -#if LDOUBLE_INTEGER +#if H5T_CONV_INTERIM_LDOUBLE_INTEGER status |= H5T_register(H5T_PERS_HARD, "ldbl_short", native_ldouble, native_short, H5T_conv_ldouble_short, H5AC_dxpl_id); -#endif /* LDOUBLE_INTEGER */ +#endif /* H5T_CONV_INTERIM_LDOUBLE_INTEGER */ /* From floats to unsigned short */ status |= H5T_register(H5T_PERS_HARD, "flt_ushort", native_float, native_ushort, H5T_conv_float_ushort, H5AC_dxpl_id); status |= H5T_register(H5T_PERS_HARD, "dbl_ushort", native_double, native_ushort, H5T_conv_double_ushort, H5AC_dxpl_id); -#if LDOUBLE_INTEGER +#if H5T_CONV_INTERIM_LDOUBLE_INTEGER status |= H5T_register(H5T_PERS_HARD, "ldbl_ushort", native_ldouble, native_ushort, H5T_conv_ldouble_ushort, H5AC_dxpl_id); -#endif /* LDOUBLE_INTEGER */ +#endif /* H5T_CONV_INTERIM_LDOUBLE_INTEGER */ /* From floats to int */ status |= H5T_register(H5T_PERS_HARD, "flt_int", native_float, native_int, H5T_conv_float_int, H5AC_dxpl_id); status |= H5T_register(H5T_PERS_HARD, "dbl_int", native_double, native_int, H5T_conv_double_int, H5AC_dxpl_id); -#if LDOUBLE_INTEGER +#if H5T_CONV_INTERIM_LDOUBLE_INTEGER status |= H5T_register(H5T_PERS_HARD, "ldbl_int", native_ldouble, native_int, H5T_conv_ldouble_int, H5AC_dxpl_id); -#endif /* LDOUBLE_INTEGER */ +#endif /* H5T_CONV_INTERIM_LDOUBLE_INTEGER */ /* From floats to unsigned int */ status |= H5T_register(H5T_PERS_HARD, "flt_uint", native_float, native_uint, H5T_conv_float_uint, H5AC_dxpl_id); status |= H5T_register(H5T_PERS_HARD, "dbl_uint", native_double, native_uint, H5T_conv_double_uint, H5AC_dxpl_id); -#if LDOUBLE_UINT +#if H5T_CONV_INTERIM_LDOUBLE_UINT status |= H5T_register(H5T_PERS_HARD, "ldbl_uint", native_ldouble, native_uint, H5T_conv_ldouble_uint, H5AC_dxpl_id); -#endif /* LDOUBLE_UINT */ +#endif /* H5T_CONV_INTERIM_LDOUBLE_UINT */ status |= H5T_register(H5T_PERS_HARD, "flt_long", native_float, native_long, H5T_conv_float_long, H5AC_dxpl_id); status |= H5T_register(H5T_PERS_HARD, "dbl_long", native_double, native_long, H5T_conv_double_long, H5AC_dxpl_id); -#if LDOUBLE_INTEGER +#if H5T_CONV_INTERIM_LDOUBLE_INTEGER status |= H5T_register(H5T_PERS_HARD, "ldbl_long", native_ldouble, native_long, H5T_conv_ldouble_long, H5AC_dxpl_id); -#endif /* LDOUBLE_INTEGER */ +#endif /* H5T_CONV_INTERIM_LDOUBLE_INTEGER */ /* From floats to unsigned long */ status |= H5T_register(H5T_PERS_HARD, "flt_ulong", native_float, native_ulong, H5T_conv_float_ulong, H5AC_dxpl_id); status |= H5T_register(H5T_PERS_HARD, "dbl_ulong", native_double, native_ulong, H5T_conv_double_ulong, H5AC_dxpl_id); -#if LDOUBLE_INTEGER +#if H5T_CONV_INTERIM_LDOUBLE_INTEGER status |= H5T_register(H5T_PERS_HARD, "ldbl_ulong", native_ldouble, native_ulong, H5T_conv_ldouble_ulong, H5AC_dxpl_id); -#endif /* LDOUBLE_INTEGER */ +#endif /* H5T_CONV_INTERIM_LDOUBLE_INTEGER */ /* From floats to long long */ -#if FP_LLONG +#if H5T_CONV_INTERIM_FP_LLONG status |= H5T_register(H5T_PERS_HARD, "flt_llong", native_float, native_llong, H5T_conv_float_llong, H5AC_dxpl_id); status |= H5T_register(H5T_PERS_HARD, "dbl_llong", native_double, native_llong, H5T_conv_double_llong, H5AC_dxpl_id); -#endif /* FP_LLONG */ -#if LDOUBLE_LLONG +#endif /* H5T_CONV_INTERIM_FP_LLONG */ +#if H5T_CONV_INTERIM_LDOUBLE_LLONG status |= H5T_register(H5T_PERS_HARD, "ldbl_llong", native_ldouble, native_llong, H5T_conv_ldouble_llong, H5AC_dxpl_id); -#endif /* LDOUBLE_LLONG */ +#endif /* H5T_CONV_INTERIM_LDOUBLE_LLONG */ /* From floats to unsigned long long */ -#if FP_ULLONG +#if H5T_CONV_INTERIM_FP_ULLONG status |= H5T_register(H5T_PERS_HARD, "flt_ullong", native_float, native_ullong, H5T_conv_float_ullong, H5AC_dxpl_id); status |= H5T_register(H5T_PERS_HARD, "dbl_ullong", native_double, native_ullong, H5T_conv_double_ullong, H5AC_dxpl_id); -#endif /* FP_ULLONG */ -#if LDOUBLE_ULLONG +#endif /* H5T_CONV_INTERIM_FP_ULLONG */ +#if H5T_CONV_INTERIM_LDOUBLE_ULLONG status |= H5T_register(H5T_PERS_HARD, "ldbl_ullong", native_ldouble, native_ullong, H5T_conv_ldouble_ullong, H5AC_dxpl_id); -#endif /* LDOUBLE_ULLONG */ +#endif /* H5T_CONV_INTERIM_LDOUBLE_ULLONG */ /* * The special no-op conversion is the fastest, so we list it last. The diff --git a/src/H5Tconv.c b/src/H5Tconv.c index 9da5842..abd9872 100644 --- a/src/H5Tconv.c +++ b/src/H5Tconv.c @@ -7107,7 +7107,7 @@ done: * destination values are packed. *------------------------------------------------------------------------- */ -#if FP_FP +#if H5T_CONV_INTERIM_FP_FP herr_t H5T_conv_float_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, @@ -7123,7 +7123,7 @@ H5T_conv_float_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, done: FUNC_LEAVE_NOAPI(ret_value); } -#endif /* FP_FP */ +#endif /* H5T_CONV_INTERIM_FP_FP */ /*------------------------------------------------------------------------- @@ -7141,7 +7141,7 @@ done: * *------------------------------------------------------------------------- */ -#if FP_LDOUBLE +#if H5T_CONV_INTERIM_FP_LDOUBLE herr_t H5T_conv_float_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, @@ -7157,7 +7157,7 @@ H5T_conv_float_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, done: FUNC_LEAVE_NOAPI(ret_value); } -#endif /*FP_LDOUBLE*/ +#endif /*H5T_CONV_INTERIM_FP_LDOUBLE*/ /*------------------------------------------------------------------------- @@ -7182,7 +7182,7 @@ done: * destination values are packed. *------------------------------------------------------------------------- */ -#if FP_FP +#if H5T_CONV_INTERIM_FP_FP herr_t H5T_conv_double_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, @@ -7198,7 +7198,7 @@ H5T_conv_double_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, done: FUNC_LEAVE_NOAPI(ret_value); } -#endif /*FP_FP*/ +#endif /*H5T_CONV_INTERIM_FP_FP*/ /*------------------------------------------------------------------------- @@ -7216,7 +7216,7 @@ done: * *------------------------------------------------------------------------- */ -#if FP_LDOUBLE +#if H5T_CONV_INTERIM_FP_LDOUBLE herr_t H5T_conv_double_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, @@ -7233,7 +7233,7 @@ H5T_conv_double_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, done: FUNC_LEAVE_NOAPI(ret_value); } -#endif /*FP_LDOUBLE*/ +#endif /*H5T_CONV_INTERIM_FP_LDOUBLE*/ /*------------------------------------------------------------------------- @@ -7251,7 +7251,7 @@ done: * *------------------------------------------------------------------------- */ -#if FP_LDOUBLE +#if H5T_CONV_INTERIM_FP_LDOUBLE herr_t H5T_conv_ldouble_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, @@ -7267,7 +7267,7 @@ H5T_conv_ldouble_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, done: FUNC_LEAVE_NOAPI(ret_value); } -#endif /* FP_LDOUBLE */ +#endif /* H5T_CONV_INTERIM_FP_LDOUBLE */ /*------------------------------------------------------------------------- @@ -7285,7 +7285,7 @@ done: * *------------------------------------------------------------------------- */ -#if FP_LDOUBLE +#if H5T_CONV_INTERIM_FP_LDOUBLE herr_t H5T_conv_ldouble_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, @@ -7301,7 +7301,7 @@ H5T_conv_ldouble_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, done: FUNC_LEAVE_NOAPI(ret_value); } -#endif /*FP_LDOUBLE*/ +#endif /*H5T_CONV_INTERIM_FP_LDOUBLE*/ /*------------------------------------------------------------------------- @@ -7383,7 +7383,7 @@ done: * *------------------------------------------------------------------------- */ -#if INTEGER_LDOUBLE +#if H5T_CONV_INTERIM_INTEGER_LDOUBLE herr_t H5T_conv_schar_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, @@ -7399,7 +7399,7 @@ H5T_conv_schar_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, done: FUNC_LEAVE_NOAPI(ret_value); } -#endif /* INTEGER_LDOUBLE */ +#endif /* H5T_CONV_INTERIM_INTEGER_LDOUBLE */ /*------------------------------------------------------------------------- @@ -7481,7 +7481,7 @@ done: * *------------------------------------------------------------------------- */ -#if INTEGER_LDOUBLE +#if H5T_CONV_INTERIM_INTEGER_LDOUBLE herr_t H5T_conv_uchar_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, @@ -7497,7 +7497,7 @@ H5T_conv_uchar_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, done: FUNC_LEAVE_NOAPI(ret_value); } -#endif /* INTEGER_LDOUBLE */ +#endif /* H5T_CONV_INTERIM_INTEGER_LDOUBLE */ /*------------------------------------------------------------------------- @@ -7579,7 +7579,7 @@ done: * *------------------------------------------------------------------------- */ -#if INTEGER_LDOUBLE +#if H5T_CONV_INTERIM_INTEGER_LDOUBLE herr_t H5T_conv_short_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, @@ -7595,7 +7595,7 @@ H5T_conv_short_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, done: FUNC_LEAVE_NOAPI(ret_value); } -#endif /* INTEGER_LDOUBLE */ +#endif /* H5T_CONV_INTERIM_INTEGER_LDOUBLE */ /*------------------------------------------------------------------------- @@ -7677,7 +7677,7 @@ done: * *------------------------------------------------------------------------- */ -#if INTEGER_LDOUBLE +#if H5T_CONV_INTERIM_INTEGER_LDOUBLE herr_t H5T_conv_ushort_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, @@ -7693,7 +7693,7 @@ H5T_conv_ushort_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, done: FUNC_LEAVE_NOAPI(ret_value); } -#endif /* INTEGER_LDOUBLE */ +#endif /* H5T_CONV_INTERIM_INTEGER_LDOUBLE */ /*------------------------------------------------------------------------- @@ -7775,7 +7775,7 @@ done: * *------------------------------------------------------------------------- */ -#if INTEGER_LDOUBLE +#if H5T_CONV_INTERIM_INTEGER_LDOUBLE herr_t H5T_conv_int_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, @@ -7791,7 +7791,7 @@ H5T_conv_int_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, done: FUNC_LEAVE_NOAPI(ret_value); } -#endif /* INTEGER_LDOUBLE */ +#endif /* H5T_CONV_INTERIM_INTEGER_LDOUBLE */ /*------------------------------------------------------------------------- @@ -7873,7 +7873,7 @@ done: * *------------------------------------------------------------------------- */ -#if INTEGER_LDOUBLE +#if H5T_CONV_INTERIM_INTEGER_LDOUBLE herr_t H5T_conv_uint_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, @@ -7889,7 +7889,7 @@ H5T_conv_uint_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, done: FUNC_LEAVE_NOAPI(ret_value); } -#endif /* INTEGER_LDOUBLE */ +#endif /* H5T_CONV_INTERIM_INTEGER_LDOUBLE */ /*------------------------------------------------------------------------- @@ -7971,7 +7971,7 @@ done: * *------------------------------------------------------------------------- */ -#if INTEGER_LDOUBLE +#if H5T_CONV_INTERIM_INTEGER_LDOUBLE herr_t H5T_conv_long_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, @@ -7987,7 +7987,7 @@ H5T_conv_long_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, done: FUNC_LEAVE_NOAPI(ret_value); } -#endif /* INTEGER_LDOUBLE */ +#endif /* H5T_CONV_INTERIM_INTEGER_LDOUBLE */ /*------------------------------------------------------------------------- @@ -8005,7 +8005,7 @@ done: * *------------------------------------------------------------------------- */ -#if ULONG_FP +#if H5T_CONV_INTERIM_ULONG_FP herr_t H5T_conv_ulong_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, @@ -8021,7 +8021,7 @@ H5T_conv_ulong_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, done: FUNC_LEAVE_NOAPI(ret_value); } -#endif /* ULONG_FP */ +#endif /* H5T_CONV_INTERIM_ULONG_FP */ /*------------------------------------------------------------------------- @@ -8039,7 +8039,7 @@ done: * *------------------------------------------------------------------------- */ -#if ULONG_FP +#if H5T_CONV_INTERIM_ULONG_FP herr_t H5T_conv_ulong_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, @@ -8055,7 +8055,7 @@ H5T_conv_ulong_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, done: FUNC_LEAVE_NOAPI(ret_value); } -#endif /* ULONG_FP */ +#endif /* H5T_CONV_INTERIM_ULONG_FP */ /*------------------------------------------------------------------------- @@ -8073,7 +8073,7 @@ done: * *------------------------------------------------------------------------- */ -#if ULONG_LDOUBLE +#if H5T_CONV_INTERIM_ULONG_LDOUBLE herr_t H5T_conv_ulong_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, @@ -8089,7 +8089,7 @@ H5T_conv_ulong_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, done: FUNC_LEAVE_NOAPI(ret_value); } -#endif /* ULONG_LDOUBLE */ +#endif /* H5T_CONV_INTERIM_ULONG_LDOUBLE */ /*------------------------------------------------------------------------- @@ -8171,7 +8171,7 @@ done: * *------------------------------------------------------------------------- */ -#if INTEGER_LDOUBLE +#if H5T_CONV_INTERIM_INTEGER_LDOUBLE herr_t H5T_conv_llong_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, @@ -8187,7 +8187,7 @@ H5T_conv_llong_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, done: FUNC_LEAVE_NOAPI(ret_value); } -#endif /* INTEGER_LDOUBLE */ +#endif /* H5T_CONV_INTERIM_INTEGER_LDOUBLE */ /*------------------------------------------------------------------------- @@ -8205,7 +8205,7 @@ done: * *------------------------------------------------------------------------- */ -#if ULLONG_FP +#if H5T_CONV_INTERIM_ULLONG_FP herr_t H5T_conv_ullong_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, @@ -8221,7 +8221,7 @@ H5T_conv_ullong_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, done: FUNC_LEAVE_NOAPI(ret_value); } -#endif /*ULLONG_FP*/ +#endif /*H5T_CONV_INTERIM_ULLONG_FP*/ /*------------------------------------------------------------------------- @@ -8239,7 +8239,7 @@ done: * *------------------------------------------------------------------------- */ -#if ULLONG_FP +#if H5T_CONV_INTERIM_ULLONG_FP herr_t H5T_conv_ullong_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, @@ -8255,7 +8255,7 @@ H5T_conv_ullong_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, done: FUNC_LEAVE_NOAPI(ret_value); } -#endif /*ULLONG_FP*/ +#endif /*H5T_CONV_INTERIM_ULLONG_FP*/ /*------------------------------------------------------------------------- @@ -8273,7 +8273,7 @@ done: * *------------------------------------------------------------------------- */ -#if ULLONG_LDOUBLE +#if H5T_CONV_INTERIM_ULLONG_LDOUBLE herr_t H5T_conv_ullong_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, @@ -8289,7 +8289,7 @@ H5T_conv_ullong_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, done: FUNC_LEAVE_NOAPI(ret_value); } -#endif /*ULLONG_LDOUBLE*/ +#endif /*H5T_CONV_INTERIM_ULLONG_LDOUBLE*/ /*------------------------------------------------------------------------- @@ -8435,7 +8435,7 @@ done: * *------------------------------------------------------------------------- */ -#if LDOUBLE_INTEGER +#if H5T_CONV_INTERIM_LDOUBLE_INTEGER herr_t H5T_conv_ldouble_schar (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, @@ -8451,7 +8451,7 @@ H5T_conv_ldouble_schar (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, done: FUNC_LEAVE_NOAPI(ret_value); } -#endif /* LDOUBLE_INTEGER */ +#endif /* H5T_CONV_INTERIM_LDOUBLE_INTEGER */ /*------------------------------------------------------------------------- @@ -8469,7 +8469,7 @@ done: * *------------------------------------------------------------------------- */ -#if LDOUBLE_INTEGER +#if H5T_CONV_INTERIM_LDOUBLE_INTEGER herr_t H5T_conv_ldouble_uchar (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, @@ -8485,7 +8485,7 @@ H5T_conv_ldouble_uchar (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, done: FUNC_LEAVE_NOAPI(ret_value); } -#endif /* LDOUBLE_INTEGER */ +#endif /* H5T_CONV_INTERIM_LDOUBLE_INTEGER */ /*------------------------------------------------------------------------- @@ -8631,7 +8631,7 @@ done: * *------------------------------------------------------------------------- */ -#if LDOUBLE_INTEGER +#if H5T_CONV_INTERIM_LDOUBLE_INTEGER herr_t H5T_conv_ldouble_short (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, @@ -8665,7 +8665,7 @@ done: * *------------------------------------------------------------------------- */ -#if LDOUBLE_INTEGER +#if H5T_CONV_INTERIM_LDOUBLE_INTEGER herr_t H5T_conv_ldouble_ushort (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, @@ -8681,7 +8681,7 @@ H5T_conv_ldouble_ushort (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, done: FUNC_LEAVE_NOAPI(ret_value); } -#endif /* LDOUBLE_INTEGER */ +#endif /* H5T_CONV_INTERIM_LDOUBLE_INTEGER */ /*------------------------------------------------------------------------- @@ -8827,7 +8827,7 @@ done: * *------------------------------------------------------------------------- */ -#if LDOUBLE_INTEGER +#if H5T_CONV_INTERIM_LDOUBLE_INTEGER herr_t H5T_conv_ldouble_int (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, @@ -8843,7 +8843,7 @@ H5T_conv_ldouble_int (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, done: FUNC_LEAVE_NOAPI(ret_value); } -#endif /* LDOUBLE_INTEGER */ +#endif /* H5T_CONV_INTERIM_LDOUBLE_INTEGER */ /*------------------------------------------------------------------------- @@ -8861,7 +8861,7 @@ done: * *------------------------------------------------------------------------- */ -#if LDOUBLE_UINT +#if H5T_CONV_INTERIM_LDOUBLE_UINT herr_t H5T_conv_ldouble_uint (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, @@ -8877,7 +8877,7 @@ H5T_conv_ldouble_uint (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, done: FUNC_LEAVE_NOAPI(ret_value); } -#endif /* LDOUBLE_UINT */ +#endif /* H5T_CONV_INTERIM_LDOUBLE_UINT */ /*------------------------------------------------------------------------- @@ -9023,7 +9023,7 @@ done: * *------------------------------------------------------------------------- */ -#if LDOUBLE_INTEGER +#if H5T_CONV_INTERIM_LDOUBLE_INTEGER herr_t H5T_conv_ldouble_long (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, @@ -9039,7 +9039,7 @@ H5T_conv_ldouble_long (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, done: FUNC_LEAVE_NOAPI(ret_value); } -#endif /*LDOUBLE_INTEGER*/ +#endif /*H5T_CONV_INTERIM_LDOUBLE_INTEGER*/ /*------------------------------------------------------------------------- @@ -9057,7 +9057,7 @@ done: * *------------------------------------------------------------------------- */ -#if LDOUBLE_INTEGER +#if H5T_CONV_INTERIM_LDOUBLE_INTEGER herr_t H5T_conv_ldouble_ulong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, @@ -9073,7 +9073,7 @@ H5T_conv_ldouble_ulong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, done: FUNC_LEAVE_NOAPI(ret_value); } -#endif /* LDOUBLE_INTEGER */ +#endif /* H5T_CONV_INTERIM_LDOUBLE_INTEGER */ /*------------------------------------------------------------------------- @@ -9091,7 +9091,7 @@ done: * *------------------------------------------------------------------------- */ -#if FP_LLONG +#if H5T_CONV_INTERIM_FP_LLONG herr_t H5T_conv_float_llong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, @@ -9107,7 +9107,7 @@ H5T_conv_float_llong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, done: FUNC_LEAVE_NOAPI(ret_value); } -#endif /* FP_LLONG */ +#endif /* H5T_CONV_INTERIM_FP_LLONG */ /*------------------------------------------------------------------------- @@ -9125,7 +9125,7 @@ done: * *------------------------------------------------------------------------- */ -#if FP_ULLONG +#if H5T_CONV_INTERIM_FP_ULLONG herr_t H5T_conv_float_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, @@ -9141,7 +9141,7 @@ H5T_conv_float_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, done: FUNC_LEAVE_NOAPI(ret_value); } -#endif /*FP_ULLONG*/ +#endif /*H5T_CONV_INTERIM_FP_ULLONG*/ /*------------------------------------------------------------------------- @@ -9159,7 +9159,7 @@ done: * *------------------------------------------------------------------------- */ -#if FP_LLONG +#if H5T_CONV_INTERIM_FP_LLONG herr_t H5T_conv_double_llong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, @@ -9175,7 +9175,7 @@ H5T_conv_double_llong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, done: FUNC_LEAVE_NOAPI(ret_value); } -#endif /*FP_LLONG*/ +#endif /*H5T_CONV_INTERIM_FP_LLONG*/ /*------------------------------------------------------------------------- @@ -9193,7 +9193,7 @@ done: * *------------------------------------------------------------------------- */ -#if FP_ULLONG +#if H5T_CONV_INTERIM_FP_ULLONG herr_t H5T_conv_double_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, @@ -9209,7 +9209,7 @@ H5T_conv_double_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, done: FUNC_LEAVE_NOAPI(ret_value); } -#endif /*FP_ULLONG*/ +#endif /*H5T_CONV_INTERIM_FP_ULLONG*/ /*------------------------------------------------------------------------- @@ -9227,7 +9227,7 @@ done: * *------------------------------------------------------------------------- */ -#if LDOUBLE_LLONG +#if H5T_CONV_INTERIM_LDOUBLE_LLONG herr_t H5T_conv_ldouble_llong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, @@ -9243,7 +9243,7 @@ H5T_conv_ldouble_llong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, done: FUNC_LEAVE_NOAPI(ret_value); } -#endif /*LDOUBLE_LLONG*/ +#endif /*H5T_CONV_INTERIM_LDOUBLE_LLONG*/ /*------------------------------------------------------------------------- @@ -9261,7 +9261,7 @@ done: * *------------------------------------------------------------------------- */ -#if LDOUBLE_ULLONG +#if H5T_CONV_INTERIM_LDOUBLE_ULLONG herr_t H5T_conv_ldouble_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, @@ -9277,7 +9277,7 @@ H5T_conv_ldouble_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, done: FUNC_LEAVE_NOAPI(ret_value); } -#endif /*LDOUBLE_ULLONG*/ +#endif /*H5T_CONV_INTERIM_LDOUBLE_ULLONG*/ /*------------------------------------------------------------------------- diff --git a/src/H5Tpkg.h b/src/H5Tpkg.h index 1f406e8..e98d5b0 100644 --- a/src/H5Tpkg.h +++ b/src/H5Tpkg.h @@ -68,33 +68,33 @@ /* Define an interim macro for converting between floating number(float and double) and floating number. * All Cray compilers don't support denormalized floating values generating exception(?). */ #if H5_CONVERT_DENORMAL_FLOAT -#define FP_FP 1 +#define H5T_CONV_INTERIM_FP_FP 1 #endif /*H5_CONVERT_DENORMAL_FLOAT*/ /* Define an interim macro for converting between floating number(float and double) and long double. * All Cray compilers don't support denormalized floating values generating exception(?). NEC doesn't * support long double. */ #if H5_SIZEOF_LONG_DOUBLE && H5_CONVERT_DENORMAL_FLOAT -#define FP_LDOUBLE 1 +#define H5T_CONV_INTERIM_FP_LDOUBLE 1 #endif /*H5_SIZEOF_LONG_DOUBLE && H5_CONVERT_DENORMAL_FLOAT*/ /* Define an interim macro for converting all integers to long double. SGI compilers give some * incorrect conversions. */ #if (H5_WANT_DATA_ACCURACY && H5_INTEGER_TO_LDOUBLE_ACCURATE) || (!H5_WANT_DATA_ACCURACY) -#define INTEGER_LDOUBLE 1 +#define H5T_CONV_INTERIM_INTEGER_LDOUBLE 1 #endif /* Define an interim macro for converting unsigned (long) long to floating numbers. * 64-bit Solaris does different rounding. */ #if (H5_WANT_DATA_ACCURACY && H5_ULONG_TO_FP_BOTTOM_BIT_ACCURATE) || (!H5_WANT_DATA_ACCURACY) -#define ULONG_FP 1 +#define H5T_CONV_INTERIM_ULONG_FP 1 #endif /* Define an interim macro for converting unsigned long to long double. SGI compilers give some * incorrect conversions. 64-bit Solaris does different rounding. */ #if (H5_WANT_DATA_ACCURACY && H5_INTEGER_TO_LDOUBLE_ACCURATE && H5_ULONG_TO_FP_BOTTOM_BIT_ACCURATE) || \ (!H5_WANT_DATA_ACCURACY) -#define ULONG_LDOUBLE 1 +#define H5T_CONV_INTERIM_ULONG_LDOUBLE 1 #endif /* Define an interim macro for converting unsigned long long to floating numbers. SGI compilers give @@ -102,7 +102,7 @@ * not support unsigned long long. */ #if (H5_WANT_DATA_ACCURACY && H5_ULLONG_TO_FP_CAST_WORKS && H5_ULONG_TO_FP_BOTTOM_BIT_ACCURATE) || \ (!H5_WANT_DATA_ACCURACY && H5_ULLONG_TO_FP_CAST_WORKS) -#define ULLONG_FP 1 +#define H5T_CONV_INTERIM_ULLONG_FP 1 #endif /* Define an interim macro for converting unsigned long long to long double. SGI compilers give @@ -111,14 +111,14 @@ * compiler tries to do the conversion. For Cygwin, compiler doesn't do rounding correctly. */ #if (H5_WANT_DATA_ACCURACY && H5_ULLONG_TO_FP_CAST_WORKS && H5_ULONG_TO_FP_BOTTOM_BIT_ACCURATE && \ H5_ULLONG_TO_LDOUBLE_PRECISION) || (!H5_WANT_DATA_ACCURACY && H5_ULLONG_TO_FP_CAST_WORKS) -#define ULLONG_LDOUBLE 1 +#define H5T_CONV_INTERIM_ULLONG_LDOUBLE 1 #endif /* Define an interim macro for converting long double to all integers. SGI compilers give some incorrect * conversions. HP-UX 11.00 compiler generates floating exception. */ #if (H5_WANT_DATA_ACCURACY && H5_LDOUBLE_TO_INTEGER_ACCURATE && H5_LDOUBLE_TO_INTEGER_WORKS) || \ (!H5_WANT_DATA_ACCURACY && H5_LDOUBLE_TO_INTEGER_WORKS) -#define LDOUBLE_INTEGER 1 +#define H5T_CONV_INTERIM_LDOUBLE_INTEGER 1 #endif /* Define an interim macro for converting long double to unsigned int. SGI compilers give some incorrect @@ -126,13 +126,13 @@ * give incorrect values. */ #if (H5_WANT_DATA_ACCURACY && H5_LDOUBLE_TO_INTEGER_ACCURATE && H5_LDOUBLE_TO_UINT_ACCURATE && \ H5_LDOUBLE_TO_INTEGER_WORKS) || (!H5_WANT_DATA_ACCURACY && H5_LDOUBLE_TO_INTEGER_WORKS) -#define LDOUBLE_UINT 1 +#define H5T_CONV_INTERIM_LDOUBLE_UINT 1 #endif /* Define an interim macro for converting floating numbers to long long. The hard conversion on Windows * .NET 2003 has a bug and gives wrong exception value. */ #if (H5_WANT_DATA_ACCURACY && !H5_HW_FP_TO_LLONG_NOT_WORKS) || (!H5_WANT_DATA_ACCURACY) -#define FP_LLONG 1 +#define H5T_CONV_INTERIM_FP_LLONG 1 #endif /* Define an interim macro for converting long double to long long. SGI compilers give some incorrect @@ -141,7 +141,7 @@ #if (H5_WANT_DATA_ACCURACY && !H5_HW_FP_TO_LLONG_NOT_WORKS && H5_LDOUBLE_TO_INTEGER_ACCURATE && \ H5_LDOUBLE_TO_INTEGER_WORKS) || \ (!H5_WANT_DATA_ACCURACY && !H5_HW_FP_TO_LLONG_NOT_WORKS && H5_LDOUBLE_TO_INTEGER_WORKS) -#define LDOUBLE_LLONG 1 +#define H5T_CONV_INTERIM_LDOUBLE_LLONG 1 #endif /* Define an interim macro for converting floating numbers to unsigned long long. PGI compiler does @@ -149,7 +149,7 @@ * for unsigned long long as 0x7fffffffffffffff during conversion. */ #if (H5_WANT_DATA_ACCURACY && H5_FP_TO_ULLONG_ACCURATE && H5_FP_TO_ULLONG_RIGHT_MAXIMUM) || \ (!H5_WANT_DATA_ACCURACY) -#define FP_ULLONG 1 +#define H5T_CONV_INTERIM_FP_ULLONG 1 #endif /* Define an interim macro for converting long double to all integers. SGI compilers give some incorrect @@ -157,7 +157,7 @@ #if (H5_WANT_DATA_ACCURACY && H5_LDOUBLE_TO_INTEGER_ACCURATE && H5_LDOUBLE_TO_INTEGER_WORKS && \ H5_FP_TO_ULLONG_ACCURATE && H5_FP_TO_ULLONG_RIGHT_MAXIMUM) || \ (!H5_WANT_DATA_ACCURACY && H5_LDOUBLE_TO_INTEGER_WORKS) -#define LDOUBLE_ULLONG 1 +#define H5T_CONV_INTERIM_LDOUBLE_ULLONG 1 #endif /* Statistics about a conversion function */ |