Mercurial > hg > octave-jordi
changeset 21021: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.
line wrap: on
line diff
new file mode 100644 --- /dev/null +++ b/libinterp/corefcn/coct-hdf5-types.c @@ -0,0 +1,39 @@ +/* + +Copyright (C) 2015 John W. Eaton + +This file is part of Octave. + +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. + +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. + +*/ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include "oct-hdf5.h" +#include "oct-hdf5-types.h" + +// Programming Note: This file exists so that we can hide the use +// of macros and C-style casts in a C warnings about using old-style +// casts in C++. + +// Please do NOT eliminate this file and move code from here to +// oct-hdf5-types.cc + +const octave_hdf5_id octave_H5E_DEFAULT = H5E_DEFAULT; +const octave_hdf5_id octave_H5P_DEFAULT = H5P_DEFAULT; +const octave_hdf5_id octave_H5S_ALL = H5S_ALL;
--- a/libinterp/corefcn/ls-hdf5.cc +++ b/libinterp/corefcn/ls-hdf5.cc @@ -76,14 +76,14 @@ : file_id (-1), current_item (-1) { if (mode & std::ios::in) - file_id = H5Fopen (name, H5F_ACC_RDONLY, H5P_DEFAULT); + file_id = H5Fopen (name, H5F_ACC_RDONLY, octave_H5P_DEFAULT); else if (mode & std::ios::out) { if (mode & std::ios::app && H5Fis_hdf5 (name) > 0) - file_id = H5Fopen (name, H5F_ACC_RDWR, H5P_DEFAULT); + file_id = H5Fopen (name, H5F_ACC_RDWR, octave_H5P_DEFAULT); else - file_id = H5Fcreate (name, H5F_ACC_TRUNC, H5P_DEFAULT, - H5P_DEFAULT); + file_id = H5Fcreate (name, H5F_ACC_TRUNC, octave_H5P_DEFAULT, + octave_H5P_DEFAULT); } if (file_id < 0) std::ios::setstate (std::ios::badbit); @@ -108,14 +108,14 @@ clear (); if (mode & std::ios::in) - file_id = H5Fopen (name, H5F_ACC_RDONLY, H5P_DEFAULT); + file_id = H5Fopen (name, H5F_ACC_RDONLY, octave_H5P_DEFAULT); else if (mode & std::ios::out) { if (mode & std::ios::app && H5Fis_hdf5 (name) > 0) - file_id = H5Fopen (name, H5F_ACC_RDWR, H5P_DEFAULT); + file_id = H5Fopen (name, H5F_ACC_RDWR, octave_H5P_DEFAULT); else - file_id = H5Fcreate (name, H5F_ACC_TRUNC, H5P_DEFAULT, - H5P_DEFAULT); + file_id = H5Fcreate (name, H5F_ACC_TRUNC, octave_H5P_DEFAULT, + octave_H5P_DEFAULT); } if (file_id < 0) std::ios::setstate (std::ios::badbit); @@ -195,8 +195,8 @@ // reporting function: #if HAVE_HDF5_18 - H5Eget_auto (H5E_DEFAULT, &err_func, &err_func_data); - H5Eset_auto (H5E_DEFAULT, 0, 0); + H5Eget_auto (octave_H5E_DEFAULT, &err_func, &err_func_data); + H5Eset_auto (octave_H5E_DEFAULT, 0, 0); #else H5Eget_auto (&err_func, &err_func_data); H5Eset_auto (0, 0); @@ -213,7 +213,7 @@ // restore error reporting: #if HAVE_HDF5_18 - H5Eset_auto (H5E_DEFAULT, err_func, err_func_data); + H5Eset_auto (octave_H5E_DEFAULT, err_func, err_func_data); #else H5Eset_auto (err_func, err_func_data); #endif @@ -237,8 +237,8 @@ // reporting function: #if HAVE_HDF5_18 - H5Eget_auto (H5E_DEFAULT, &err_func, &err_func_data); - H5Eset_auto (H5E_DEFAULT, 0, 0); + H5Eget_auto (octave_H5E_DEFAULT, &err_func, &err_func_data); + H5Eset_auto (octave_H5E_DEFAULT, 0, 0); #else H5Eget_auto (&err_func, &err_func_data); H5Eset_auto (0, 0); @@ -259,7 +259,7 @@ // restore error reporting: #if HAVE_HDF5_18 - H5Eset_auto (H5E_DEFAULT, err_func, err_func_data); + H5Eset_auto (octave_H5E_DEFAULT, err_func, err_func_data); #else H5Eset_auto (err_func, err_func_data); #endif @@ -329,7 +329,7 @@ if (info.type == H5G_GROUP && ident_valid) { #if HAVE_HDF5_18 - subgroup_id = H5Gopen (group_id, name, H5P_DEFAULT); + subgroup_id = H5Gopen (group_id, name, octave_H5P_DEFAULT); #else subgroup_id = H5Gopen (group_id, name); #endif @@ -343,7 +343,7 @@ if (hdf5_check_attr (subgroup_id, "OCTAVE_NEW_FORMAT")) { #if HAVE_HDF5_18 - data_id = H5Dopen (subgroup_id, "type", H5P_DEFAULT); + data_id = H5Dopen (subgroup_id, "type", octave_H5P_DEFAULT); #else data_id = H5Dopen (subgroup_id, "type"); #endif @@ -377,7 +377,7 @@ hid_t st_id = H5Tcopy (H5T_C_S1); H5Tset_size (st_id, slen); - if (H5Dread (data_id, st_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, + if (H5Dread (data_id, st_id, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, typ) < 0) goto done; @@ -417,7 +417,7 @@ { // For backwards compatibility. #if HAVE_HDF5_18 - data_id = H5Dopen (group_id, name, H5P_DEFAULT); + data_id = H5Dopen (group_id, name, octave_H5P_DEFAULT); #else data_id = H5Dopen (group_id, name); #endif @@ -652,7 +652,7 @@ hsize_t num_obj = 0; #if HAVE_HDF5_18 - hid_t group_id = H5Gopen (hs.file_id, "/", H5P_DEFAULT); + hid_t group_id = H5Gopen (hs.file_id, "/", octave_H5P_DEFAULT); #else hid_t group_id = H5Gopen (hs.file_id, "/"); #endif @@ -725,10 +725,10 @@ { #if HAVE_HDF5_18 hid_t a_id = H5Acreate (loc_id, attr_name, H5T_NATIVE_UCHAR, - as_id, H5P_DEFAULT, H5P_DEFAULT); + as_id, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else hid_t a_id = H5Acreate (loc_id, attr_name, - H5T_NATIVE_UCHAR, as_id, H5P_DEFAULT); + H5T_NATIVE_UCHAR, as_id, octave_H5P_DEFAULT); #endif if (a_id >= 0) { @@ -761,10 +761,10 @@ { #if HAVE_HDF5_18 hid_t a_id = H5Acreate (loc_id, attr_name, type_id, - as_id, H5P_DEFAULT, H5P_DEFAULT); + as_id, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else hid_t a_id = H5Acreate (loc_id, attr_name, - type_id, as_id, H5P_DEFAULT); + type_id, as_id, octave_H5P_DEFAULT); #endif if (a_id >= 0) { @@ -810,10 +810,10 @@ if (space_hid < 0) return space_hid; #if HAVE_HDF5_18 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_IDX, 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_IDX, space_hid, - H5P_DEFAULT); + octave_H5P_DEFAULT); #endif if (data_hid < 0) { @@ -821,8 +821,8 @@ return data_hid; } - retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, - H5P_DEFAULT, dims) >= 0; + retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, dims) >= 0; H5Dclose (data_hid); H5Sclose (space_hid); @@ -845,7 +845,7 @@ hsize_t hdims, maxdims; #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 @@ -855,8 +855,8 @@ OCTAVE_LOCAL_BUFFER (octave_idx_type, dims, hdims); - retval = H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, - H5P_DEFAULT, dims); + retval = H5Dread (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, dims); if (retval >= 0) { d.resize (hdims); @@ -935,8 +935,8 @@ std::string t = val.type_name (); #if HAVE_HDF5_18 - data_id = H5Gcreate (loc_id, name.c_str (), H5P_DEFAULT, H5P_DEFAULT, - H5P_DEFAULT); + data_id = H5Gcreate (loc_id, name.c_str (), octave_H5P_DEFAULT, octave_H5P_DEFAULT, + octave_H5P_DEFAULT); #else data_id = H5Gcreate (loc_id, name.c_str (), 0); #endif @@ -954,12 +954,12 @@ goto error_cleanup; #if HAVE_HDF5_18 data_type_id = H5Dcreate (data_id, "type", type_id, space_id, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else - data_type_id = H5Dcreate (data_id, "type", type_id, space_id, H5P_DEFAULT); + data_type_id = H5Dcreate (data_id, "type", type_id, space_id, octave_H5P_DEFAULT); #endif - if (data_type_id < 0 || H5Dwrite (data_type_id, type_id, H5S_ALL, H5S_ALL, - H5P_DEFAULT, t.c_str ()) < 0) + if (data_type_id < 0 || H5Dwrite (data_type_id, type_id, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, t.c_str ()) < 0) goto error_cleanup; // Now call the real function to save the variable
--- a/libinterp/corefcn/module.mk +++ b/libinterp/corefcn/module.mk @@ -130,7 +130,7 @@ libinterp/corefcn/c-file-ptr-stream.cc \ libinterp/corefcn/cdisplay.c \ libinterp/corefcn/cellfun.cc \ - libinterp/corefcn/colloc.cc \ + libinterp/corefcn/coct-hdf5-types.c \ libinterp/corefcn/comment-list.cc \ libinterp/corefcn/conv2.cc \ libinterp/corefcn/daspk.cc \
--- a/libinterp/corefcn/oct-hdf5-types.h +++ b/libinterp/corefcn/oct-hdf5-types.h @@ -23,9 +23,29 @@ #if ! defined (octave_oct_hdf5_types_h) #define octave_oct_hdf5_types_h 1 +#ifdef __cplusplus +// This function only needs to be defined for C++. +extern bool check_hdf5_types (bool warn = true); +#endif + +// Available for C and C++. + typedef int octave_hdf5_id; typedef int octave_hdf5_err; -extern bool check_hdf5_types (bool warn = true); +#ifdef __cplusplus +extern "C" { +#endif + +// These are defined in a C file, so they should have C-linkage in +// both C and C++ source files. + +extern const octave_hdf5_id octave_H5E_DEFAULT; +extern const octave_hdf5_id octave_H5P_DEFAULT; +extern const octave_hdf5_id octave_H5S_ALL; + +#ifdef __cplusplus +} +#endif #endif
--- a/libinterp/corefcn/oct-hdf5.h +++ b/libinterp/corefcn/oct-hdf5.h @@ -29,7 +29,6 @@ #include "oct-hdf5-types.h" - #ifdef USE_64_BIT_IDX_T #define H5T_NATIVE_IDX H5T_NATIVE_INT64 #else
--- a/libinterp/octave-value/ov-base-int.cc +++ b/libinterp/octave-value/ov-base-int.cc @@ -352,10 +352,10 @@ if (space_hid < 0) return false; #if HAVE_HDF5_18 data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid, - H5P_DEFAULT); + octave_H5P_DEFAULT); #endif if (data_hid < 0) { @@ -363,8 +363,8 @@ return false; } - retval = H5Dwrite (data_hid, save_type_hid, H5S_ALL, H5S_ALL, - H5P_DEFAULT, this->matrix.data ()) >= 0; + retval = H5Dwrite (data_hid, save_type_hid, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, this->matrix.data ()) >= 0; H5Dclose (data_hid); H5Sclose (space_hid); @@ -393,7 +393,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 @@ -428,8 +428,8 @@ } T m (dv); - if (H5Dread (data_hid, save_type_hid, H5S_ALL, H5S_ALL, - H5P_DEFAULT, m.fortran_vec ()) >= 0) + if (H5Dread (data_hid, save_type_hid, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, m.fortran_vec ()) >= 0) { retval = true; this->matrix = m; @@ -559,10 +559,10 @@ #if HAVE_HDF5_18 data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid, - H5P_DEFAULT); + octave_H5P_DEFAULT); #endif if (data_hid < 0) { @@ -570,8 +570,8 @@ return false; } - retval = H5Dwrite (data_hid, save_type_hid, H5S_ALL, H5S_ALL, - H5P_DEFAULT, &(this->scalar)) >= 0; + retval = H5Dwrite (data_hid, save_type_hid, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, &(this->scalar)) >= 0; H5Dclose (data_hid); H5Sclose (space_hid); @@ -591,7 +591,7 @@ hid_t save_type_hid = HDF5_SAVE_TYPE; #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 @@ -606,8 +606,8 @@ } T tmp; - if (H5Dread (data_hid, save_type_hid, H5S_ALL, H5S_ALL, - H5P_DEFAULT, &tmp) < 0) + if (H5Dread (data_hid, save_type_hid, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, &tmp) < 0) { H5Dclose (data_hid); return false;
--- a/libinterp/octave-value/ov-bool-mat.cc +++ b/libinterp/octave-value/ov-bool-mat.cc @@ -407,10 +407,10 @@ if (space_hid < 0) return false; #if HAVE_HDF5_18 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_HBOOL, 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_HBOOL, space_hid, - H5P_DEFAULT); + octave_H5P_DEFAULT); #endif if (data_hid < 0) { @@ -425,8 +425,8 @@ for (octave_idx_type i = 0; i < nel; i++) htmp[i] = mtmp[i]; - retval = H5Dwrite (data_hid, H5T_NATIVE_HBOOL, H5S_ALL, H5S_ALL, - H5P_DEFAULT, htmp) >= 0; + retval = H5Dwrite (data_hid, H5T_NATIVE_HBOOL, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, htmp) >= 0; H5Dclose (data_hid); H5Sclose (space_hid); @@ -453,7 +453,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 @@ -488,7 +488,7 @@ octave_idx_type nel = dv.numel (); OCTAVE_LOCAL_BUFFER (hbool_t, htmp, nel); - if (H5Dread (data_hid, H5T_NATIVE_HBOOL, H5S_ALL, H5S_ALL, H5P_DEFAULT, htmp) + if (H5Dread (data_hid, H5T_NATIVE_HBOOL, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, htmp) >= 0) { retval = true;
--- a/libinterp/octave-value/ov-bool-sparse.cc +++ b/libinterp/octave-value/ov-bool-sparse.cc @@ -350,8 +350,8 @@ // Ensure that additional memory is deallocated matrix.maybe_compress (); #if HAVE_HDF5_18 - hid_t group_hid = H5Gcreate (loc_id, name, H5P_DEFAULT, H5P_DEFAULT, - H5P_DEFAULT); + hid_t group_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT, + octave_H5P_DEFAULT); #else hid_t group_hid = H5Gcreate (loc_id, name, 0); #endif @@ -372,10 +372,10 @@ } #if HAVE_HDF5_18 data_hid = H5Dcreate (group_hid, "nr", H5T_NATIVE_IDX, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else data_hid = H5Dcreate (group_hid, "nr", H5T_NATIVE_IDX, space_hid, - H5P_DEFAULT); + octave_H5P_DEFAULT); #endif if (data_hid < 0) { @@ -385,8 +385,8 @@ } tmp = m.rows (); - retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, - H5S_ALL, H5P_DEFAULT, &tmp) >= 0; + retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, + octave_H5S_ALL, octave_H5P_DEFAULT, &tmp) >= 0; H5Dclose (data_hid); if (! retval) { @@ -397,10 +397,10 @@ #if HAVE_HDF5_18 data_hid = H5Dcreate (group_hid, "nc", H5T_NATIVE_IDX, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else data_hid = H5Dcreate (group_hid, "nc", H5T_NATIVE_IDX, space_hid, - H5P_DEFAULT); + octave_H5P_DEFAULT); #endif if (data_hid < 0) { @@ -410,8 +410,8 @@ } tmp = m.cols (); - retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, - H5P_DEFAULT, &tmp) >= 0; + retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, &tmp) >= 0; H5Dclose (data_hid); if (! retval) { @@ -422,10 +422,10 @@ #if HAVE_HDF5_18 data_hid = H5Dcreate (group_hid, "nz", H5T_NATIVE_IDX, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else data_hid = H5Dcreate (group_hid, "nz", H5T_NATIVE_IDX, space_hid, - H5P_DEFAULT); + octave_H5P_DEFAULT); #endif if (data_hid < 0) { @@ -435,8 +435,8 @@ } tmp = m.nnz (); - retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, - H5P_DEFAULT, &tmp) >= 0; + retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, &tmp) >= 0; H5Dclose (data_hid); if (! retval) { @@ -460,10 +460,10 @@ #if HAVE_HDF5_18 data_hid = H5Dcreate (group_hid, "cidx", H5T_NATIVE_IDX, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else data_hid = H5Dcreate (group_hid, "cidx", H5T_NATIVE_IDX, space_hid, - H5P_DEFAULT); + octave_H5P_DEFAULT); #endif if (data_hid < 0) { @@ -473,8 +473,8 @@ } octave_idx_type * itmp = m.xcidx (); - retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, - H5P_DEFAULT, itmp) >= 0; + retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, itmp) >= 0; H5Dclose (data_hid); if (! retval) { @@ -498,10 +498,10 @@ #if HAVE_HDF5_18 data_hid = H5Dcreate (group_hid, "ridx", H5T_NATIVE_IDX, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else data_hid = H5Dcreate (group_hid, "ridx", H5T_NATIVE_IDX, space_hid, - H5P_DEFAULT); + octave_H5P_DEFAULT); #endif if (data_hid < 0) { @@ -511,8 +511,8 @@ } itmp = m.xridx (); - retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, - H5P_DEFAULT, itmp) >= 0; + retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, itmp) >= 0; H5Dclose (data_hid); if (! retval) { @@ -523,10 +523,10 @@ #if HAVE_HDF5_18 data_hid = H5Dcreate (group_hid, "data", H5T_NATIVE_HBOOL, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else data_hid = H5Dcreate (group_hid, "data", H5T_NATIVE_HBOOL, space_hid, - H5P_DEFAULT); + octave_H5P_DEFAULT); #endif if (data_hid < 0) { @@ -539,8 +539,8 @@ for (int i = 0; i < m.nnz (); i++) htmp[i] = m.xdata(i); - retval = H5Dwrite (data_hid, H5T_NATIVE_HBOOL, H5S_ALL, H5S_ALL, - H5P_DEFAULT, htmp) >= 0; + retval = H5Dwrite (data_hid, H5T_NATIVE_HBOOL, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, htmp) >= 0; H5Dclose (data_hid); H5Sclose (space_hid); H5Gclose (group_hid); @@ -571,14 +571,14 @@ return (empty > 0); #if HAVE_HDF5_18 - group_hid = H5Gopen (loc_id, name, H5P_DEFAULT); + group_hid = H5Gopen (loc_id, name, octave_H5P_DEFAULT); #else group_hid = H5Gopen (loc_id, name); #endif if (group_hid < 0) return false; #if HAVE_HDF5_18 - data_hid = H5Dopen (group_hid, "nr", H5P_DEFAULT); + data_hid = H5Dopen (group_hid, "nr", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "nr"); #endif @@ -592,7 +592,7 @@ return false; } - if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, &nr) + if (H5Dread (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, &nr) < 0) { H5Dclose (data_hid); @@ -603,7 +603,7 @@ H5Dclose (data_hid); #if HAVE_HDF5_18 - data_hid = H5Dopen (group_hid, "nc", H5P_DEFAULT); + data_hid = H5Dopen (group_hid, "nc", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "nc"); #endif @@ -617,7 +617,7 @@ return false; } - if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, &nc) + if (H5Dread (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, &nc) < 0) { H5Dclose (data_hid); @@ -628,7 +628,7 @@ H5Dclose (data_hid); #if HAVE_HDF5_18 - data_hid = H5Dopen (group_hid, "nz", H5P_DEFAULT); + data_hid = H5Dopen (group_hid, "nz", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "nz"); #endif @@ -642,7 +642,7 @@ return false; } - if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, &nz) + if (H5Dread (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, &nz) < 0) { H5Dclose (data_hid); @@ -657,7 +657,7 @@ static_cast<octave_idx_type> (nz)); #if HAVE_HDF5_18 - data_hid = H5Dopen (group_hid, "cidx", H5P_DEFAULT); + data_hid = H5Dopen (group_hid, "cidx", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "cidx"); #endif @@ -687,7 +687,7 @@ } octave_idx_type *itmp = m.xcidx (); - if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, itmp) + if (H5Dread (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, itmp) < 0) { H5Sclose (space_hid); @@ -700,7 +700,7 @@ H5Dclose (data_hid); #if HAVE_HDF5_18 - data_hid = H5Dopen (group_hid, "ridx", H5P_DEFAULT); + data_hid = H5Dopen (group_hid, "ridx", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "ridx"); #endif @@ -727,8 +727,8 @@ } itmp = m.xridx (); - if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, - H5P_DEFAULT, itmp) < 0) + if (H5Dread (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, itmp) < 0) { H5Sclose (space_hid); H5Dclose (data_hid); @@ -740,7 +740,7 @@ H5Dclose (data_hid); #if HAVE_HDF5_18 - data_hid = H5Dopen (group_hid, "data", H5P_DEFAULT); + data_hid = H5Dopen (group_hid, "data", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "data"); #endif @@ -768,8 +768,8 @@ OCTAVE_LOCAL_BUFFER (hbool_t, htmp, nz); - if (H5Dread (data_hid, H5T_NATIVE_HBOOL, H5S_ALL, H5S_ALL, - H5P_DEFAULT, htmp) >= 0 + if (H5Dread (data_hid, H5T_NATIVE_HBOOL, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, htmp) >= 0 && m.indices_ok ()) { retval = true;
--- a/libinterp/octave-value/ov-bool.cc +++ b/libinterp/octave-value/ov-bool.cc @@ -171,10 +171,10 @@ if (space_hid < 0) return false; #if HAVE_HDF5_18 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_DOUBLE, 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_DOUBLE, space_hid, - H5P_DEFAULT); + octave_H5P_DEFAULT); #endif if (data_hid < 0) { @@ -183,8 +183,8 @@ } double tmp = double_value (); - retval = H5Dwrite (data_hid, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, - H5P_DEFAULT, &tmp) >= 0; + retval = H5Dwrite (data_hid, H5T_NATIVE_DOUBLE, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, &tmp) >= 0; H5Dclose (data_hid); H5Sclose (space_hid); @@ -202,7 +202,7 @@ #if defined (HAVE_HDF5) #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 @@ -217,8 +217,8 @@ } double dtmp; - if (H5Dread (data_hid, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, - H5P_DEFAULT, &dtmp) < 0) + if (H5Dread (data_hid, H5T_NATIVE_DOUBLE, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, &dtmp) < 0) { H5Dclose (data_hid); return false;
--- a/libinterp/octave-value/ov-cell.cc +++ b/libinterp/octave-value/ov-cell.cc @@ -979,7 +979,7 @@ space_hid = data_hid = size_hid = -1; #if HAVE_HDF5_18 - data_hid = H5Gcreate (loc_id, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + data_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else data_hid = H5Gcreate (loc_id, name, 0); #endif @@ -1006,10 +1006,10 @@ #if HAVE_HDF5_18 size_hid = H5Dcreate (data_hid, "dims", H5T_NATIVE_IDX, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else size_hid = H5Dcreate (data_hid, "dims", H5T_NATIVE_IDX, space_hid, - H5P_DEFAULT); + octave_H5P_DEFAULT); #endif if (size_hid < 0) { @@ -1018,8 +1018,8 @@ return false; } - if (H5Dwrite (size_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, - H5P_DEFAULT, hdims) < 0) + if (H5Dwrite (size_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, hdims) < 0) { H5Dclose (size_hid); H5Sclose (space_hid); @@ -1079,7 +1079,7 @@ return (empty > 0); #if HAVE_HDF5_18 - hid_t group_id = H5Gopen (loc_id, name, H5P_DEFAULT); + hid_t group_id = H5Gopen (loc_id, name, octave_H5P_DEFAULT); #else hid_t group_id = H5Gopen (loc_id, name); #endif @@ -1088,7 +1088,7 @@ return false; #if HAVE_HDF5_18 - hid_t data_hid = H5Dopen (group_id, "dims", H5P_DEFAULT); + hid_t data_hid = H5Dopen (group_id, "dims", octave_H5P_DEFAULT); #else hid_t data_hid = H5Dopen (group_id, "dims"); #endif @@ -1112,8 +1112,8 @@ OCTAVE_LOCAL_BUFFER (octave_idx_type, tmp, hdims[0]); - if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, - H5P_DEFAULT, tmp) < 0) + if (H5Dread (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, tmp) < 0) { H5Dclose (data_hid); H5Gclose (group_id); @@ -1136,7 +1136,7 @@ hsize_t num_obj = 0; #if HAVE_HDF5_18 - group_id = H5Gopen (loc_id, name, H5P_DEFAULT); + group_id = H5Gopen (loc_id, name, octave_H5P_DEFAULT); #else group_id = H5Gopen (loc_id, name); #endif
--- a/libinterp/octave-value/ov-class.cc +++ b/libinterp/octave-value/ov-class.cc @@ -1393,7 +1393,7 @@ octave_map::iterator i; #if HAVE_HDF5_18 - group_hid = H5Gcreate (loc_id, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + group_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else group_hid = H5Gcreate (loc_id, name, 0); #endif @@ -1411,18 +1411,18 @@ goto error_cleanup; #if HAVE_HDF5_18 class_hid = H5Dcreate (group_hid, "classname", type_hid, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else class_hid = H5Dcreate (group_hid, "classname", type_hid, space_hid, - H5P_DEFAULT); + octave_H5P_DEFAULT); #endif - if (class_hid < 0 || H5Dwrite (class_hid, type_hid, H5S_ALL, H5S_ALL, - H5P_DEFAULT, c_name.c_str ()) < 0) + if (class_hid < 0 || H5Dwrite (class_hid, type_hid, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, c_name.c_str ()) < 0) goto error_cleanup; #if HAVE_HDF5_18 - data_hid = H5Gcreate (group_hid, "value", H5P_DEFAULT, H5P_DEFAULT, - H5P_DEFAULT); + data_hid = H5Gcreate (group_hid, "value", octave_H5P_DEFAULT, octave_H5P_DEFAULT, + octave_H5P_DEFAULT); #else data_hid = H5Gcreate (group_hid, "value", 0); #endif @@ -1504,7 +1504,7 @@ hsize_t rank = 0; #if HAVE_HDF5_18 - group_hid = H5Gopen (loc_id, name, H5P_DEFAULT); + group_hid = H5Gopen (loc_id, name, octave_H5P_DEFAULT); #else group_hid = H5Gopen (loc_id, name); #endif @@ -1512,7 +1512,7 @@ goto error_cleanup; #if HAVE_HDF5_18 - data_hid = H5Dopen (group_hid, "classname", H5P_DEFAULT); + data_hid = H5Dopen (group_hid, "classname", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "classname"); #endif @@ -1546,7 +1546,7 @@ st_id = H5Tcopy (H5T_C_S1); H5Tset_size (st_id, slen); - if (H5Dread (data_hid, st_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, + if (H5Dread (data_hid, st_id, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, classname) < 0) { H5Tclose (st_id); @@ -1565,7 +1565,7 @@ reconstruct_exemplar (); #if HAVE_HDF5_18 - subgroup_hid = H5Gopen (group_hid, name, H5P_DEFAULT); + subgroup_hid = H5Gopen (group_hid, name, octave_H5P_DEFAULT); #else subgroup_hid = H5Gopen (group_hid, name); #endif
--- a/libinterp/octave-value/ov-complex.cc +++ b/libinterp/octave-value/ov-complex.cc @@ -372,9 +372,9 @@ } #if HAVE_HDF5_18 data_hid = H5Dcreate (loc_id, name, type_hid, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else - data_hid = H5Dcreate (loc_id, name, type_hid, space_hid, H5P_DEFAULT); + data_hid = H5Dcreate (loc_id, name, type_hid, space_hid, octave_H5P_DEFAULT); #endif if (data_hid < 0) { @@ -384,7 +384,7 @@ } Complex tmp = complex_value (); - retval = H5Dwrite (data_hid, type_hid, H5S_ALL, H5S_ALL, H5P_DEFAULT, + retval = H5Dwrite (data_hid, type_hid, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, &tmp) >= 0; H5Dclose (data_hid); @@ -406,7 +406,7 @@ #if defined (HAVE_HDF5) #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 @@ -434,7 +434,7 @@ // complex scalar: Complex ctmp; - if (H5Dread (data_hid, complex_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, + if (H5Dread (data_hid, complex_type, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, &ctmp) >= 0) { retval = true;
--- a/libinterp/octave-value/ov-cx-mat.cc +++ b/libinterp/octave-value/ov-cx-mat.cc @@ -593,9 +593,9 @@ } #if HAVE_HDF5_18 data_hid = H5Dcreate (loc_id, name, type_hid, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else - data_hid = H5Dcreate (loc_id, name, type_hid, space_hid, H5P_DEFAULT); + data_hid = H5Dcreate (loc_id, name, type_hid, space_hid, octave_H5P_DEFAULT); #endif if (data_hid < 0) { @@ -610,7 +610,7 @@ if (retval) { Complex *mtmp = m.fortran_vec (); - if (H5Dwrite (data_hid, complex_type_hid, H5S_ALL, H5S_ALL, H5P_DEFAULT, + if (H5Dwrite (data_hid, complex_type_hid, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, mtmp) < 0) { H5Tclose (complex_type_hid); @@ -646,7 +646,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 @@ -694,7 +694,7 @@ ComplexNDArray m (dv); Complex *reim = m.fortran_vec (); - if (H5Dread (data_hid, complex_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, + if (H5Dread (data_hid, complex_type, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, reim) >= 0) { retval = true;
--- a/libinterp/octave-value/ov-cx-sparse.cc +++ b/libinterp/octave-value/ov-cx-sparse.cc @@ -382,8 +382,8 @@ matrix.maybe_compress (); #if HAVE_HDF5_18 - hid_t group_hid = H5Gcreate (loc_id, name, H5P_DEFAULT, H5P_DEFAULT, - H5P_DEFAULT); + hid_t group_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT, + octave_H5P_DEFAULT); #else hid_t group_hid = H5Gcreate (loc_id, name, 0); #endif @@ -405,10 +405,10 @@ #if HAVE_HDF5_18 data_hid = H5Dcreate (group_hid, "nr", H5T_NATIVE_IDX, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else data_hid = H5Dcreate (group_hid, "nr", H5T_NATIVE_IDX, space_hid, - H5P_DEFAULT); + octave_H5P_DEFAULT); #endif if (data_hid < 0) { @@ -418,8 +418,8 @@ } tmp = m.rows (); - retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, - H5P_DEFAULT, &tmp) >= 0; + retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, &tmp) >= 0; H5Dclose (data_hid); if (! retval) { @@ -430,10 +430,10 @@ #if HAVE_HDF5_18 data_hid = H5Dcreate (group_hid, "nc", H5T_NATIVE_IDX, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else data_hid = H5Dcreate (group_hid, "nc", H5T_NATIVE_IDX, space_hid, - H5P_DEFAULT); + octave_H5P_DEFAULT); #endif if (data_hid < 0) { @@ -443,8 +443,8 @@ } tmp = m.cols (); - retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, - H5P_DEFAULT, &tmp) >= 0; + retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, &tmp) >= 0; H5Dclose (data_hid); if (! retval) { @@ -455,10 +455,10 @@ #if HAVE_HDF5_18 data_hid = H5Dcreate (group_hid, "nz", H5T_NATIVE_IDX, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else data_hid = H5Dcreate (group_hid, "nz", H5T_NATIVE_IDX, space_hid, - H5P_DEFAULT); + octave_H5P_DEFAULT); #endif if (data_hid < 0) { @@ -468,8 +468,8 @@ } tmp = m.nnz (); - retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, - H5P_DEFAULT, &tmp) >= 0; + retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, &tmp) >= 0; H5Dclose (data_hid); if (! retval) { @@ -493,10 +493,10 @@ #if HAVE_HDF5_18 data_hid = H5Dcreate (group_hid, "cidx", H5T_NATIVE_IDX, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else data_hid = H5Dcreate (group_hid, "cidx", H5T_NATIVE_IDX, space_hid, - H5P_DEFAULT); + octave_H5P_DEFAULT); #endif if (data_hid < 0) { @@ -506,8 +506,8 @@ } octave_idx_type * itmp = m.xcidx (); - retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, - H5P_DEFAULT, itmp) >= 0; + retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, itmp) >= 0; H5Dclose (data_hid); if (! retval) { @@ -531,10 +531,10 @@ #if HAVE_HDF5_18 data_hid = H5Dcreate (group_hid, "ridx", H5T_NATIVE_IDX, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else data_hid = H5Dcreate (group_hid, "ridx", H5T_NATIVE_IDX, space_hid, - H5P_DEFAULT); + octave_H5P_DEFAULT); #endif if (data_hid < 0) { @@ -544,7 +544,7 @@ } itmp = m.xridx (); - retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, + retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, itmp) >= 0; H5Dclose (data_hid); if (! retval) @@ -587,9 +587,9 @@ } #if HAVE_HDF5_18 data_hid = H5Dcreate (group_hid, "data", type_hid, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else - data_hid = H5Dcreate (group_hid, "data", type_hid, space_hid, H5P_DEFAULT); + data_hid = H5Dcreate (group_hid, "data", type_hid, space_hid, octave_H5P_DEFAULT); #endif if (data_hid < 0) { @@ -605,8 +605,8 @@ { Complex * ctmp = m.xdata (); - retval = H5Dwrite (data_hid, complex_type_hid, H5S_ALL, H5S_ALL, - H5P_DEFAULT, ctmp) >= 0; + retval = H5Dwrite (data_hid, complex_type_hid, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, ctmp) >= 0; } H5Dclose (data_hid); @@ -640,14 +640,14 @@ return (empty > 0); #if HAVE_HDF5_18 - group_hid = H5Gopen (loc_id, name, H5P_DEFAULT); + group_hid = H5Gopen (loc_id, name, octave_H5P_DEFAULT); #else group_hid = H5Gopen (loc_id, name); #endif if (group_hid < 0) return false; #if HAVE_HDF5_18 - data_hid = H5Dopen (group_hid, "nr", H5P_DEFAULT); + data_hid = H5Dopen (group_hid, "nr", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "nr"); #endif @@ -661,8 +661,8 @@ return false; } - if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, - H5S_ALL, H5P_DEFAULT, &nr) < 0) + if (H5Dread (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, + octave_H5S_ALL, octave_H5P_DEFAULT, &nr) < 0) { H5Dclose (data_hid); H5Gclose (group_hid); @@ -672,7 +672,7 @@ H5Dclose (data_hid); #if HAVE_HDF5_18 - data_hid = H5Dopen (group_hid, "nc", H5P_DEFAULT); + data_hid = H5Dopen (group_hid, "nc", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "nc"); #endif @@ -686,8 +686,8 @@ return false; } - if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, - H5S_ALL, H5P_DEFAULT, &nc) < 0) + if (H5Dread (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, + octave_H5S_ALL, octave_H5P_DEFAULT, &nc) < 0) { H5Dclose (data_hid); H5Gclose (group_hid); @@ -697,7 +697,7 @@ H5Dclose (data_hid); #if HAVE_HDF5_18 - data_hid = H5Dopen (group_hid, "nz", H5P_DEFAULT); + data_hid = H5Dopen (group_hid, "nz", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "nz"); #endif @@ -711,8 +711,8 @@ return false; } - if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, - H5S_ALL, H5P_DEFAULT, &nz) < 0) + if (H5Dread (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, + octave_H5S_ALL, octave_H5P_DEFAULT, &nz) < 0) { H5Dclose (data_hid); H5Gclose (group_hid); @@ -726,7 +726,7 @@ static_cast<octave_idx_type> (nz)); #if HAVE_HDF5_18 - data_hid = H5Dopen (group_hid, "cidx", H5P_DEFAULT); + data_hid = H5Dopen (group_hid, "cidx", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "cidx"); #endif @@ -756,8 +756,8 @@ } octave_idx_type *itmp = m.xcidx (); - if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, - H5S_ALL, H5P_DEFAULT, itmp) < 0) + if (H5Dread (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, + octave_H5S_ALL, octave_H5P_DEFAULT, itmp) < 0) { H5Sclose (space_hid); H5Dclose (data_hid); @@ -769,7 +769,7 @@ H5Dclose (data_hid); #if HAVE_HDF5_18 - data_hid = H5Dopen (group_hid, "ridx", H5P_DEFAULT); + data_hid = H5Dopen (group_hid, "ridx", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "ridx"); #endif @@ -796,8 +796,8 @@ } itmp = m.xridx (); - if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, - H5S_ALL, H5P_DEFAULT, itmp) < 0) + if (H5Dread (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, + octave_H5S_ALL, octave_H5P_DEFAULT, itmp) < 0) { H5Sclose (space_hid); H5Dclose (data_hid); @@ -809,7 +809,7 @@ H5Dclose (data_hid); #if HAVE_HDF5_18 - data_hid = H5Dopen (group_hid, "data", H5P_DEFAULT); + data_hid = H5Dopen (group_hid, "data", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "data"); #endif @@ -849,8 +849,8 @@ Complex *ctmp = m.xdata (); - if (H5Dread (data_hid, complex_type, H5S_ALL, H5S_ALL, - H5P_DEFAULT, ctmp) >= 0 + if (H5Dread (data_hid, complex_type, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, ctmp) >= 0 && m.indices_ok ()) { retval = true;
--- a/libinterp/octave-value/ov-fcn-handle.cc +++ b/libinterp/octave-value/ov-fcn-handle.cc @@ -691,7 +691,7 @@ hid_t group_hid = -1; #if HAVE_HDF5_18 - group_hid = H5Gcreate (loc_id, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + group_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else group_hid = H5Gcreate (loc_id, name, 0); #endif @@ -722,12 +722,12 @@ } #if HAVE_HDF5_18 data_hid = H5Dcreate (group_hid, "nm", type_hid, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else - data_hid = H5Dcreate (group_hid, "nm", type_hid, space_hid, H5P_DEFAULT); + data_hid = H5Dcreate (group_hid, "nm", type_hid, space_hid, octave_H5P_DEFAULT); #endif - if (data_hid < 0 || H5Dwrite (data_hid, type_hid, H5S_ALL, H5S_ALL, - H5P_DEFAULT, nm.c_str ()) < 0) + if (data_hid < 0 || H5Dwrite (data_hid, type_hid, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, nm.c_str ()) < 0) { H5Sclose (space_hid); H5Tclose (type_hid); @@ -753,13 +753,13 @@ #if HAVE_HDF5_18 data_hid = H5Dcreate (group_hid, "fcn", type_hid, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else data_hid = H5Dcreate (group_hid, "fcn", type_hid, space_hid, - H5P_DEFAULT); + octave_H5P_DEFAULT); #endif - if (data_hid < 0 || H5Dwrite (data_hid, type_hid, H5S_ALL, H5S_ALL, - H5P_DEFAULT, stmp.c_str ()) < 0) + if (data_hid < 0 || H5Dwrite (data_hid, type_hid, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, stmp.c_str ()) < 0) { H5Sclose (space_hid); H5Tclose (type_hid); @@ -785,11 +785,11 @@ #if HAVE_HDF5_18 hid_t a_id = H5Acreate (group_hid, "SYMBOL_TABLE", H5T_NATIVE_IDX, as_id, - H5P_DEFAULT, H5P_DEFAULT); + octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else hid_t a_id = H5Acreate (group_hid, "SYMBOL_TABLE", - H5T_NATIVE_IDX, as_id, H5P_DEFAULT); + H5T_NATIVE_IDX, as_id, octave_H5P_DEFAULT); #endif if (a_id >= 0) @@ -807,7 +807,7 @@ retval = false; #if HAVE_HDF5_18 data_hid = H5Gcreate (group_hid, "symbol table", - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else data_hid = H5Gcreate (group_hid, "symbol table", 0); #endif @@ -852,10 +852,10 @@ H5Tset_size (type_hid, octaveroot.length () + 1); #if HAVE_HDF5_18 hid_t a_id = H5Acreate (group_hid, "OCTAVEROOT", - type_hid, space_hid, H5P_DEFAULT, H5P_DEFAULT); + type_hid, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else hid_t a_id = H5Acreate (group_hid, "OCTAVEROOT", - type_hid, space_hid, H5P_DEFAULT); + type_hid, space_hid, octave_H5P_DEFAULT); #endif if (a_id >= 0) @@ -889,9 +889,9 @@ #if HAVE_HDF5_18 a_id = H5Acreate (group_hid, "FILE", type_hid, space_hid, - H5P_DEFAULT, H5P_DEFAULT); + octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else - a_id = H5Acreate (group_hid, "FILE", type_hid, space_hid, H5P_DEFAULT); + a_id = H5Acreate (group_hid, "FILE", type_hid, space_hid, octave_H5P_DEFAULT); #endif if (a_id >= 0) @@ -928,7 +928,7 @@ int slen; #if HAVE_HDF5_18 - group_hid = H5Gopen (loc_id, name, H5P_DEFAULT); + group_hid = H5Gopen (loc_id, name, octave_H5P_DEFAULT); #else group_hid = H5Gopen (loc_id, name); #endif @@ -936,7 +936,7 @@ return false; #if HAVE_HDF5_18 - data_hid = H5Dopen (group_hid, "nm", H5P_DEFAULT); + data_hid = H5Dopen (group_hid, "nm", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "nm"); #endif @@ -986,7 +986,7 @@ st_id = H5Tcopy (H5T_C_S1); H5Tset_size (st_id, slen); - if (H5Dread (data_hid, st_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, nm_tmp) < 0) + if (H5Dread (data_hid, st_id, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, nm_tmp) < 0) { H5Tclose (st_id); H5Sclose (space_hid); @@ -1002,7 +1002,7 @@ if (nm == anonymous) { #if HAVE_HDF5_18 - data_hid = H5Dopen (group_hid, "fcn", H5P_DEFAULT); + data_hid = H5Dopen (group_hid, "fcn", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "fcn"); #endif @@ -1057,7 +1057,7 @@ st_id = H5Tcopy (H5T_C_S1); H5Tset_size (st_id, slen); - if (H5Dread (data_hid, st_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, fcn_tmp) < 0) + if (H5Dread (data_hid, st_id, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, fcn_tmp) < 0) { H5Tclose (st_id); H5Sclose (space_hid); @@ -1081,8 +1081,8 @@ // turn off error reporting temporarily, but save the error // reporting function: #if HAVE_HDF5_18 - H5Eget_auto (H5E_DEFAULT, &err_func, &err_func_data); - H5Eset_auto (H5E_DEFAULT, 0, 0); + H5Eget_auto (octave_H5E_DEFAULT, &err_func, &err_func_data); + H5Eset_auto (octave_H5E_DEFAULT, 0, 0); #else H5Eget_auto (&err_func, &err_func_data); H5Eset_auto (0, 0); @@ -1100,7 +1100,7 @@ // restore error reporting: #if HAVE_HDF5_18 - H5Eset_auto (H5E_DEFAULT, err_func, err_func_data); + H5Eset_auto (octave_H5E_DEFAULT, err_func, err_func_data); #else H5Eset_auto (err_func, err_func_data); #endif @@ -1122,7 +1122,7 @@ { hsize_t num_obj = 0; #if HAVE_HDF5_18 - data_hid = H5Gopen (group_hid, "symbol table", H5P_DEFAULT); + data_hid = H5Gopen (group_hid, "symbol table", octave_H5P_DEFAULT); #else data_hid = H5Gopen (group_hid, "symbol table"); #endif @@ -1187,8 +1187,8 @@ // turn off error reporting temporarily, but save the error // reporting function: #if HAVE_HDF5_18 - H5Eget_auto (H5E_DEFAULT, &err_func, &err_func_data); - H5Eset_auto (H5E_DEFAULT, 0, 0); + H5Eget_auto (octave_H5E_DEFAULT, &err_func, &err_func_data); + H5Eset_auto (octave_H5E_DEFAULT, 0, 0); #else H5Eget_auto (&err_func, &err_func_data); H5Eset_auto (0, 0); @@ -1253,7 +1253,7 @@ // restore error reporting: #if HAVE_HDF5_18 - H5Eset_auto (H5E_DEFAULT, err_func, err_func_data); + H5Eset_auto (octave_H5E_DEFAULT, err_func, err_func_data); #else H5Eset_auto (err_func, err_func_data); #endif
--- a/libinterp/octave-value/ov-fcn-inline.cc +++ b/libinterp/octave-value/ov-fcn-inline.cc @@ -284,7 +284,7 @@ hid_t group_hid = -1; #if HAVE_HDF5_18 - group_hid = H5Gcreate (loc_id, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + group_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else group_hid = H5Gcreate (loc_id, name, 0); #endif @@ -315,10 +315,10 @@ } #if HAVE_HDF5_18 data_hid = H5Dcreate (group_hid, "args", H5T_NATIVE_CHAR, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else data_hid = H5Dcreate (group_hid, "args", H5T_NATIVE_CHAR, space_hid, - H5P_DEFAULT); + octave_H5P_DEFAULT); #endif if (data_hid < 0) { @@ -338,8 +338,8 @@ s[ifargs(i).length ()] = '\0'; } - 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); @@ -369,12 +369,12 @@ } #if HAVE_HDF5_18 data_hid = H5Dcreate (group_hid, "nm", type_hid, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else - data_hid = H5Dcreate (group_hid, "nm", type_hid, space_hid, H5P_DEFAULT); + data_hid = H5Dcreate (group_hid, "nm", type_hid, space_hid, octave_H5P_DEFAULT); #endif - if (data_hid < 0 || H5Dwrite (data_hid, type_hid, H5S_ALL, H5S_ALL, - H5P_DEFAULT, nm.c_str ()) < 0) + if (data_hid < 0 || H5Dwrite (data_hid, type_hid, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, nm.c_str ()) < 0) { H5Sclose (space_hid); H5Tclose (type_hid); @@ -393,13 +393,13 @@ #if HAVE_HDF5_18 data_hid = H5Dcreate (group_hid, "iftext", type_hid, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else data_hid = H5Dcreate (group_hid, "iftext", type_hid, space_hid, - H5P_DEFAULT); + octave_H5P_DEFAULT); #endif - if (data_hid < 0 || H5Dwrite (data_hid, type_hid, H5S_ALL, H5S_ALL, - H5P_DEFAULT, iftext.c_str ()) < 0) + if (data_hid < 0 || H5Dwrite (data_hid, type_hid, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, iftext.c_str ()) < 0) { H5Sclose (space_hid); H5Tclose (type_hid); @@ -429,14 +429,14 @@ int slen; #if HAVE_HDF5_18 - group_hid = H5Gopen (loc_id, name, H5P_DEFAULT); + group_hid = H5Gopen (loc_id, name, octave_H5P_DEFAULT); #else group_hid = H5Gopen (loc_id, name); #endif if (group_hid < 0) return false; #if HAVE_HDF5_18 - data_hid = H5Dopen (group_hid, "args", H5P_DEFAULT); + data_hid = H5Dopen (group_hid, "args", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "args"); #endif @@ -460,8 +460,8 @@ OCTAVE_LOCAL_BUFFER (char, s1, hdims[0] * hdims[1]); - if (H5Dread (data_hid, H5T_NATIVE_UCHAR, H5S_ALL, H5S_ALL, - H5P_DEFAULT, s1) < 0) + if (H5Dread (data_hid, H5T_NATIVE_UCHAR, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, s1) < 0) { H5Dclose (data_hid); H5Sclose (space_hid); @@ -476,7 +476,7 @@ ifargs(i) = std::string (s1 + i*hdims[0]); #if HAVE_HDF5_18 - data_hid = H5Dopen (group_hid, "nm", H5P_DEFAULT); + data_hid = H5Dopen (group_hid, "nm", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "nm"); #endif @@ -526,7 +526,7 @@ st_id = H5Tcopy (H5T_C_S1); H5Tset_size (st_id, slen); - if (H5Dread (data_hid, st_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, nm_tmp) < 0) + if (H5Dread (data_hid, st_id, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, nm_tmp) < 0) { H5Sclose (space_hid); H5Tclose (type_hid); @@ -538,7 +538,7 @@ nm = nm_tmp; #if HAVE_HDF5_18 - data_hid = H5Dopen (group_hid, "iftext", H5P_DEFAULT); + data_hid = H5Dopen (group_hid, "iftext", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "iftext"); #endif @@ -588,7 +588,7 @@ st_id = H5Tcopy (H5T_C_S1); H5Tset_size (st_id, slen); - if (H5Dread (data_hid, st_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, iftext_tmp) < 0) + if (H5Dread (data_hid, st_id, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, iftext_tmp) < 0) { H5Sclose (space_hid); H5Tclose (type_hid);
--- a/libinterp/octave-value/ov-float.cc +++ b/libinterp/octave-value/ov-float.cc @@ -198,10 +198,10 @@ if (space_hid < 0) return false; #if HAVE_HDF5_18 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_FLOAT, 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_FLOAT, space_hid, - H5P_DEFAULT); + octave_H5P_DEFAULT); #endif if (data_hid < 0) { @@ -210,8 +210,8 @@ } float tmp = float_value (); - retval = H5Dwrite (data_hid, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, - H5P_DEFAULT, &tmp) >= 0; + retval = H5Dwrite (data_hid, H5T_NATIVE_FLOAT, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, &tmp) >= 0; H5Dclose (data_hid); H5Sclose (space_hid); @@ -229,7 +229,7 @@ #if defined (HAVE_HDF5) #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 @@ -244,8 +244,8 @@ } float dtmp; - if (H5Dread (data_hid, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, - H5P_DEFAULT, &dtmp) < 0) + if (H5Dread (data_hid, H5T_NATIVE_FLOAT, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, &dtmp) < 0) { H5Dclose (data_hid); return false;
--- a/libinterp/octave-value/ov-flt-complex.cc +++ b/libinterp/octave-value/ov-flt-complex.cc @@ -316,9 +316,9 @@ } #if HAVE_HDF5_18 data_hid = H5Dcreate (loc_id, name, type_hid, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else - data_hid = H5Dcreate (loc_id, name, type_hid, space_hid, H5P_DEFAULT); + data_hid = H5Dcreate (loc_id, name, type_hid, space_hid, octave_H5P_DEFAULT); #endif if (data_hid < 0) { @@ -328,7 +328,7 @@ } FloatComplex tmp = float_complex_value (); - retval = H5Dwrite (data_hid, type_hid, H5S_ALL, H5S_ALL, H5P_DEFAULT, + retval = H5Dwrite (data_hid, type_hid, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, &tmp) >= 0; H5Dclose (data_hid); @@ -350,7 +350,7 @@ #if defined (HAVE_HDF5) #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 @@ -378,7 +378,7 @@ // complex scalar: FloatComplex ctmp; - if (H5Dread (data_hid, complex_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, + if (H5Dread (data_hid, complex_type, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, &ctmp) >= 0) { retval = true;
--- a/libinterp/octave-value/ov-flt-cx-mat.cc +++ b/libinterp/octave-value/ov-flt-cx-mat.cc @@ -545,9 +545,9 @@ } #if HAVE_HDF5_18 data_hid = H5Dcreate (loc_id, name, type_hid, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else - data_hid = H5Dcreate (loc_id, name, type_hid, space_hid, H5P_DEFAULT); + data_hid = H5Dcreate (loc_id, name, type_hid, space_hid, octave_H5P_DEFAULT); #endif if (data_hid < 0) { @@ -562,7 +562,7 @@ if (retval) { FloatComplex *mtmp = m.fortran_vec (); - if (H5Dwrite (data_hid, complex_type_hid, H5S_ALL, H5S_ALL, H5P_DEFAULT, + if (H5Dwrite (data_hid, complex_type_hid, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, mtmp) < 0) { H5Tclose (complex_type_hid); @@ -597,7 +597,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,7 +645,7 @@ FloatComplexNDArray m (dv); FloatComplex *reim = m.fortran_vec (); - if (H5Dread (data_hid, complex_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, + if (H5Dread (data_hid, complex_type, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, reim) >= 0) { retval = true;
--- a/libinterp/octave-value/ov-flt-re-mat.cc +++ b/libinterp/octave-value/ov-flt-re-mat.cc @@ -566,10 +566,10 @@ #endif #if HAVE_HDF5_18 data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid, - H5P_DEFAULT); + octave_H5P_DEFAULT); #endif if (data_hid < 0) { @@ -578,8 +578,8 @@ } float *mtmp = m.fortran_vec (); - retval = H5Dwrite (data_hid, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, - H5P_DEFAULT, mtmp) >= 0; + retval = H5Dwrite (data_hid, H5T_NATIVE_FLOAT, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, mtmp) >= 0; H5Dclose (data_hid); H5Sclose (space_hid); @@ -606,7 +606,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 @@ -642,8 +642,8 @@ FloatNDArray m (dv); float *re = m.fortran_vec (); - if (H5Dread (data_hid, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, - H5P_DEFAULT, re) >= 0) + if (H5Dread (data_hid, H5T_NATIVE_FLOAT, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, re) >= 0) { retval = true; matrix = m;
--- a/libinterp/octave-value/ov-range.cc +++ b/libinterp/octave-value/ov-range.cc @@ -575,9 +575,9 @@ } #if HAVE_HDF5_18 data_hid = H5Dcreate (loc_id, name, type_hid, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else - data_hid = H5Dcreate (loc_id, name, type_hid, space_hid, H5P_DEFAULT); + data_hid = H5Dcreate (loc_id, name, type_hid, space_hid, octave_H5P_DEFAULT); #endif if (data_hid < 0) { @@ -592,7 +592,7 @@ range_vals[1] = r.inc () != 0 ? r.limit () : r.numel (); range_vals[2] = r.inc (); - if (H5Dwrite (data_hid, type_hid, H5S_ALL, H5S_ALL, H5P_DEFAULT, + if (H5Dwrite (data_hid, type_hid, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, range_vals) >= 0) { octave_idx_type nel = r.numel (); @@ -621,7 +621,7 @@ #if defined (HAVE_HDF5) #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 @@ -648,7 +648,7 @@ } double rangevals[3]; - if (H5Dread (data_hid, range_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, + if (H5Dread (data_hid, range_type, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, rangevals) >= 0) { retval = true;
--- a/libinterp/octave-value/ov-re-mat.cc +++ b/libinterp/octave-value/ov-re-mat.cc @@ -689,10 +689,10 @@ #if HAVE_HDF5_18 data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid, - H5P_DEFAULT); + octave_H5P_DEFAULT); #endif if (data_hid < 0) { @@ -701,8 +701,8 @@ } double *mtmp = m.fortran_vec (); - retval = H5Dwrite (data_hid, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, - H5P_DEFAULT, mtmp) >= 0; + retval = H5Dwrite (data_hid, H5T_NATIVE_DOUBLE, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, mtmp) >= 0; H5Dclose (data_hid); H5Sclose (space_hid); @@ -729,7 +729,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 @@ -765,8 +765,8 @@ NDArray m (dv); double *re = m.fortran_vec (); - if (H5Dread (data_hid, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, - H5P_DEFAULT, re) >= 0) + if (H5Dread (data_hid, H5T_NATIVE_DOUBLE, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, re) >= 0) { retval = true; matrix = m;
--- a/libinterp/octave-value/ov-re-sparse.cc +++ b/libinterp/octave-value/ov-re-sparse.cc @@ -412,8 +412,8 @@ matrix.maybe_compress (); #if HAVE_HDF5_18 - hid_t group_hid = H5Gcreate (loc_id, name, H5P_DEFAULT, H5P_DEFAULT, - H5P_DEFAULT); + hid_t group_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT, + octave_H5P_DEFAULT); #else hid_t group_hid = H5Gcreate (loc_id, name, 0); #endif @@ -434,10 +434,10 @@ } #if HAVE_HDF5_18 data_hid = H5Dcreate (group_hid, "nr", H5T_NATIVE_IDX, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else data_hid = H5Dcreate (group_hid, "nr", H5T_NATIVE_IDX, space_hid, - H5P_DEFAULT); + octave_H5P_DEFAULT); #endif if (data_hid < 0) { @@ -447,7 +447,7 @@ } tmp = m.rows (); - retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, + retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, &tmp) >= 0; H5Dclose (data_hid); if (! retval) @@ -458,10 +458,10 @@ } #if HAVE_HDF5_18 data_hid = H5Dcreate (group_hid, "nc", H5T_NATIVE_IDX, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else data_hid = H5Dcreate (group_hid, "nc", H5T_NATIVE_IDX, space_hid, - H5P_DEFAULT); + octave_H5P_DEFAULT); #endif if (data_hid < 0) { @@ -471,7 +471,7 @@ } tmp = m.cols (); - retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, + retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, &tmp) >= 0; H5Dclose (data_hid); if (! retval) @@ -483,10 +483,10 @@ #if HAVE_HDF5_18 data_hid = H5Dcreate (group_hid, "nz", H5T_NATIVE_IDX, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else data_hid = H5Dcreate (group_hid, "nz", H5T_NATIVE_IDX, space_hid, - H5P_DEFAULT); + octave_H5P_DEFAULT); #endif if (data_hid < 0) { @@ -496,7 +496,7 @@ } tmp = m.nnz (); - retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, + retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, &tmp) >= 0; H5Dclose (data_hid); if (! retval) @@ -521,10 +521,10 @@ #if HAVE_HDF5_18 data_hid = H5Dcreate (group_hid, "cidx", H5T_NATIVE_IDX, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else data_hid = H5Dcreate (group_hid, "cidx", H5T_NATIVE_IDX, space_hid, - H5P_DEFAULT); + octave_H5P_DEFAULT); #endif if (data_hid < 0) { @@ -534,7 +534,7 @@ } octave_idx_type * itmp = m.xcidx (); - retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, + retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, itmp) >= 0; H5Dclose (data_hid); if (! retval) @@ -558,10 +558,10 @@ } #if HAVE_HDF5_18 data_hid = H5Dcreate (group_hid, "ridx", H5T_NATIVE_IDX, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else data_hid = H5Dcreate (group_hid, "ridx", H5T_NATIVE_IDX, space_hid, - H5P_DEFAULT); + octave_H5P_DEFAULT); #endif if (data_hid < 0) { @@ -571,7 +571,7 @@ } itmp = m.xridx (); - retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, + retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, itmp) >= 0; H5Dclose (data_hid); if (! retval) @@ -607,10 +607,10 @@ #if HAVE_HDF5_18 data_hid = H5Dcreate (group_hid, "data", save_type_hid, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else data_hid = H5Dcreate (group_hid, "data", save_type_hid, space_hid, - H5P_DEFAULT); + octave_H5P_DEFAULT); #endif if (data_hid < 0) { @@ -620,8 +620,8 @@ } double * dtmp = m.xdata (); - retval = H5Dwrite (data_hid, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, - H5P_DEFAULT, dtmp) >= 0; + retval = H5Dwrite (data_hid, H5T_NATIVE_DOUBLE, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, dtmp) >= 0; H5Dclose (data_hid); H5Sclose (space_hid); H5Gclose (group_hid); @@ -652,14 +652,14 @@ return (empty > 0); #if HAVE_HDF5_18 - group_hid = H5Gopen (loc_id, name, H5P_DEFAULT); + group_hid = H5Gopen (loc_id, name, octave_H5P_DEFAULT); #else group_hid = H5Gopen (loc_id, name); #endif if (group_hid < 0) return false; #if HAVE_HDF5_18 - data_hid = H5Dopen (group_hid, "nr", H5P_DEFAULT); + data_hid = H5Dopen (group_hid, "nr", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "nr"); #endif @@ -673,8 +673,8 @@ return false; } - if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, - H5P_DEFAULT, &nr) < 0) + if (H5Dread (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, &nr) < 0) { H5Dclose (data_hid); H5Gclose (group_hid); @@ -684,7 +684,7 @@ H5Dclose (data_hid); #if HAVE_HDF5_18 - data_hid = H5Dopen (group_hid, "nc", H5P_DEFAULT); + data_hid = H5Dopen (group_hid, "nc", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "nc"); #endif @@ -698,8 +698,8 @@ return false; } - if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, - H5P_DEFAULT, &nc) < 0) + if (H5Dread (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, &nc) < 0) { H5Dclose (data_hid); H5Gclose (group_hid); @@ -709,7 +709,7 @@ H5Dclose (data_hid); #if HAVE_HDF5_18 - data_hid = H5Dopen (group_hid, "nz", H5P_DEFAULT); + data_hid = H5Dopen (group_hid, "nz", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "nz"); #endif @@ -723,8 +723,8 @@ return false; } - if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, - H5P_DEFAULT, &nz) < 0) + if (H5Dread (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, &nz) < 0) { H5Dclose (data_hid); H5Gclose (group_hid); @@ -738,7 +738,7 @@ static_cast<octave_idx_type> (nz)); #if HAVE_HDF5_18 - data_hid = H5Dopen (group_hid, "cidx", H5P_DEFAULT); + data_hid = H5Dopen (group_hid, "cidx", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "cidx"); #endif @@ -768,8 +768,8 @@ } octave_idx_type *itmp = m.xcidx (); - if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, - H5P_DEFAULT, itmp) < 0) + if (H5Dread (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, itmp) < 0) { H5Sclose (space_hid); H5Dclose (data_hid); @@ -781,7 +781,7 @@ H5Dclose (data_hid); #if HAVE_HDF5_18 - data_hid = H5Dopen (group_hid, "ridx", H5P_DEFAULT); + data_hid = H5Dopen (group_hid, "ridx", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "ridx"); #endif @@ -807,8 +807,8 @@ } itmp = m.xridx (); - if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, - H5P_DEFAULT, itmp) < 0) + if (H5Dread (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, itmp) < 0) { H5Sclose (space_hid); H5Dclose (data_hid); @@ -820,7 +820,7 @@ H5Dclose (data_hid); #if HAVE_HDF5_18 - data_hid = H5Dopen (group_hid, "data", H5P_DEFAULT); + data_hid = H5Dopen (group_hid, "data", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "data"); #endif @@ -847,8 +847,8 @@ double *dtmp = m.xdata (); - if (H5Dread (data_hid, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, - H5P_DEFAULT, dtmp) >= 0 + if (H5Dread (data_hid, H5T_NATIVE_DOUBLE, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, dtmp) >= 0 && m.indices_ok ()) { retval = true;
--- a/libinterp/octave-value/ov-scalar.cc +++ b/libinterp/octave-value/ov-scalar.cc @@ -215,10 +215,10 @@ #if HAVE_HDF5_18 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_DOUBLE, 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_DOUBLE, space_hid, - H5P_DEFAULT); + octave_H5P_DEFAULT); #endif if (data_hid < 0) { @@ -227,8 +227,8 @@ } double tmp = double_value (); - retval = H5Dwrite (data_hid, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, - H5P_DEFAULT, &tmp) >= 0; + retval = H5Dwrite (data_hid, H5T_NATIVE_DOUBLE, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, &tmp) >= 0; H5Dclose (data_hid); H5Sclose (space_hid); @@ -246,7 +246,7 @@ #if defined (HAVE_HDF5) #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 @@ -261,8 +261,8 @@ } double dtmp; - if (H5Dread (data_hid, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, - H5P_DEFAULT, &dtmp) < 0) + if (H5Dread (data_hid, H5T_NATIVE_DOUBLE, octave_H5S_ALL, octave_H5S_ALL, + octave_H5P_DEFAULT, &dtmp) < 0) { H5Dclose (data_hid); return false;
--- a/libinterp/octave-value/ov-str-mat.cc +++ b/libinterp/octave-value/ov-str-mat.cc @@ -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);
--- a/libinterp/octave-value/ov-struct.cc +++ b/libinterp/octave-value/ov-struct.cc @@ -885,7 +885,7 @@ hid_t data_hid = -1; #if HAVE_HDF5_18 - data_hid = H5Gcreate (loc_id, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + data_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else data_hid = H5Gcreate (loc_id, name, 0); #endif @@ -937,7 +937,7 @@ int current_item = 0; hsize_t num_obj = 0; #if HAVE_HDF5_18 - hid_t group_id = H5Gopen (loc_id, name, H5P_DEFAULT); + hid_t group_id = H5Gopen (loc_id, name, octave_H5P_DEFAULT); #else hid_t group_id = H5Gopen (loc_id, name); #endif @@ -1485,7 +1485,7 @@ hid_t data_hid = -1; #if HAVE_HDF5_18 - data_hid = H5Gcreate (loc_id, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + data_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else data_hid = H5Gcreate (loc_id, name, 0); #endif @@ -1537,7 +1537,7 @@ int current_item = 0; hsize_t num_obj = 0; #if HAVE_HDF5_18 - hid_t group_id = H5Gopen (loc_id, name, H5P_DEFAULT); + hid_t group_id = H5Gopen (loc_id, name, octave_H5P_DEFAULT); #else hid_t group_id = H5Gopen (loc_id, name); #endif