Mercurial > octave-nkf
view libinterp/corefcn/Cell.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) 1999-2015 John W. Eaton Copyright (C) 2009-2010 VZLU Prague 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_Cell_h) #define octave_Cell_h 1 #include <string> #include "Array.h" #include "str-vec.h" #include "ov.h" class octave_value_list; class OCTINTERP_API Cell : public Array<octave_value> { public: Cell (void) : Array<octave_value> (dim_vector (0, 0)) { } Cell (const octave_value& val) : Array<octave_value> (dim_vector (1, 1), val) { } Cell (const octave_value_list& ovl); Cell (octave_idx_type n, octave_idx_type m, const octave_value& val = Matrix ()) : Array<octave_value> (dim_vector (n, m), val) { } Cell (const dim_vector& dv, const octave_value& val = Matrix ()) : Array<octave_value> (dv, val) { } Cell (const Array<octave_value>& c) : Array<octave_value> (c) { } Cell (const Array<octave_value>& c, octave_idx_type nr, octave_idx_type nc) : Array<octave_value> (c, dim_vector (nr, nc)) { } Cell (const string_vector& sv, bool trim = false); Cell (const std::list<std::string>& lst); Cell (const Array<std::string>& sa); Cell (const dim_vector& dv, const string_vector& sv, bool trim = false); Cell (const Cell& c) : Array<octave_value> (c) { } bool is_cellstr (void) const; Array<std::string> cellstr_value (void) const; using Array<octave_value>::index; Cell index (const octave_value_list& idx, bool resize_ok = false) const; using Array<octave_value>::delete_elements; void delete_elements (const octave_value_list& idx); using Array<octave_value>::assign; void assign (const octave_value_list& idx, const Cell& rhs, const octave_value& fill_val = Matrix ()); Cell reshape (const dim_vector& new_dims) const { return Array<octave_value>::reshape (new_dims); } octave_idx_type nnz (void) const; Cell column (octave_idx_type i) const; // FIXME boolMatrix all (int /* dim */ = 0) const { return boolMatrix (); } // FIXME boolMatrix any (int /* dim */ = 0) const { return boolMatrix (); } Cell concat (const Cell& rb, const Array<octave_idx_type>& ra_idx); Cell& insert (const Cell& a, octave_idx_type r, octave_idx_type c); Cell& insert (const Cell& a, const Array<octave_idx_type>& ra_idx); // FIXME bool any_element_is_nan (void) const { return false; } bool is_true (void) const { return false; } octave_value resize_fill_value (void) const { static Matrix rfv; return rfv; } Cell diag (octave_idx_type k = 0) const; Cell diag (octave_idx_type m, octave_idx_type n) const; Cell xisalnum (void) const { return map (&octave_value::xisalnum); } Cell xisalpha (void) const { return map (&octave_value::xisalpha); } Cell xisascii (void) const { return map (&octave_value::xisascii); } Cell xiscntrl (void) const { return map (&octave_value::xiscntrl); } Cell xisdigit (void) const { return map (&octave_value::xisdigit); } Cell xisgraph (void) const { return map (&octave_value::xisgraph); } Cell xislower (void) const { return map (&octave_value::xislower); } Cell xisprint (void) const { return map (&octave_value::xisprint); } Cell xispunct (void) const { return map (&octave_value::xispunct); } Cell xisspace (void) const { return map (&octave_value::xisspace); } Cell xisupper (void) const { return map (&octave_value::xisupper); } Cell xisxdigit (void) const { return map (&octave_value::xisxdigit); } Cell xtoascii (void) const { return map (&octave_value::xtoascii); } Cell xtolower (void) const { return map (&octave_value::xtolower); } Cell xtoupper (void) const { return map (&octave_value::xtoupper); } private: typedef octave_value (octave_value::*ctype_mapper) (void) const; Cell map (ctype_mapper) const; }; template<> inline Cell octave_value_extract<Cell> (const octave_value& v) { return v.cell_value (); } #endif