Mercurial > octave

annotate libinterp/corefcn/oct-hdf5.h @ 21022:ebc439187d29

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid old-style cast warnings from HDF5 macros used in C++ sources * oct-hdf5-types.h (octave_H5E_DEFAULT, octave_H5P_DEFAULT, octave_H5S_ALL): New global variable declarations. * coct-hdf5-types.c: New file. * libinterp/corefcn/module.mk (COREFCN_SRC): Add it to the list. * ls-hdf5.cc, oct-hdf5.h, ov-base-int.cc, ov-bool-mat.cc, ov-bool-sparse.cc, ov-bool.cc, ov-cell.cc, ov-class.cc, ov-complex.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-fcn-handle.cc, ov-fcn-inline.cc, ov-float.cc, ov-flt-complex.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-range.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc, ov-struct.cc: Use new variables in place of the corresponding HDF5 macros.
author John W. Eaton <jwe@octave.org>
date Thu, 31 Dec 2015 13:45:43 -0500
parents f7084eae3318
children 13b9cac748f2
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
19697
4197fc428c7d maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents: 19277
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
20791
f7084eae3318 maint: Use Octave coding conventions for #if statements.
Rik <rik@octave.org>
parents: 20274
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
19277
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)
19863
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: 19697
diff changeset
27
8676
22462fd58e66 require HDF5 v1.6 API
John W. Eaton <jwe@octave.org>
parents:
diff changeset
28 #include <hdf5.h>
19863
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: 19697
diff changeset
29
20264
bfe66db8addb don't include hdf5.h or use HDF5 typedefs in public header files (bug #43180)
John W. Eaton <jwe@octave.org>
parents: 19863
diff changeset
30 #include "oct-hdf5-types.h"
bfe66db8addb don't include hdf5.h or use HDF5 typedefs in public header files (bug #43180)
John W. Eaton <jwe@octave.org>
parents: 19863
diff changeset
31
bfe66db8addb don't include hdf5.h or use HDF5 typedefs in public header files (bug #43180)
John W. Eaton <jwe@octave.org>
parents: 19863
diff changeset
32 #ifdef USE_64_BIT_IDX_T
bfe66db8addb don't include hdf5.h or use HDF5 typedefs in public header files (bug #43180)
John W. Eaton <jwe@octave.org>
parents: 19863
diff changeset
33 #define H5T_NATIVE_IDX H5T_NATIVE_INT64
bfe66db8addb don't include hdf5.h or use HDF5 typedefs in public header files (bug #43180)
John W. Eaton <jwe@octave.org>
parents: 19863
diff changeset
34 #else
bfe66db8addb don't include hdf5.h or use HDF5 typedefs in public header files (bug #43180)
John W. Eaton <jwe@octave.org>
parents: 19863
diff changeset
35 #define H5T_NATIVE_IDX H5T_NATIVE_INT
bfe66db8addb don't include hdf5.h or use HDF5 typedefs in public header files (bug #43180)
John W. Eaton <jwe@octave.org>
parents: 19863
diff changeset
36 #endif
8676
22462fd58e66 require HDF5 v1.6 API
John W. Eaton <jwe@octave.org>
parents:
diff changeset
37 #endif
22462fd58e66 require HDF5 v1.6 API
John W. Eaton <jwe@octave.org>
parents:
diff changeset
38
22462fd58e66 require HDF5 v1.6 API
John W. Eaton <jwe@octave.org>
parents:
diff changeset
39 #endif