Mercurial > octave
diff libinterp/octave-value/ov-str-mat.cc @ 21022:ebc439187d29
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 | b9d4c3615e89 |
| children | 258c787cd9ce |
line wrap: on
line diff
--- a/libinterp/octave-value/ov-str-mat.cc Thu Dec 31 13:39:25 2015 -0800 +++ b/libinterp/octave-value/ov-str-mat.cc Thu Dec 31 13:45:43 2015 -0500 @@ -561,10 +561,10 @@ return false; #if HAVE_HDF5_18 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_CHAR, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_CHAR, space_hid, - H5P_DEFAULT); + octave_H5P_DEFAULT); #endif if (data_hid < 0) { @@ -577,8 +577,8 @@ for (int i = 0; i < dv.numel (); ++i) s[i] = m(i); - retval = H5Dwrite (data_hid, H5T_NATIVE_CHAR, H5S_ALL, H5S_ALL, - H5P_DEFAULT, s) >= 0; + retval = H5Dwrite (data_hid, H5T_NATIVE_CHAR, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, s) >= 0; H5Dclose (data_hid); H5Sclose (space_hid); @@ -605,7 +605,7 @@ return (empty > 0); #if HAVE_HDF5_18 - hid_t data_hid = H5Dopen (loc_id, name, H5P_DEFAULT); + hid_t data_hid = H5Dopen (loc_id, name, octave_H5P_DEFAULT); #else hid_t data_hid = H5Dopen (loc_id, name); #endif @@ -645,8 +645,8 @@ charNDArray m (dv); char *str = m.fortran_vec (); - if (H5Dread (data_hid, H5T_NATIVE_CHAR, H5S_ALL, H5S_ALL, - H5P_DEFAULT, str) >= 0) + if (H5Dread (data_hid, H5T_NATIVE_CHAR, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, str) >= 0) { retval = true; matrix = m; @@ -679,8 +679,8 @@ // to read into: hid_t st_id = H5Tcopy (H5T_C_S1); H5Tset_size (st_id, slen+1); - if (H5Dread (data_hid, st_id, H5S_ALL, - H5S_ALL, H5P_DEFAULT, s) < 0) + if (H5Dread (data_hid, st_id, octave_H5S_ALL, + octave_H5S_ALL, octave_H5P_DEFAULT, s) < 0) { H5Tclose (st_id); H5Tclose (type_hid); @@ -724,8 +724,8 @@ hid_t st_id = H5Tcopy (H5T_C_S1); H5Tset_size (st_id, slen+1); - if (H5Dread (data_hid, st_id, H5S_ALL, - H5S_ALL, H5P_DEFAULT, s) < 0) + if (H5Dread (data_hid, st_id, octave_H5S_ALL, + octave_H5S_ALL, octave_H5P_DEFAULT, s) < 0) { H5Tclose (st_id); H5Tclose (type_hid);