Mercurial > pytave
changeset 167:f31a5f5b5269
maint: remove workarounds and comments on old Octave versions
* ax_octave.m4 (AX_OCTAVE): Use AS_DIRNAME for parent directory. Remove
checking message.
* octave_to_python.cc (pytave::octlist_to_pytuple): Remove workaround for
bug in old version of Octave.
* pytave.cc (pytave::delvar): Likewise.
| author | Mike Miller <mtmiller@octave.org> |
|---|---|
| date | Wed, 06 Apr 2016 15:21:51 -0700 |
| parents | f9a4cc5c64bd |
| children | f687155dcb7c |
| files | m4/ax_octave.m4 octave_to_python.cc pytave.cc |
| diffstat | 3 files changed, 2 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/m4/ax_octave.m4 Wed Apr 06 14:42:18 2016 -0700 +++ b/m4/ax_octave.m4 Wed Apr 06 15:21:51 2016 -0700 @@ -135,14 +135,8 @@ ]) AS_IF([test -z "$ax_octave_ok"], [ - # After the 3.2 series, the include path ends with - # /octave, but that part we don't want. - AC_MSG_CHECKING([[if the include directory is 3.3+ style]]) if test -f "$OCTAVE_INCLUDEDIR/oct.h" ; then - OCTAVE_INCLUDEDIR="$OCTAVE_INCLUDEDIR/.." - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) + OCTAVE_INCLUDEDIR=`AS_DIRNAME(["$OCTAVE_INCLUDEDIR"])` fi OCTAVE_LDFLAGS="-L$OCTAVE_LIBRARYDIR"
--- a/octave_to_python.cc Wed Apr 06 14:42:18 2016 -0700 +++ b/octave_to_python.cc Wed Apr 06 15:21:51 2016 -0700 @@ -232,12 +232,6 @@ boost::python::list seq; int length = octave_list.length (); - // FIXME: due to bugs in Octave 3.2.3 and earlier, lists returned from - // eval_string and feval may be padded by trailing undefined values. - // Fix is already upstream, so this may be eventually removed. - while (length > 0 && octave_list(length-1).is_undefined ()) - length--; - for (int i = 0; i < length; i++) { boost::python::object py_object;
--- a/pytave.cc Wed Apr 06 14:42:18 2016 -0700 +++ b/pytave.cc Wed Apr 06 15:21:51 2016 -0700 @@ -356,13 +356,7 @@ delvar (const std::string& name, bool global) { if (global) - { - // FIXME: workaround a bug in Octave 3.2.0. - if (! symbol_table::is_global (name)) - symbol_table::insert (name).mark_global (); - - symbol_table::clear_global (name); - } + symbol_table::clear_global (name); else symbol_table::clear_variable (name); }