Mercurial > octave

diff libinterp/octave-value/ov-fcn-handle.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/octave-value/ov-fcn-handle.cc	Sat Feb 06 07:43:32 2016 -0500
+++ b/libinterp/octave-value/ov-fcn-handle.cc	Sat Feb 06 08:48:47 2016 -0500
@@ -688,7 +688,7 @@
   bool retval = true;
 
   hid_t group_hid = -1;
-#if HAVE_HDF5_18
+#if defined (HAVE_HDF5_18)
   group_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
 #else
   group_hid = H5Gcreate (loc_id, name, 0);
@@ -718,7 +718,7 @@
       H5Gclose (group_hid);
       return false;
     }
-#if HAVE_HDF5_18
+#if defined (HAVE_HDF5_18)
   data_hid = H5Dcreate (group_hid, "nm",  type_hid, space_hid,
                         octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
 #else
@@ -749,7 +749,7 @@
           return false;
         }
 
-#if HAVE_HDF5_18
+#if defined (HAVE_HDF5_18)
       data_hid = H5Dcreate (group_hid, "fcn",  type_hid, space_hid,
                             octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
 #else
@@ -780,7 +780,7 @@
 
           if (as_id >= 0)
             {
-#if HAVE_HDF5_18
+#if defined (HAVE_HDF5_18)
               hid_t a_id = H5Acreate (group_hid, "SYMBOL_TABLE",
                                       H5T_NATIVE_IDX, as_id,
                                       octave_H5P_DEFAULT, octave_H5P_DEFAULT);
@@ -803,7 +803,7 @@
             }
           else
             retval = false;
-#if HAVE_HDF5_18
+#if defined (HAVE_HDF5_18)
           data_hid = H5Gcreate (group_hid, "symbol table",
                                 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
 #else
@@ -848,7 +848,7 @@
       H5Tclose (type_hid);
       type_hid = H5Tcopy (H5T_C_S1);
       H5Tset_size (type_hid, octaveroot.length () + 1);
-#if HAVE_HDF5_18
+#if defined (HAVE_HDF5_18)
       hid_t a_id = H5Acreate (group_hid, "OCTAVEROOT",
                               type_hid, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
 #else
@@ -885,7 +885,7 @@
       type_hid = H5Tcopy (H5T_C_S1);
       H5Tset_size (type_hid, fpath.length () + 1);
 
-#if HAVE_HDF5_18
+#if defined (HAVE_HDF5_18)
       a_id = H5Acreate (group_hid, "FILE", type_hid, space_hid,
                         octave_H5P_DEFAULT, octave_H5P_DEFAULT);
 #else
@@ -925,7 +925,7 @@
   hsize_t rank;
   int slen;
 
-#if HAVE_HDF5_18
+#if defined (HAVE_HDF5_18)
   group_hid = H5Gopen (loc_id, name, octave_H5P_DEFAULT);
 #else
   group_hid = H5Gopen (loc_id, name);
@@ -933,7 +933,7 @@
   if (group_hid < 0)
     return false;
 
-#if HAVE_HDF5_18
+#if defined (HAVE_HDF5_18)
   data_hid = H5Dopen (group_hid, "nm", octave_H5P_DEFAULT);
 #else
   data_hid = H5Dopen (group_hid, "nm");
@@ -999,7 +999,7 @@
 
   if (nm == anonymous)
     {
-#if HAVE_HDF5_18
+#if defined (HAVE_HDF5_18)
       data_hid = H5Dopen (group_hid, "fcn", octave_H5P_DEFAULT);
 #else
       data_hid = H5Dopen (group_hid, "fcn");
@@ -1078,7 +1078,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
@@ -1097,7 +1097,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);
@@ -1119,7 +1119,7 @@
       if (len > 0 && success)
         {
           hsize_t num_obj = 0;
-#if HAVE_HDF5_18
+#if defined (HAVE_HDF5_18)
           data_hid = H5Gopen (group_hid, "symbol table", octave_H5P_DEFAULT);
 #else
           data_hid = H5Gopen (group_hid, "symbol table");
@@ -1184,7 +1184,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
@@ -1250,7 +1250,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);