Mercurial > octave-nkf
view libinterp/octave-value/ov-int-traits.h @ 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 | 4197fc428c7d |
children |
line wrap: on
line source
/* Copyright (C) 2004-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/>. */ #if !defined (octave_ov_int_traits_h) #define octave_ov_int_traits_h 1 #include "ov-int8.h" #include "ov-int16.h" #include "ov-int32.h" #include "ov-int64.h" #include "ov-uint8.h" #include "ov-uint16.h" #include "ov-uint32.h" #include "ov-uint64.h" template <class T> class octave_value_int_traits { public: typedef T scalar_type; }; #define OCTAVE_VALUE_INT_TRAITS(MT, ST) \ template<> \ class \ octave_value_int_traits<MT> \ { \ public: \ typedef ST scalar_type; \ } OCTAVE_VALUE_INT_TRAITS(int8NDArray, octave_int8_scalar); OCTAVE_VALUE_INT_TRAITS(int16NDArray, octave_int16_scalar); OCTAVE_VALUE_INT_TRAITS(int32NDArray, octave_int32_scalar); OCTAVE_VALUE_INT_TRAITS(int64NDArray, octave_int64_scalar); OCTAVE_VALUE_INT_TRAITS(uint8NDArray, octave_uint8_scalar); OCTAVE_VALUE_INT_TRAITS(uint16NDArray, octave_uint16_scalar); OCTAVE_VALUE_INT_TRAITS(uint32NDArray, octave_uint32_scalar); OCTAVE_VALUE_INT_TRAITS(uint64NDArray, octave_uint64_scalar); #endif