Mercurial > octave

comparison libinterp/octave-value/ov-bool-mat.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
comparison
equal deleted inserted replaced
21210:4f7d3989c462 21211:2cf8bc5c7017
393 for (int i = 0; i < rank; i++) 393 for (int i = 0; i < rank; i++)
394 hdims[i] = dv(rank-i-1); 394 hdims[i] = dv(rank-i-1);
395 395
396 space_hid = H5Screate_simple (rank, hdims, 0); 396 space_hid = H5Screate_simple (rank, hdims, 0);
397 if (space_hid < 0) return false; 397 if (space_hid < 0) return false;
398 #if HAVE_HDF5_18 398 #if defined (HAVE_HDF5_18)
399 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_HBOOL, space_hid, 399 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_HBOOL, space_hid,
400 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); 400 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
401 #else 401 #else
402 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_HBOOL, space_hid, 402 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_HBOOL, space_hid,
403 octave_H5P_DEFAULT); 403 octave_H5P_DEFAULT);
440 if (empty > 0) 440 if (empty > 0)
441 matrix.resize (dv); 441 matrix.resize (dv);
442 if (empty) 442 if (empty)
443 return (empty > 0); 443 return (empty > 0);
444 444
445 #if HAVE_HDF5_18 445 #if defined (HAVE_HDF5_18)
446 hid_t data_hid = H5Dopen (loc_id, name, octave_H5P_DEFAULT); 446 hid_t data_hid = H5Dopen (loc_id, name, octave_H5P_DEFAULT);
447 #else 447 #else
448 hid_t data_hid = H5Dopen (loc_id, name); 448 hid_t data_hid = H5Dopen (loc_id, name);
449 #endif 449 #endif
450 hid_t space_id = H5Dget_space (data_hid); 450 hid_t space_id = H5Dget_space (data_hid);