Mercurial > octave-nkf

comparison libinterp/octave-value/ov-base.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 4197fc428c7d
children 1f9ed81bd173
comparison
equal deleted inserted replaced
19896:6b851f6acd55 19897:09ed6f7538dd
34 #include "data-conv.h" 34 #include "data-conv.h"
35 #include "mx-base.h" 35 #include "mx-base.h"
36 #include "str-vec.h" 36 #include "str-vec.h"
37 37
38 #include "error.h" 38 #include "error.h"
39 #include "oct-hdf5.h" 39 #include "oct-hdf5-id.h"
40 40
41 class Cell; 41 class Cell;
42 class mxArray; 42 class mxArray;
43 class octave_map; 43 class octave_map;
44 class octave_scalar_map; 44 class octave_scalar_map;
634 virtual bool save_binary (std::ostream& os, bool& save_as_floats); 634 virtual bool save_binary (std::ostream& os, bool& save_as_floats);
635 635
636 virtual bool load_binary (std::istream& is, bool swap, 636 virtual bool load_binary (std::istream& is, bool swap,
637 oct_mach_info::float_format fmt); 637 oct_mach_info::float_format fmt);
638 638
639 #if defined (HAVE_HDF5)
640 virtual bool 639 virtual bool
641 save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats); 640 save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats);
642 641
643 virtual bool 642 virtual bool
644 load_hdf5 (hid_t loc_id, const char *name); 643 load_hdf5 (octave_hdf5_id loc_id, const char *name);
645 #endif
646 644
647 virtual int 645 virtual int
648 write (octave_stream& os, int block_size, 646 write (octave_stream& os, int block_size,
649 oct_data_conv::data_type output_type, int skip, 647 oct_data_conv::data_type output_type, int skip,
650 oct_mach_info::float_format flt_fmt) const; 648 oct_mach_info::float_format flt_fmt) const;
819 // (think of an empty cell array with >2G elements). 817 // (think of an empty cell array with >2G elements).
820 octave_refcount<octave_idx_type> count; 818 octave_refcount<octave_idx_type> count;
821 819
822 static const char *get_umap_name (unary_mapper_t); 820 static const char *get_umap_name (unary_mapper_t);
823 821
822 void gripe_load (const char *type) const;
823 void gripe_save (const char *type) const;
824
824 private: 825 private:
825 826
826 static int curr_print_indent_level; 827 static int curr_print_indent_level;
827 static bool beginning_of_line; 828 static bool beginning_of_line;
828 829