Mercurial > hg > octave-nkf
comparison libinterp/corefcn/module.mk @ 20070:09ed6f7538dd
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 | 4f6ae6b94abe |
| children | ee41010aa9e6 12ecb7212b44 |
comparison
equal
deleted
inserted
replaced
| 20069:6b851f6acd55 | 20070:09ed6f7538dd |
|---|---|
| 80 corefcn/mexproto.h \ | 80 corefcn/mexproto.h \ |
| 81 corefcn/oct-errno.h \ | 81 corefcn/oct-errno.h \ |
| 82 corefcn/oct-fstrm.h \ | 82 corefcn/oct-fstrm.h \ |
| 83 corefcn/oct-handle.h \ | 83 corefcn/oct-handle.h \ |
| 84 corefcn/oct-hdf5.h \ | 84 corefcn/oct-hdf5.h \ |
| 85 corefcn/oct-hdf5-id.h \ | |
| 85 corefcn/oct-hist.h \ | 86 corefcn/oct-hist.h \ |
| 86 corefcn/oct-iostrm.h \ | 87 corefcn/oct-iostrm.h \ |
| 87 corefcn/oct-lvalue.h \ | 88 corefcn/oct-lvalue.h \ |
| 88 corefcn/oct-map.h \ | 89 corefcn/oct-map.h \ |
| 89 corefcn/oct-obj.h \ | 90 corefcn/oct-obj.h \ |
| 210 corefcn/md5sum.cc \ | 211 corefcn/md5sum.cc \ |
| 211 corefcn/mex.cc \ | 212 corefcn/mex.cc \ |
| 212 corefcn/mgorth.cc \ | 213 corefcn/mgorth.cc \ |
| 213 corefcn/nproc.cc \ | 214 corefcn/nproc.cc \ |
| 214 corefcn/oct-fstrm.cc \ | 215 corefcn/oct-fstrm.cc \ |
| 216 corefcn/oct-hdf5-id.cc \ | |
| 215 corefcn/oct-hist.cc \ | 217 corefcn/oct-hist.cc \ |
| 216 corefcn/oct-iostrm.cc \ | 218 corefcn/oct-iostrm.cc \ |
| 217 corefcn/oct-lvalue.cc \ | 219 corefcn/oct-lvalue.cc \ |
| 218 corefcn/oct-map.cc \ | 220 corefcn/oct-map.cc \ |
| 219 corefcn/oct-obj.cc \ | 221 corefcn/oct-obj.cc \ |