Mercurial > octave

comparison libinterp/octave-value/ov-cell.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 93748bcaec17
children 49852ff04747
comparison
equal deleted inserted replaced
21021:a5b99b09f8fd 21022:ebc439187d29
977 hsize_t rank = dv.length (); 977 hsize_t rank = dv.length ();
978 hid_t space_hid, data_hid, size_hid; 978 hid_t space_hid, data_hid, size_hid;
979 space_hid = data_hid = size_hid = -1; 979 space_hid = data_hid = size_hid = -1;
980 980
981 #if HAVE_HDF5_18 981 #if HAVE_HDF5_18
982 data_hid = H5Gcreate (loc_id, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); 982 data_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
983 #else 983 #else
984 data_hid = H5Gcreate (loc_id, name, 0); 984 data_hid = H5Gcreate (loc_id, name, 0);
985 #endif 985 #endif
986 986
987 if (data_hid < 0) 987 if (data_hid < 0)
1004 for (hsize_t i = 0; i < rank; i++) 1004 for (hsize_t i = 0; i < rank; i++)
1005 hdims[i] = dv(rank-i-1); 1005 hdims[i] = dv(rank-i-1);
1006 1006
1007 #if HAVE_HDF5_18 1007 #if HAVE_HDF5_18
1008 size_hid = H5Dcreate (data_hid, "dims", H5T_NATIVE_IDX, space_hid, 1008 size_hid = H5Dcreate (data_hid, "dims", H5T_NATIVE_IDX, space_hid,
1009 H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); 1009 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
1010 #else 1010 #else
1011 size_hid = H5Dcreate (data_hid, "dims", H5T_NATIVE_IDX, space_hid, 1011 size_hid = H5Dcreate (data_hid, "dims", H5T_NATIVE_IDX, space_hid,
1012 H5P_DEFAULT); 1012 octave_H5P_DEFAULT);
1013 #endif 1013 #endif
1014 if (size_hid < 0) 1014 if (size_hid < 0)
1015 { 1015 {
1016 H5Sclose (space_hid); 1016 H5Sclose (space_hid);
1017 H5Gclose (data_hid); 1017 H5Gclose (data_hid);
1018 return false; 1018 return false;
1019 } 1019 }
1020 1020
1021 if (H5Dwrite (size_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, 1021 if (H5Dwrite (size_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL,
1022 H5P_DEFAULT, hdims) < 0) 1022 octave_H5P_DEFAULT, hdims) < 0)
1023 { 1023 {
1024 H5Dclose (size_hid); 1024 H5Dclose (size_hid);
1025 H5Sclose (space_hid); 1025 H5Sclose (space_hid);
1026 H5Gclose (data_hid); 1026 H5Gclose (data_hid);
1027 return false; 1027 return false;
1077 matrix.resize (dv); 1077 matrix.resize (dv);
1078 if (empty) 1078 if (empty)
1079 return (empty > 0); 1079 return (empty > 0);
1080 1080
1081 #if HAVE_HDF5_18 1081 #if HAVE_HDF5_18
1082 hid_t group_id = H5Gopen (loc_id, name, H5P_DEFAULT); 1082 hid_t group_id = H5Gopen (loc_id, name, octave_H5P_DEFAULT);
1083 #else 1083 #else
1084 hid_t group_id = H5Gopen (loc_id, name); 1084 hid_t group_id = H5Gopen (loc_id, name);
1085 #endif 1085 #endif
1086 1086
1087 if (group_id < 0) 1087 if (group_id < 0)
1088 return false; 1088 return false;
1089 1089
1090 #if HAVE_HDF5_18 1090 #if HAVE_HDF5_18
1091 hid_t data_hid = H5Dopen (group_id, "dims", H5P_DEFAULT); 1091 hid_t data_hid = H5Dopen (group_id, "dims", octave_H5P_DEFAULT);
1092 #else 1092 #else
1093 hid_t data_hid = H5Dopen (group_id, "dims"); 1093 hid_t data_hid = H5Dopen (group_id, "dims");
1094 #endif 1094 #endif
1095 hid_t space_hid = H5Dget_space (data_hid); 1095 hid_t space_hid = H5Dget_space (data_hid);
1096 hsize_t rank = H5Sget_simple_extent_ndims (space_hid); 1096 hsize_t rank = H5Sget_simple_extent_ndims (space_hid);
1110 1110
1111 dv.resize (hdims[0]); 1111 dv.resize (hdims[0]);
1112 1112
1113 OCTAVE_LOCAL_BUFFER (octave_idx_type, tmp, hdims[0]); 1113 OCTAVE_LOCAL_BUFFER (octave_idx_type, tmp, hdims[0]);
1114 1114
1115 if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, 1115 if (H5Dread (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL,
1116 H5P_DEFAULT, tmp) < 0) 1116 octave_H5P_DEFAULT, tmp) < 0)
1117 { 1117 {
1118 H5Dclose (data_hid); 1118 H5Dclose (data_hid);
1119 H5Gclose (group_id); 1119 H5Gclose (group_id);
1120 return false; 1120 return false;
1121 } 1121 }
1134 1134
1135 int current_item = 0; 1135 int current_item = 0;
1136 1136
1137 hsize_t num_obj = 0; 1137 hsize_t num_obj = 0;
1138 #if HAVE_HDF5_18 1138 #if HAVE_HDF5_18
1139 group_id = H5Gopen (loc_id, name, H5P_DEFAULT); 1139 group_id = H5Gopen (loc_id, name, octave_H5P_DEFAULT);
1140 #else 1140 #else
1141 group_id = H5Gopen (loc_id, name); 1141 group_id = H5Gopen (loc_id, name);
1142 #endif 1142 #endif
1143 H5Gget_num_objs (group_id, &num_obj); 1143 H5Gget_num_objs (group_id, &num_obj);
1144 H5Gclose (group_id); 1144 H5Gclose (group_id);