Mercurial > octave

comparison libinterp/octave-value/ov-scalar.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 5f318c8ec634
comparison
equal deleted inserted replaced
21210:4f7d3989c462 21211:2cf8bc5c7017
209 space_hid = data_hid = -1; 209 space_hid = data_hid = -1;
210 210
211 space_hid = H5Screate_simple (0, dimens, 0); 211 space_hid = H5Screate_simple (0, dimens, 0);
212 if (space_hid < 0) return false; 212 if (space_hid < 0) return false;
213 213
214 #if HAVE_HDF5_18 214 #if defined (HAVE_HDF5_18)
215 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_DOUBLE, space_hid, 215 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_DOUBLE, space_hid,
216 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); 216 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
217 #else 217 #else
218 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_DOUBLE, space_hid, 218 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_DOUBLE, space_hid,
219 octave_H5P_DEFAULT); 219 octave_H5P_DEFAULT);
241 bool 241 bool
242 octave_scalar::load_hdf5 (octave_hdf5_id loc_id, const char *name) 242 octave_scalar::load_hdf5 (octave_hdf5_id loc_id, const char *name)
243 { 243 {
244 #if defined (HAVE_HDF5) 244 #if defined (HAVE_HDF5)
245 245
246 #if HAVE_HDF5_18 246 #if defined (HAVE_HDF5_18)
247 hid_t data_hid = H5Dopen (loc_id, name, octave_H5P_DEFAULT); 247 hid_t data_hid = H5Dopen (loc_id, name, octave_H5P_DEFAULT);
248 #else 248 #else
249 hid_t data_hid = H5Dopen (loc_id, name); 249 hid_t data_hid = H5Dopen (loc_id, name);
250 #endif 250 #endif
251 hid_t space_id = H5Dget_space (data_hid); 251 hid_t space_id = H5Dget_space (data_hid);