Merge branch 'octave-4-4-bugfix' of https://github.com/friedrichatgc/swig

Fixes #1672
This commit is contained in:
Olly Betts 2022-02-04 16:36:05 +13:00
commit a60655a86b
4 changed files with 39 additions and 6 deletions

View file

@ -812,7 +812,7 @@ SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own);
return as_value();
}
#if SWIG_OCTAVE_PREREQ(6,0,0)
#if SWIG_OCTAVE_PREREQ(4,4,0)
virtual bool isobject() const {
#else
virtual bool is_object() const {
@ -1142,7 +1142,7 @@ SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own);
octave_value subsasgn(const std::string &ops, const std::list < octave_value_list > &idx, const octave_value &rhs)
{ return ptr->subsasgn(ops, idx, rhs); }
#if SWIG_OCTAVE_PREREQ(6,0,0)
#if SWIG_OCTAVE_PREREQ(4,4,0)
virtual bool isobject() const
{ return ptr->isobject(); }
#else