Mercurial > octave
comparison libinterp/octave-value/ov-range.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 |
---|---|
563 if (type_hid < 0) | 563 if (type_hid < 0) |
564 { | 564 { |
565 H5Sclose (space_hid); | 565 H5Sclose (space_hid); |
566 return false; | 566 return false; |
567 } | 567 } |
568 #if HAVE_HDF5_18 | 568 #if defined (HAVE_HDF5_18) |
569 data_hid = H5Dcreate (loc_id, name, type_hid, space_hid, | 569 data_hid = H5Dcreate (loc_id, name, type_hid, space_hid, |
570 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); | 570 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); |
571 #else | 571 #else |
572 data_hid = H5Dcreate (loc_id, name, type_hid, space_hid, octave_H5P_DEFAULT); | 572 data_hid = H5Dcreate (loc_id, name, type_hid, space_hid, octave_H5P_DEFAULT); |
573 #endif | 573 #endif |
610 { | 610 { |
611 bool retval = false; | 611 bool retval = false; |
612 | 612 |
613 #if defined (HAVE_HDF5) | 613 #if defined (HAVE_HDF5) |
614 | 614 |
615 #if HAVE_HDF5_18 | 615 #if defined (HAVE_HDF5_18) |
616 hid_t data_hid = H5Dopen (loc_id, name, octave_H5P_DEFAULT); | 616 hid_t data_hid = H5Dopen (loc_id, name, octave_H5P_DEFAULT); |
617 #else | 617 #else |
618 hid_t data_hid = H5Dopen (loc_id, name); | 618 hid_t data_hid = H5Dopen (loc_id, name); |
619 #endif | 619 #endif |
620 hid_t type_hid = H5Dget_type (data_hid); | 620 hid_t type_hid = H5Dget_type (data_hid); |