Mercurial > octave-nkf
view libinterp/octave-value/ov-cx-diag.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) 2008-2015 Jaroslav Hajek 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_cx_diag_h) #define octave_ov_cx_diag_h 1 #include "ov-base.h" #include "ov-base-diag.h" #include "ov-cx-mat.h" #include "ov-typeinfo.h" // Real diagonal matrix values. class OCTINTERP_API octave_complex_diag_matrix : public octave_base_diag<ComplexDiagMatrix, ComplexMatrix> { public: octave_complex_diag_matrix (void) : octave_base_diag<ComplexDiagMatrix, ComplexMatrix> () { } octave_complex_diag_matrix (const ComplexDiagMatrix& m) : octave_base_diag<ComplexDiagMatrix, ComplexMatrix> (m) { } octave_complex_diag_matrix (const octave_complex_diag_matrix& m) : octave_base_diag<ComplexDiagMatrix, ComplexMatrix> (m) { } ~octave_complex_diag_matrix (void) { } octave_base_value *clone (void) const { return new octave_complex_diag_matrix (*this); } octave_base_value *empty_clone (void) const { return new octave_complex_diag_matrix (); } type_conv_info numeric_conversion_function (void) const; type_conv_info numeric_demotion_function (void) const; octave_base_value *try_narrowing_conversion (void); builtin_type_t builtin_type (void) const { return btyp_complex; } bool is_complex_matrix (void) const { return true; } bool is_complex_type (void) const { return true; } bool is_double_type (void) const { return true; } bool is_float_type (void) const { return true; } DiagMatrix diag_matrix_value (bool = false) const; FloatDiagMatrix float_diag_matrix_value (bool = false) const; ComplexDiagMatrix complex_diag_matrix_value (bool = false) const; FloatComplexDiagMatrix float_complex_diag_matrix_value (bool = false) const; bool save_binary (std::ostream& os, bool& save_as_floats); bool load_binary (std::istream& is, bool swap, oct_mach_info::float_format fmt); octave_value map (unary_mapper_t umap) const; private: bool chk_valid_scalar (const octave_value&, Complex&) const; DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA }; #endif