diff options
author | Orion Poplawski <orion@cora.nwra.com> | 2015-07-08 13:26:36 -0600 |
---|---|---|
committer | Orion Poplawski <orion@cora.nwra.com> | 2015-07-08 13:26:36 -0600 |
commit | 248890aad08a2b1e1182f9b5986806e2b8c92d17 (patch) | |
tree | 6c581560adab22c456741076970b33c89a28c4dd | |
parent | 3718b810c749f08d6db14571cced469023ad4c6b (diff) | |
download | swig-248890aad08a2b1e1182f9b5986806e2b8c92d17.tar.gz |
Support for octave 4.0.0
-rw-r--r-- | Lib/octave/octrun.swg | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/Lib/octave/octrun.swg b/Lib/octave/octrun.swg index b5c3e5d86..40035449e 100644 --- a/Lib/octave/octrun.swg +++ b/Lib/octave/octrun.swg @@ -868,6 +868,17 @@ SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own); } #if defined (HAVE_HDF5) +# if SWIG_OCTAVE_PREREQ(4,0,0) + virtual bool + save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats) { + return true; + } + + virtual bool + load_hdf5 (octave_hdf5_id loc_id, const char *name, bool have_h5giterate_bug) { + return true; + } +# else virtual bool save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) { return true; @@ -877,6 +888,7 @@ SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own); load_hdf5 (hid_t loc_id, const char *name, bool have_h5giterate_bug) { return true; } +# endif #endif virtual octave_value convert_to_str(bool pad = false, bool force = false, char type = '"') const { @@ -1089,6 +1101,15 @@ SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own); { return ptr->load_binary(is, swap, fmt); } #if defined (HAVE_HDF5) +# if SWIG_OCTAVE_PREREQ(4,0,0) + virtual bool + save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats) + { return ptr->save_hdf5(loc_id, name, save_as_floats); } + + virtual bool + load_hdf5 (octave_hdf5_id loc_id, const char *name, bool have_h5giterate_bug) + { return ptr->load_hdf5(loc_id, name, have_h5giterate_bug); } +# else virtual bool save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) { return ptr->save_hdf5(loc_id, name, save_as_floats); } @@ -1096,6 +1117,7 @@ SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own); virtual bool load_hdf5 (hid_t loc_id, const char *name, bool have_h5giterate_bug) { return ptr->load_hdf5(loc_id, name, have_h5giterate_bug); } +# endif #endif virtual octave_value convert_to_str(bool pad = false, bool force = false, char type = '"') const @@ -1108,10 +1130,14 @@ SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own); { return ptr->print(os, pr_as_read_syntax); } private: +#if !SWIG_OCTAVE_PREREQ(4,0,0) DECLARE_OCTAVE_ALLOCATOR; +#endif DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA; }; +#if !SWIG_OCTAVE_PREREQ(4,0,0) DEFINE_OCTAVE_ALLOCATOR(octave_swig_ref); +#endif DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA(octave_swig_ref, "swig_ref", "swig_ref"); class octave_swig_packed:public octave_base_value { @@ -1167,6 +1193,17 @@ SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own); } #if defined (HAVE_HDF5) +# if SWIG_OCTAVE_PREREQ(4,0,0) + virtual bool + save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats) { + return true; + } + + virtual bool + load_hdf5 (octave_hdf5_id loc_id, const char *name, bool have_h5giterate_bug) { + return true; + } +# else virtual bool save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) { return true; @@ -1176,13 +1213,18 @@ SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own); load_hdf5 (hid_t loc_id, const char *name, bool have_h5giterate_bug) { return true; } +# endif #endif private: +#if !SWIG_OCTAVE_PREREQ(4,0,0) DECLARE_OCTAVE_ALLOCATOR; +#endif DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA; }; +#if !SWIG_OCTAVE_PREREQ(4,0,0) DEFINE_OCTAVE_ALLOCATOR(octave_swig_packed); +#endif DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA(octave_swig_packed, "swig_packed", "swig_packed"); SWIGRUNTIME octave_value_list octave_set_immutable(const octave_value_list &args, int nargout) { |