Mercurial > octave-nkf
view libinterp/corefcn/dynamic-ld.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) 1993-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_dynamic_ld_h) #define octave_dynamic_ld_h 1 #include <string> #include "oct-shlib.h" class octave_function; class octave_dynamic_loader { protected: octave_dynamic_loader (void) { } public: virtual ~octave_dynamic_loader (void) { } static octave_function * load_oct (const std::string& fcn_name, const std::string& file_name = std::string (), bool relative = false); static octave_function * load_mex (const std::string& fcn_name, const std::string& file_name = std::string (), bool relative = false); static bool remove_oct (const std::string& fcn_name, octave_shlib& shl); static bool remove_mex (const std::string& fcn_name, octave_shlib& shl); private: // No copying! octave_dynamic_loader (const octave_dynamic_loader&); octave_dynamic_loader& operator = (const octave_dynamic_loader&); static octave_dynamic_loader *instance; static void cleanup_instance (void) { delete instance; instance = 0; } static bool instance_ok (void); octave_function * do_load_oct (const std::string& fcn_name, const std::string& file_name = std::string (), bool relative = false); octave_function * do_load_mex (const std::string& fcn_name, const std::string& file_name = std::string (), bool relative = false); bool do_remove_oct (const std::string& fcn_name, octave_shlib& shl); bool do_remove_mex (const std::string& fcn_name, octave_shlib& shl); static bool doing_load; protected: static std::string name_mangler (const std::string& name); static std::string name_uscore_mangler (const std::string& name); static std::string mex_mangler (const std::string& name); static std::string mex_uscore_mangler (const std::string& name); static std::string mex_f77_mangler (const std::string& name); }; #endif