Mercurial > jwe > octave
diff libinterp/octave-value/ov-cell.cc @ 21211:2cf8bc5c7017
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-cell.cc Sat Feb 06 07:43:32 2016 -0500 +++ b/libinterp/octave-value/ov-cell.cc Sat Feb 06 08:48:47 2016 -0500 @@ -976,7 +976,7 @@ hid_t space_hid, data_hid, size_hid; space_hid = data_hid = size_hid = -1; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else data_hid = H5Gcreate (loc_id, name, 0); @@ -1002,7 +1002,7 @@ for (hsize_t i = 0; i < rank; i++) hdims[i] = dv(rank-i-1); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) size_hid = H5Dcreate (data_hid, "dims", H5T_NATIVE_IDX, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -1076,7 +1076,7 @@ if (empty) return (empty > 0); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) hid_t group_id = H5Gopen (loc_id, name, octave_H5P_DEFAULT); #else hid_t group_id = H5Gopen (loc_id, name); @@ -1085,7 +1085,7 @@ if (group_id < 0) return false; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) hid_t data_hid = H5Dopen (group_id, "dims", octave_H5P_DEFAULT); #else hid_t data_hid = H5Dopen (group_id, "dims"); @@ -1133,7 +1133,7 @@ int current_item = 0; hsize_t num_obj = 0; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) group_id = H5Gopen (loc_id, name, octave_H5P_DEFAULT); #else group_id = H5Gopen (loc_id, name);