Mercurial > octave-libtiff

diff libinterp/corefcn/ls-hdf5.cc @ 21211:2cf8bc5c7017

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests * configure.ac (HAVE_HDF5_INT2FLOAT_CONVERSIONS): AC_DEFINE here. * ls-hdf5.cc (HAVE_HDF5_INT2FLOAT_CONVERSION): Delete definition. * ls-hdf5.cc, ls-hdf5.h, ccolamd.cc, dmperm.cc, ov-base-int.cc, ov-bool-mat.cc, ov-bool-sparse.cc, ov-bool.cc, ov-cell.cc, ov-class.cc, ov-complex.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-fcn-handle.cc, ov-fcn-inline.cc, ov-float.cc, ov-flt-complex.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-java.cc, ov-range.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc, ov-struct.cc, pt-eval.cc: Use #if defined (HAVE_FOO) instead of #if HAVE_FOO.
author John W. Eaton <jwe@octave.org>
date Sat, 06 Feb 2016 08:48:47 -0500
parents fcac5dbbf9ed
children 40de9f8f23a6
line wrap: on
line diff
--- a/libinterp/corefcn/ls-hdf5.cc	Sat Feb 06 07:43:32 2016 -0500
+++ b/libinterp/corefcn/ls-hdf5.cc	Sat Feb 06 08:48:47 2016 -0500
@@ -145,10 +145,6 @@
   return retval;
 }
 
-// Define this to 1 if/when HDF5 supports automatic conversion between
-// integer and floating-point binary data:
-#define HAVE_HDF5_INT2FLOAT_CONVERSIONS 0
-
 // Given two compound types t1 and t2, determine whether they
 // are compatible for reading/writing.  This function only
 // works for non-nested types composed of simple elements (ints, floats...),
@@ -194,7 +190,7 @@
   // turn off error reporting temporarily, but save the error
   // reporting function:
 
-#if HAVE_HDF5_18
+#if defined (HAVE_HDF5_18)
   H5Eget_auto (octave_H5E_DEFAULT, &err_func, &err_func_data);
   H5Eset_auto (octave_H5E_DEFAULT, 0, 0);
 #else
@@ -212,7 +208,7 @@
     }
 
   // restore error reporting:
-#if HAVE_HDF5_18
+#if defined (HAVE_HDF5_18)
   H5Eset_auto (octave_H5E_DEFAULT, err_func, err_func_data);
 #else
   H5Eset_auto (err_func, err_func_data);
@@ -236,7 +232,7 @@
   // turn off error reporting temporarily, but save the error
   // reporting function:
 
-#if HAVE_HDF5_18
+#if defined (HAVE_HDF5_18)
   H5Eget_auto (octave_H5E_DEFAULT, &err_func, &err_func_data);
   H5Eset_auto (octave_H5E_DEFAULT, 0, 0);
 #else
@@ -258,7 +254,7 @@
     }
 
   // restore error reporting:
-#if HAVE_HDF5_18
+#if defined (HAVE_HDF5_18)
   H5Eset_auto (octave_H5E_DEFAULT, err_func, err_func_data);
 #else
   H5Eset_auto (err_func, err_func_data);
@@ -328,7 +324,7 @@
 
   if (info.type == H5G_GROUP && ident_valid)
     {
-#if HAVE_HDF5_18
+#if defined (HAVE_HDF5_18)
       subgroup_id = H5Gopen (group_id, name, octave_H5P_DEFAULT);
 #else
       subgroup_id = H5Gopen (group_id, name);
@@ -342,7 +338,7 @@
 
       if (hdf5_check_attr (subgroup_id, "OCTAVE_NEW_FORMAT"))
         {
-#if HAVE_HDF5_18
+#if defined (HAVE_HDF5_18)
           data_id = H5Dopen (subgroup_id, "type", octave_H5P_DEFAULT);
 #else
           data_id = H5Dopen (subgroup_id, "type");
@@ -416,7 +412,7 @@
   else if (info.type == H5G_DATASET && ident_valid)
     {
       // For backwards compatibility.
-#if HAVE_HDF5_18
+#if defined (HAVE_HDF5_18)
       data_id = H5Dopen (group_id, name, octave_H5P_DEFAULT);
 #else
       data_id = H5Dopen (group_id, name);
@@ -651,7 +647,7 @@
   herr_t H5Giterate_retval = -1;
 
   hsize_t num_obj = 0;
-#if HAVE_HDF5_18
+#if defined (HAVE_HDF5_18)
   hid_t group_id = H5Gopen (hs.file_id, "/", octave_H5P_DEFAULT);
 #else
   hid_t group_id = H5Gopen (hs.file_id, "/");
@@ -723,7 +719,7 @@
 
   if (as_id >= 0)
     {
-#if HAVE_HDF5_18
+#if defined (HAVE_HDF5_18)
       hid_t a_id = H5Acreate (loc_id, attr_name, H5T_NATIVE_UCHAR,
                               as_id, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
 #else
@@ -759,7 +755,7 @@
 
   if (as_id >= 0)
     {
-#if HAVE_HDF5_18
+#if defined (HAVE_HDF5_18)
       hid_t a_id = H5Acreate (loc_id, attr_name, type_id,
                               as_id, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
 #else
@@ -808,7 +804,7 @@
 
   space_hid = H5Screate_simple (1, &sz, 0);
   if (space_hid < 0) return space_hid;
-#if HAVE_HDF5_18
+#if defined (HAVE_HDF5_18)
   data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_IDX, space_hid,
                         octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
 #else
@@ -844,7 +840,7 @@
     return 0;
 
   hsize_t hdims, maxdims;
-#if HAVE_HDF5_18
+#if defined (HAVE_HDF5_18)
   hid_t data_hid = H5Dopen (loc_id, name, octave_H5P_DEFAULT);
 #else
   hid_t data_hid = H5Dopen (loc_id, name);
@@ -873,7 +869,7 @@
 // save_type_to_hdf5 is not currently used, since hdf5 doesn't yet support
 // automatic float<->integer conversions:
 
-#if HAVE_HDF5_INT2FLOAT_CONVERSIONS
+#if defined (HAVE_HDF5_INT2FLOAT_CONVERSIONS)
 
 // return the HDF5 type id corresponding to the Octave save_type
 
@@ -934,7 +930,7 @@
     val = val.full_value ();
 
   std::string t = val.type_name ();
-#if HAVE_HDF5_18
+#if defined (HAVE_HDF5_18)
   data_id = H5Gcreate (loc_id, name.c_str (), octave_H5P_DEFAULT, octave_H5P_DEFAULT,
                        octave_H5P_DEFAULT);
 #else
@@ -952,7 +948,7 @@
   space_id = H5Screate_simple (0 , dims, 0);
   if (space_id < 0)
     goto error_cleanup;
-#if HAVE_HDF5_18
+#if defined (HAVE_HDF5_18)
   data_type_id = H5Dcreate (data_id, "type",  type_id, space_id,
                             octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
 #else