Mercurial > octave-nkf

comparison libinterp/octave-value/ov.h @ 19897: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 c913247c85a8
children 0cf104d3371f
comparison
equal deleted inserted replaced
19896:6b851f6acd55 19897:09ed6f7538dd
36 #include "mach-info.h" 36 #include "mach-info.h"
37 #include "mx-base.h" 37 #include "mx-base.h"
38 #include "oct-time.h" 38 #include "oct-time.h"
39 #include "str-vec.h" 39 #include "str-vec.h"
40 40
41 #include "oct-hdf5.h"
42 #include "oct-sort.h" 41 #include "oct-sort.h"
43 42
44 class Cell; 43 class Cell;
45 class mxArray; 44 class mxArray;
46 class octave_map; 45 class octave_map;
54 class octave_lvalue; 53 class octave_lvalue;
55 54
56 #include "ov-base.h" 55 #include "ov-base.h"
57 56
58 // Constants. 57 // Constants.
59
60 class octave_value;
61 58
62 class 59 class
63 OCTINTERP_API 60 OCTINTERP_API
64 octave_value 61 octave_value
65 { 62 {
1092 1089
1093 bool load_binary (std::istream& is, bool swap, 1090 bool load_binary (std::istream& is, bool swap,
1094 oct_mach_info::float_format fmt) 1091 oct_mach_info::float_format fmt)
1095 { return rep->load_binary (is, swap, fmt); } 1092 { return rep->load_binary (is, swap, fmt); }
1096 1093
1097 #if defined (HAVE_HDF5) 1094 bool save_hdf5 (octave_hdf5_id loc_id, const char *name,
1098 bool save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) 1095 bool save_as_floats)
1099 { return rep->save_hdf5 (loc_id, name, save_as_floats); } 1096 { return rep->save_hdf5 (loc_id, name, save_as_floats); }
1100 1097
1101 bool load_hdf5 (hid_t loc_id, const char *name) 1098 bool load_hdf5 (octave_hdf5_id loc_id, const char *name)
1102 { return rep->load_hdf5 (loc_id, name); } 1099 { return rep->load_hdf5 (loc_id, name); }
1103 #endif
1104 1100
1105 int write (octave_stream& os, int block_size, 1101 int write (octave_stream& os, int block_size,
1106 oct_data_conv::data_type output_type, int skip, 1102 oct_data_conv::data_type output_type, int skip,
1107 oct_mach_info::float_format flt_fmt) const; 1103 oct_mach_info::float_format flt_fmt) const;
1108 1104