Mercurial > octave

comparison libinterp/octave-value/ov-flt-cx-mat.cc @ 21022:ebc439187d29

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid old-style cast warnings from HDF5 macros used in C++ sources * oct-hdf5-types.h (octave_H5E_DEFAULT, octave_H5P_DEFAULT, octave_H5S_ALL): New global variable declarations. * coct-hdf5-types.c: New file. * libinterp/corefcn/module.mk (COREFCN_SRC): Add it to the list. * ls-hdf5.cc, oct-hdf5.h, 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-range.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc, ov-struct.cc: Use new variables in place of the corresponding HDF5 macros.
author John W. Eaton <jwe@octave.org>
date Thu, 31 Dec 2015 13:45:43 -0500
parents 7f4c6d594e3d
children e39e05d90788
comparison
equal deleted inserted replaced
21021:a5b99b09f8fd 21022:ebc439187d29
543 H5Sclose (space_hid); 543 H5Sclose (space_hid);
544 return false; 544 return false;
545 } 545 }
546 #if HAVE_HDF5_18 546 #if HAVE_HDF5_18
547 data_hid = H5Dcreate (loc_id, name, type_hid, space_hid, 547 data_hid = H5Dcreate (loc_id, name, type_hid, space_hid,
548 H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); 548 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
549 #else 549 #else
550 data_hid = H5Dcreate (loc_id, name, type_hid, space_hid, H5P_DEFAULT); 550 data_hid = H5Dcreate (loc_id, name, type_hid, space_hid, octave_H5P_DEFAULT);
551 #endif 551 #endif
552 if (data_hid < 0) 552 if (data_hid < 0)
553 { 553 {
554 H5Sclose (space_hid); 554 H5Sclose (space_hid);
555 H5Tclose (type_hid); 555 H5Tclose (type_hid);
560 if (complex_type_hid < 0) retval = false; 560 if (complex_type_hid < 0) retval = false;
561 561
562 if (retval) 562 if (retval)
563 { 563 {
564 FloatComplex *mtmp = m.fortran_vec (); 564 FloatComplex *mtmp = m.fortran_vec ();
565 if (H5Dwrite (data_hid, complex_type_hid, H5S_ALL, H5S_ALL, H5P_DEFAULT, 565 if (H5Dwrite (data_hid, complex_type_hid, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT,
566 mtmp) < 0) 566 mtmp) < 0)
567 { 567 {
568 H5Tclose (complex_type_hid); 568 H5Tclose (complex_type_hid);
569 retval = false; 569 retval = false;
570 } 570 }
595 matrix.resize (dv); 595 matrix.resize (dv);
596 if (empty) 596 if (empty)
597 return (empty > 0); 597 return (empty > 0);
598 598
599 #if HAVE_HDF5_18 599 #if HAVE_HDF5_18
600 hid_t data_hid = H5Dopen (loc_id, name, H5P_DEFAULT); 600 hid_t data_hid = H5Dopen (loc_id, name, octave_H5P_DEFAULT);
601 #else 601 #else
602 hid_t data_hid = H5Dopen (loc_id, name); 602 hid_t data_hid = H5Dopen (loc_id, name);
603 #endif 603 #endif
604 hid_t type_hid = H5Dget_type (data_hid); 604 hid_t type_hid = H5Dget_type (data_hid);
605 605
643 dv(j) = hdims[i]; 643 dv(j) = hdims[i];
644 } 644 }
645 645
646 FloatComplexNDArray m (dv); 646 FloatComplexNDArray m (dv);
647 FloatComplex *reim = m.fortran_vec (); 647 FloatComplex *reim = m.fortran_vec ();
648 if (H5Dread (data_hid, complex_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, 648 if (H5Dread (data_hid, complex_type, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT,
649 reim) >= 0) 649 reim) >= 0)
650 { 650 {
651 retval = true; 651 retval = true;
652 matrix = m; 652 matrix = m;
653 } 653 }