Mercurial > hg > octave-nkf

comparison libinterp/octave-value/ov-oncleanup.cc @ 20070:09ed6f7538dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid needing to include hdf5 in public header files (bug #44370, #43180) * oct-hdf5-id.cc, oct-hdf5-id.h: New files. * libinterp/corefcn/module.mk: Update. * libgui/src/module.mk (src_libgui_src_la_CPPFLAGS): Remove $(HDF5_CPPFLAGS) from the list. * load-save.h (enum load_save_format_type): Always include LS_HDF5 in the list of values. * ls-hdf5.cc (read_hdf5_data, save_hdf5_data): Call check_hdf5_id_type. * oct-hdf5.h: Also #define HDF5_SAVE_TYPE. * ov.h, ov-base.h: Include oct-hdf5-id.h instead of oct-hdf5.h. Always declare load_hdf5 and save_hdf5 functions. * ov-base-int.cc, ov-base-int.h, ov-base.cc, ov-bool-mat.cc, ov-bool-mat.h, ov-bool-sparse.cc, ov-bool-sparse.h, ov-bool.cc, ov-bool.h, ov-cell.cc, ov-cell.h, ov-class.cc, ov-class.h, ov-complex.cc, ov-complex.h, ov-cx-mat.cc, ov-cx-mat.h, ov-cx-sparse.cc, ov-cx-sparse.h, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn-inline.cc, ov-fcn-inline.h, ov-float.cc, ov-float.h, ov-flt-complex.cc, ov-flt-complex.h, ov-flt-cx-mat.cc, ov-flt-cx-mat.h, ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-int16.cc, ov-int32.cc, ov-int64.cc, ov-int8.cc, ov-lazy-idx.h, ov-oncleanup.cc, ov-oncleanup.h, ov-range.cc ov-range.h, ov-re-mat.cc, ov-re-mat.h, ov-re-sparse.cc, ov-re-sparse.h, ov-scalar.cc, ov-scalar.h, ov-str-mat.cc, ov-str-mat.h, ov-struct.cc, ov-struct.h, ov-uint16.cc, ov-uint32.cc, ov-uint64.cc, ov-uint8.cc: Move #ifdef HAVE_HDF5 inside load_hdf5 and save_hdf5 functions. Always declare and define load_hdf5 and save_hdf5 functions.
author John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
date Thu, 26 Feb 2015 10:49:20 -0500
parents 4197fc428c7d
children 075a5e2e1ba5
comparison
equal deleted inserted replaced
20069:6b851f6acd55 20070:09ed6f7538dd
145 { 145 {
146 warn_save_load (); 146 warn_save_load ();
147 return true; 147 return true;
148 } 148 }
149 149
150 #if defined (HAVE_HDF5) 150 bool
151 bool 151 octave_oncleanup::save_hdf5 (octave_hdf5_id /* loc_id */,
152 octave_oncleanup::save_hdf5 (hid_t /* loc_id */, const char * /* name */, 152 const char * /* name */,
153 bool /* save_as_floats */) 153 bool /* save_as_floats */)
154 { 154 {
155 warn_save_load (); 155 warn_save_load ();
156 return true; 156 return true;
157 } 157 }
158 158
159 bool 159 bool
160 octave_oncleanup::load_hdf5 (hid_t /* loc_id */, const char * /* name */) 160 octave_oncleanup::load_hdf5 (octave_hdf5_id /* loc_id */,
161 { 161 const char * /* name */)
162 warn_save_load (); 162 {
163 return true; 163 warn_save_load ();
164 } 164 return true;
165 #endif 165 }
166 166
167 void 167 void
168 octave_oncleanup::print (std::ostream& os, bool pr_as_read_syntax) 168 octave_oncleanup::print (std::ostream& os, bool pr_as_read_syntax)
169 { 169 {
170 print_raw (os, pr_as_read_syntax); 170 print_raw (os, pr_as_read_syntax);