Mercurial > octave

comparison libinterp/octave-value/ov-flt-cx-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 5f318c8ec634
comparison
equal deleted inserted replaced
21210:4f7d3989c462 21211:2cf8bc5c7017
513 space_hid = H5Screate_simple (rank, hdims, 0); 513 space_hid = H5Screate_simple (rank, hdims, 0);
514 if (space_hid < 0) return false; 514 if (space_hid < 0) return false;
515 515
516 hid_t save_type_hid = H5T_NATIVE_FLOAT; 516 hid_t save_type_hid = H5T_NATIVE_FLOAT;
517 517
518 #if HAVE_HDF5_INT2FLOAT_CONVERSIONS 518 #if defined (HAVE_HDF5_INT2FLOAT_CONVERSIONS)
519 // hdf5 currently doesn't support float/integer conversions 519 // hdf5 currently doesn't support float/integer conversions
520 else 520 else
521 { 521 {
522 float max_val, min_val; 522 float max_val, min_val;
523 523
531 if (type_hid < 0) 531 if (type_hid < 0)
532 { 532 {
533 H5Sclose (space_hid); 533 H5Sclose (space_hid);
534 return false; 534 return false;
535 } 535 }
536 #if HAVE_HDF5_18 536 #if defined (HAVE_HDF5_18)
537 data_hid = H5Dcreate (loc_id, name, type_hid, space_hid, 537 data_hid = H5Dcreate (loc_id, name, type_hid, space_hid,
538 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); 538 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
539 #else 539 #else
540 data_hid = H5Dcreate (loc_id, name, type_hid, space_hid, octave_H5P_DEFAULT); 540 data_hid = H5Dcreate (loc_id, name, type_hid, space_hid, octave_H5P_DEFAULT);
541 #endif 541 #endif
584 if (empty > 0) 584 if (empty > 0)
585 matrix.resize (dv); 585 matrix.resize (dv);
586 if (empty) 586 if (empty)
587 return (empty > 0); 587 return (empty > 0);
588 588
589 #if HAVE_HDF5_18 589 #if defined (HAVE_HDF5_18)
590 hid_t data_hid = H5Dopen (loc_id, name, octave_H5P_DEFAULT); 590 hid_t data_hid = H5Dopen (loc_id, name, octave_H5P_DEFAULT);
591 #else 591 #else
592 hid_t data_hid = H5Dopen (loc_id, name); 592 hid_t data_hid = H5Dopen (loc_id, name);
593 #endif 593 #endif
594 hid_t type_hid = H5Dget_type (data_hid); 594 hid_t type_hid = H5Dget_type (data_hid);