summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScot Breitenfeld <brtnfld@hdfgroup.org>2008-10-13 17:57:15 (GMT)
committerScot Breitenfeld <brtnfld@hdfgroup.org>2008-10-13 17:57:15 (GMT)
commitdb0867d957ee90b5e06c8b4dd5716b2e90c2391d (patch)
tree03720613bef33403cb06997b42816902d27d4f50
parentc22b3f133b8fbf81c84c926637e8e09601bb8412 (diff)
downloadhdf5-db0867d957ee90b5e06c8b4dd5716b2e90c2391d.zip
hdf5-db0867d957ee90b5e06c8b4dd5716b2e90c2391d.tar.gz
hdf5-db0867d957ee90b5e06c8b4dd5716b2e90c2391d.tar.bz2
[svn-r15850] Description:
Removed refences to "double" so that we don't distinguish between writeDoubleToFiles and writeFloatToFiles such that we match the definitions of c_float_4, c_float_8, and c_float_16 in H5f90i_gen.h
-rw-r--r--fortran/src/H5_f.c88
1 files changed, 88 insertions, 0 deletions
diff --git a/fortran/src/H5_f.c b/fortran/src/H5_f.c
index 8a81010..915f8cb 100644
--- a/fortran/src/H5_f.c
+++ b/fortran/src/H5_f.c
@@ -106,6 +106,94 @@ nh5init_types_c( hid_t_f * types, hid_t_f * floatingtypes, hid_t_f * integertype
if ((types[4] = (hid_t_f)H5Tcopy(H5T_STD_REF_OBJ)) < 0) return ret_value;
if ((types[5] = (hid_t_f)H5Tcopy(H5T_STD_REF_DSETREG)) < 0) return ret_value;
+ if (sizeof(int_1_f) == sizeof(char)) {
+ if ((types[6] = (hid_t_f)H5Tcopy(H5T_NATIVE_CHAR)) < 0) return ret_value;
+ } /*end if */
+ else if (sizeof(int_1_f) == sizeof(short)) {
+ if ((types[6] = (hid_t_f)H5Tcopy(H5T_NATIVE_SHORT)) < 0) return ret_value;
+ } /*end if */
+ else if (sizeof(int_1_f) == sizeof(int)) {
+ if ((types[6] = (hid_t_f)H5Tcopy(H5T_NATIVE_INT)) < 0) return ret_value;
+ } /*end if */
+ else if (sizeof(int_1_f) == sizeof(long_long)) {
+ if ((types[6] = (hid_t_f)H5Tcopy(H5T_NATIVE_LLONG)) < 0) return ret_value;
+ } /*end else */
+
+ if (sizeof(int_2_f) == sizeof(char)) {
+ if ((types[7] = (hid_t_f)H5Tcopy(H5T_NATIVE_CHAR)) < 0) return ret_value;
+ } /*end if */
+ else if (sizeof(int_2_f) == sizeof(short)) {
+ if ((types[7] = (hid_t_f)H5Tcopy(H5T_NATIVE_SHORT)) < 0) return ret_value;
+ } /*end if */
+ else if (sizeof(int_2_f) == sizeof(int)) {
+ if ((types[7] = (hid_t_f)H5Tcopy(H5T_NATIVE_INT)) < 0) return ret_value;
+ } /*end if */
+ else if (sizeof(int_2_f) == sizeof(long_long)) {
+ if ((types[7] = (hid_t_f)H5Tcopy(H5T_NATIVE_LLONG)) < 0) return ret_value;
+ } /*end else */
+
+ if (sizeof(int_4_f) == sizeof(char)) {
+ if ((types[8] = (hid_t_f)H5Tcopy(H5T_NATIVE_CHAR)) < 0) return ret_value;
+ } /*end if */
+ else if (sizeof(int_4_f) == sizeof(short)) {
+ if ((types[8] = (hid_t_f)H5Tcopy(H5T_NATIVE_SHORT)) < 0) return ret_value;
+ } /*end if */
+ else if (sizeof(int_4_f) == sizeof(int)) {
+ if ((types[8] = (hid_t_f)H5Tcopy(H5T_NATIVE_INT)) < 0) return ret_value;
+ } /*end if */
+ else if (sizeof(int_4_f) == sizeof(long_long)) {
+ if ((types[8] = (hid_t_f)H5Tcopy(H5T_NATIVE_LLONG)) < 0) return ret_value;
+ } /*end else */
+
+ if (sizeof(int_8_f) == sizeof(char)) {
+ if ((types[9] = (hid_t_f)H5Tcopy(H5T_NATIVE_CHAR)) < 0) return ret_value;
+ } /*end if */
+ else if (sizeof(int_8_f) == sizeof(short)) {
+ if ((types[9] = (hid_t_f)H5Tcopy(H5T_NATIVE_SHORT)) < 0) return ret_value;
+ } /*end if */
+ else if (sizeof(int_8_f) == sizeof(int)) {
+ if ((types[9] = (hid_t_f)H5Tcopy(H5T_NATIVE_INT)) < 0) return ret_value;
+ } /*end if */
+ else if (sizeof(int_8_f) == sizeof(long_long)) {
+ if ((types[9] = (hid_t_f)H5Tcopy(H5T_NATIVE_LLONG)) < 0) return ret_value;
+ } /*end else */
+
+ if (sizeof(real_4_f) == sizeof(float)) {
+ if ((types[10] = (hid_t_f)H5Tcopy(H5T_NATIVE_FLOAT)) < 0) return ret_value;
+ } /*end if */
+ else if (sizeof(real_4_f) == sizeof(double)) {
+ if ((types[10] = (hid_t_f)H5Tcopy(H5T_NATIVE_DOUBLE)) < 0) return ret_value;
+ } /*end if */
+#if H5_SIZEOF_LONG_DOUBLE!=0
+ else if (sizeof(real_4_f) == sizeof(long double)) {
+ if ((types[10] = (hid_t_f)H5Tcopy(H5T_NATIVE_LDOUBLE)) < 0) return ret_value;
+ } /*end else */
+#endif
+
+ if (sizeof(real_8_f) == sizeof(float)) {
+ if ((types[11] = (hid_t_f)H5Tcopy(H5T_NATIVE_FLOAT)) < 0) return ret_value;
+ } /*end if */
+ else if (sizeof(real_8_f) == sizeof(double)) {
+ if ((types[11] = (hid_t_f)H5Tcopy(H5T_NATIVE_DOUBLE)) < 0) return ret_value;
+ } /*end if */
+#if H5_SIZEOF_LONG_DOUBLE!=0
+ else if (sizeof(real_8_f) == sizeof(long double)) {
+ if ((types[11] = (hid_t_f)H5Tcopy(H5T_NATIVE_LDOUBLE)) < 0) return ret_value;
+ } /*end else */
+#endif
+
+ if (sizeof(real_16_f) == sizeof(float)) {
+ if ((types[12] = (hid_t_f)H5Tcopy(H5T_NATIVE_FLOAT)) < 0) return ret_value;
+ } /*end if */
+ else if (sizeof(real_16_f) == sizeof(double)) {
+ if ((types[12] = (hid_t_f)H5Tcopy(H5T_NATIVE_DOUBLE)) < 0) return ret_value;
+ } /*end if */
+#if H5_SIZEOF_LONG_DOUBLE!=0
+ else if (sizeof(real_16_f) == sizeof(long double)) {
+ if ((types[12] = (hid_t_f)H5Tcopy(H5T_NATIVE_LDOUBLE)) < 0) return ret_value;
+ } /*end else */
+#endif
+
if ((floatingtypes[0] = (hid_t_f)H5Tcopy(H5T_IEEE_F32BE)) < 0) return ret_value;
if ((floatingtypes[1] = (hid_t_f)H5Tcopy(H5T_IEEE_F32LE)) < 0) return ret_value;
if ((floatingtypes[2] = (hid_t_f)H5Tcopy(H5T_IEEE_F64BE)) < 0) return ret_value;