Mercurial > octave

comparison libinterp/octave-value/ov-complex.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
361 if (type_hid < 0) 361 if (type_hid < 0)
362 { 362 {
363 H5Sclose (space_hid); 363 H5Sclose (space_hid);
364 return false; 364 return false;
365 } 365 }
366 #if HAVE_HDF5_18 366 #if defined (HAVE_HDF5_18)
367 data_hid = H5Dcreate (loc_id, name, type_hid, space_hid, 367 data_hid = H5Dcreate (loc_id, name, type_hid, space_hid,
368 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); 368 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
369 #else 369 #else
370 data_hid = H5Dcreate (loc_id, name, type_hid, space_hid, octave_H5P_DEFAULT); 370 data_hid = H5Dcreate (loc_id, name, type_hid, space_hid, octave_H5P_DEFAULT);
371 #endif 371 #endif
396 { 396 {
397 bool retval = false; 397 bool retval = false;
398 398
399 #if defined (HAVE_HDF5) 399 #if defined (HAVE_HDF5)
400 400
401 #if HAVE_HDF5_18 401 #if defined (HAVE_HDF5_18)
402 hid_t data_hid = H5Dopen (loc_id, name, octave_H5P_DEFAULT); 402 hid_t data_hid = H5Dopen (loc_id, name, octave_H5P_DEFAULT);
403 #else 403 #else
404 hid_t data_hid = H5Dopen (loc_id, name); 404 hid_t data_hid = H5Dopen (loc_id, name);
405 #endif 405 #endif
406 hid_t type_hid = H5Dget_type (data_hid); 406 hid_t type_hid = H5Dget_type (data_hid);