Mercurial > octave-libtiff

comparison libinterp/octave-value/ov-base-int.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
347 hdims[i] = dv(rank-i-1); 347 hdims[i] = dv(rank-i-1);
348 348
349 space_hid = H5Screate_simple (rank, hdims, 0); 349 space_hid = H5Screate_simple (rank, hdims, 0);
350 350
351 if (space_hid < 0) return false; 351 if (space_hid < 0) return false;
352 #if HAVE_HDF5_18 352 #if defined (HAVE_HDF5_18)
353 data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid, 353 data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid,
354 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); 354 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
355 #else 355 #else
356 data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid, 356 data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid,
357 octave_H5P_DEFAULT); 357 octave_H5P_DEFAULT);
389 if (empty > 0) 389 if (empty > 0)
390 this->matrix.resize (dv); 390 this->matrix.resize (dv);
391 if (empty) 391 if (empty)
392 return (empty > 0); 392 return (empty > 0);
393 393
394 #if HAVE_HDF5_18 394 #if defined (HAVE_HDF5_18)
395 hid_t data_hid = H5Dopen (loc_id, name, octave_H5P_DEFAULT); 395 hid_t data_hid = H5Dopen (loc_id, name, octave_H5P_DEFAULT);
396 #else 396 #else
397 hid_t data_hid = H5Dopen (loc_id, name); 397 hid_t data_hid = H5Dopen (loc_id, name);
398 #endif 398 #endif
399 hid_t space_id = H5Dget_space (data_hid); 399 hid_t space_id = H5Dget_space (data_hid);
554 space_hid = data_hid = -1; 554 space_hid = data_hid = -1;
555 555
556 space_hid = H5Screate_simple (0, dimens, 0); 556 space_hid = H5Screate_simple (0, dimens, 0);
557 if (space_hid < 0) return false; 557 if (space_hid < 0) return false;
558 558
559 #if HAVE_HDF5_18 559 #if defined (HAVE_HDF5_18)
560 data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid, 560 data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid,
561 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); 561 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
562 #else 562 #else
563 data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid, 563 data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid,
564 octave_H5P_DEFAULT); 564 octave_H5P_DEFAULT);
587 octave_base_int_scalar<T>::load_hdf5 (octave_hdf5_id loc_id, const char *name) 587 octave_base_int_scalar<T>::load_hdf5 (octave_hdf5_id loc_id, const char *name)
588 { 588 {
589 #if defined (HAVE_HDF5) 589 #if defined (HAVE_HDF5)
590 590
591 hid_t save_type_hid = HDF5_SAVE_TYPE; 591 hid_t save_type_hid = HDF5_SAVE_TYPE;
592 #if HAVE_HDF5_18 592 #if defined (HAVE_HDF5_18)
593 hid_t data_hid = H5Dopen (loc_id, name, octave_H5P_DEFAULT); 593 hid_t data_hid = H5Dopen (loc_id, name, octave_H5P_DEFAULT);
594 #else 594 #else
595 hid_t data_hid = H5Dopen (loc_id, name); 595 hid_t data_hid = H5Dopen (loc_id, name);
596 #endif 596 #endif
597 hid_t space_id = H5Dget_space (data_hid); 597 hid_t space_id = H5Dget_space (data_hid);