Mercurial > octave-nkf
view libinterp/corefcn/oct-hdf5-types.cc @ 20299:bfe66db8addb
don't include hdf5.h or use HDF5 typedefs in public header files (bug #43180)
* oct-hdf5-types.h: Rename from oct-hdf5-id.h.
* oct-hdf5-types.cc: Rename from oct-hdf5-id.cc.
* libinterp/corefcn/module.mk: Update.
* oct-hdf5-types.h (octave_hdf5_err): New typedef.
* oct-hdf5-types.h, oct-hdf5-types.cc (check_hdf5_types): Rename from
check_hdf5_id_type. Also check size of herr_t.
* load-save.cc: Include oct-hdf5.h.
* ls-hdf5.cc: Include oct-hdf5.h instead of oct-hdf5-id.h.
Define hdf5_fstreambase functions that require HDF5 types here instead
of in ls-hdf5.h.
* ls-hdf5.h, ls-hdf5.cc: Use octave types in public interfaces.
* ls-hdf5.h, ov-base.h: Include oct-hdf5-types.h instead of oct-hdf5.h.
* oct-hdf5.h: Include oct-hdf5-types.h. Define H5T_NATIVE_IDX here.
* ls-hdf5.h: Not here.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 15 Jun 2015 17:42:44 -0400 |
parents | libinterp/corefcn/oct-hdf5-id.cc@09ed6f7538dd |
children |
line wrap: on
line source
/* Copyright (C) 2015 John W. Eaton This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include "error.h" #include "oct-hdf5.h" #include "oct-hdf5-types.h" bool check_hdf5_types (bool warn) { static bool checked = false; static bool ok = false; if (! checked) { #if defined (HAVE_HDF5) ok = sizeof (octave_hdf5_id) >= sizeof (hid_t); if (warn && ! ok) warning_with_id ("Octave:internal", "the size of octave_hdf5_id is smaller than the size of HDF5 hid_t"); ok = sizeof (octave_hdf5_err) >= sizeof (herr_t); if (warn && ! ok) warning_with_id ("Octave:internal", "the size of octave_hdf5_err is smaller than the size of HDF5 herr_t"); #else warning_with_id ("Octave:internal", "check_hdf5_id_type called but Octave was not compiled with support for HDF5"); #endif checked = true; } return ok; }