Mercurial > octave-nkf

annotate libinterp/corefcn/oct-hdf5.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 d54aa96abadf bfe66db8addb
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
8676
22462fd58e66 require HDF5 v1.6 API
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 /*
22462fd58e66 require HDF5 v1.6 API
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2
19731
4197fc428c7d maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents: 19311
diff changeset
3 Copyright (C) 2009-2015 John W. Eaton
8676
22462fd58e66 require HDF5 v1.6 API
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4
22462fd58e66 require HDF5 v1.6 API
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 This file is part of Octave.
22462fd58e66 require HDF5 v1.6 API
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6
22462fd58e66 require HDF5 v1.6 API
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7 Octave is free software; you can redistribute it and/or modify it
22462fd58e66 require HDF5 v1.6 API
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8 under the terms of the GNU General Public License as published by the
22462fd58e66 require HDF5 v1.6 API
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 Free Software Foundation; either version 3 of the License, or (at your
22462fd58e66 require HDF5 v1.6 API
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10 option) any later version.
22462fd58e66 require HDF5 v1.6 API
John W. Eaton <jwe@octave.org>
parents:
diff changeset
11
22462fd58e66 require HDF5 v1.6 API
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12 Octave is distributed in the hope that it will be useful, but WITHOUT
22462fd58e66 require HDF5 v1.6 API
John W. Eaton <jwe@octave.org>
parents:
diff changeset
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
22462fd58e66 require HDF5 v1.6 API
John W. Eaton <jwe@octave.org>
parents:
diff changeset
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
22462fd58e66 require HDF5 v1.6 API
John W. Eaton <jwe@octave.org>
parents:
diff changeset
15 for more details.
22462fd58e66 require HDF5 v1.6 API
John W. Eaton <jwe@octave.org>
parents:
diff changeset
16
22462fd58e66 require HDF5 v1.6 API
John W. Eaton <jwe@octave.org>
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
22462fd58e66 require HDF5 v1.6 API
John W. Eaton <jwe@octave.org>
parents:
diff changeset
18 along with Octave; see the file COPYING. If not, see
22462fd58e66 require HDF5 v1.6 API
John W. Eaton <jwe@octave.org>
parents:
diff changeset
19 <http://www.gnu.org/licenses/>.
22462fd58e66 require HDF5 v1.6 API
John W. Eaton <jwe@octave.org>
parents:
diff changeset
20
22462fd58e66 require HDF5 v1.6 API
John W. Eaton <jwe@octave.org>
parents:
diff changeset
21 */
22462fd58e66 require HDF5 v1.6 API
John W. Eaton <jwe@octave.org>
parents:
diff changeset
22
17822
ebb3ef964372 maint: Use common #define syntax "octave_filename_h" in h_files.
Rik <rik@octave.org>
parents: 17744
diff changeset
23 #if !defined (octave_oct_hdf5_h)
8676
22462fd58e66 require HDF5 v1.6 API
John W. Eaton <jwe@octave.org>
parents:
diff changeset
24 #define octave_hdf5_h 1
22462fd58e66 require HDF5 v1.6 API
John W. Eaton <jwe@octave.org>
parents:
diff changeset
25
19311
18a3eaf7bdf0 make --with-PKG-includedir and --with-PKG-libdir configure options work again
John W. Eaton <jwe@octave.org>
parents: 17822
diff changeset
26 #if defined (HAVE_HDF5_H)
19897
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents: 19731
diff changeset
27
8676
22462fd58e66 require HDF5 v1.6 API
John W. Eaton <jwe@octave.org>
parents:
diff changeset
28 #include <hdf5.h>
19897
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents: 19731
diff changeset
29
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents: 19731
diff changeset
30 #define HDF5_SAVE_TYPE H5T_NATIVE_UINT8
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents: 19731
diff changeset
31
8676
22462fd58e66 require HDF5 v1.6 API
John W. Eaton <jwe@octave.org>
parents:
diff changeset
32 #endif
22462fd58e66 require HDF5 v1.6 API
John W. Eaton <jwe@octave.org>
parents:
diff changeset
33
22462fd58e66 require HDF5 v1.6 API
John W. Eaton <jwe@octave.org>
parents:
diff changeset
34 #endif