Mercurial > octave-libtiff
comparison libinterp/octave-value/ov-bool.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 |
comparison
equal
deleted
inserted
replaced
21210:4f7d3989c462 | 21211:2cf8bc5c7017 |
---|---|
167 hid_t space_hid, data_hid; | 167 hid_t space_hid, data_hid; |
168 space_hid = data_hid = -1; | 168 space_hid = data_hid = -1; |
169 | 169 |
170 space_hid = H5Screate_simple (0, dimens, 0); | 170 space_hid = H5Screate_simple (0, dimens, 0); |
171 if (space_hid < 0) return false; | 171 if (space_hid < 0) return false; |
172 #if HAVE_HDF5_18 | 172 #if defined (HAVE_HDF5_18) |
173 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_DOUBLE, space_hid, | 173 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_DOUBLE, space_hid, |
174 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); | 174 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); |
175 #else | 175 #else |
176 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_DOUBLE, space_hid, | 176 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_DOUBLE, space_hid, |
177 octave_H5P_DEFAULT); | 177 octave_H5P_DEFAULT); |
199 bool | 199 bool |
200 octave_bool::load_hdf5 (octave_hdf5_id loc_id, const char *name) | 200 octave_bool::load_hdf5 (octave_hdf5_id loc_id, const char *name) |
201 { | 201 { |
202 #if defined (HAVE_HDF5) | 202 #if defined (HAVE_HDF5) |
203 | 203 |
204 #if HAVE_HDF5_18 | 204 #if defined (HAVE_HDF5_18) |
205 hid_t data_hid = H5Dopen (loc_id, name, octave_H5P_DEFAULT); | 205 hid_t data_hid = H5Dopen (loc_id, name, octave_H5P_DEFAULT); |
206 #else | 206 #else |
207 hid_t data_hid = H5Dopen (loc_id, name); | 207 hid_t data_hid = H5Dopen (loc_id, name); |
208 #endif | 208 #endif |
209 hid_t space_id = H5Dget_space (data_hid); | 209 hid_t space_id = H5Dget_space (data_hid); |