Mercurial > octave
diff libinterp/octave-value/ov-bool-sparse.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-bool-sparse.cc Sat Feb 06 07:43:32 2016 -0500 +++ b/libinterp/octave-value/ov-bool-sparse.cc Sat Feb 06 08:48:47 2016 -0500 @@ -345,7 +345,7 @@ // Ensure that additional memory is deallocated matrix.maybe_compress (); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) hid_t group_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -366,7 +366,7 @@ H5Gclose (group_hid); return false; } -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (group_hid, "nr", H5T_NATIVE_IDX, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -391,7 +391,7 @@ return false; } -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (group_hid, "nc", H5T_NATIVE_IDX, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -416,7 +416,7 @@ return false; } -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (group_hid, "nz", H5T_NATIVE_IDX, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -454,7 +454,7 @@ return false; } -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (group_hid, "cidx", H5T_NATIVE_IDX, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -492,7 +492,7 @@ return false; } -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (group_hid, "ridx", H5T_NATIVE_IDX, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -517,7 +517,7 @@ return false; } -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (group_hid, "data", H5T_NATIVE_HBOOL, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -566,14 +566,14 @@ if (empty) return (empty > 0); -#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); #endif if (group_hid < 0) return false; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dopen (group_hid, "nr", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "nr"); @@ -598,7 +598,7 @@ H5Dclose (data_hid); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dopen (group_hid, "nc", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "nc"); @@ -623,7 +623,7 @@ H5Dclose (data_hid); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dopen (group_hid, "nz", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "nz"); @@ -652,7 +652,7 @@ static_cast<octave_idx_type> (nc), static_cast<octave_idx_type> (nz)); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dopen (group_hid, "cidx", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "cidx"); @@ -695,7 +695,7 @@ H5Sclose (space_hid); H5Dclose (data_hid); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dopen (group_hid, "ridx", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "ridx"); @@ -735,7 +735,7 @@ H5Sclose (space_hid); H5Dclose (data_hid); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dopen (group_hid, "data", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "data");