jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix octave tests li_std_pair_extra, arrays_global, grouping, struct_value, unions.

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@11046 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Xavier Delacour 2009-01-09 23:38:14 +00:00
commit 8b857aa9c1
2 changed files with 5 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Lib/octave/octrun.swg
View file

@ -684,22 +684,9 @@ namespace Swig {
return outarg(0).string_value(); return outarg(0).string_value();
} }
/*
virtual Octave_map map_value() const { virtual Octave_map map_value() const {
octave_swig_type *nc_this = const_cast < octave_swig_type *>(this); return Octave_map();
member_value_pair *m = nc_this->find_member("__str", false);
if (!m) {
error("__map method not defined");
return std::string();
}
octave_value_list outarg = nc_this->member_invoke(m, octave_value_list(nc_this->as_value()), 1);
if (outarg.length() < 1 || !outarg(0).is_map()) {
error("__map method did not return a string");
return std::string();
}
return outarg(0).map_value();
} }
*/
virtual string_vector map_keys() const { virtual string_vector map_keys() const {
member_map tmp; member_map tmp;
@ -876,6 +863,9 @@ namespace Swig {
virtual std::string string_value(bool force = false) const virtual std::string string_value(bool force = false) const
{ return ptr->string_value(force); } { return ptr->string_value(force); }
virtual Octave_map map_value() const
{ return ptr->map_value(); }
virtual string_vector map_keys() const virtual string_vector map_keys() const
{ return ptr->map_keys(); } { return ptr->map_keys(); }

1
Lib/octave/octruntime.swg
View file

@ -3,6 +3,7 @@
#include <octave/parse.h> #include <octave/parse.h>
#include <octave/ov-fcn-handle.h> #include <octave/ov-fcn-handle.h>
#include <octave/Cell.h> #include <octave/Cell.h>
#include <octave/oct-map.h>
%} %}
%insert(runtime) "swigrun.swg"; %insert(runtime) "swigrun.swg";