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

octrun.swg: remove octave_value type-id from octave_swig_bound_func

Browse source 
- The {DECLARE|DEFINE}_OV_TYPEID_FUNCTIONS_AND_DATA declarations
  attached to this class cause a seg-fault in the module_load
  Octave example. Removing these declarations fixes the seg-fault.
- While cause of seg-fault is unknown, note that (in Octave 5.1.0)
  the declaration of octave_function, which is the base class for
  octave_swig_bound_func, does not use these declarations. So it's
  possible they simply are not required for this type of subclass.
This commit is contained in:
Karl Wette 2020-05-01 21:29:41 +10:00
commit 30132bf777
2 changed files with 0 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/octave/octrun.swg
View file

@ -203,11 +203,7 @@ SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own);
std::set<std::string> dispatch_classes; std::set<std::string> dispatch_classes;
private:
DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA
}; };
DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA(octave_swig_bound_func, "octave_swig_bound_func", "octave_swig_bound_func");
#else #else
#define SWIG_OCTAVE_BOUND_FUNC(func, args) octave_value(func) #define SWIG_OCTAVE_BOUND_FUNC(func, args) octave_value(func)
#endif #endif

7
Lib/octave/octruntime.swg
View file

@ -376,7 +376,6 @@ DEFUN_DLD( SWIG_name, args, nargout, SWIG_name_usage ) {
string_vector types = typeinfo.installed_type_names(); string_vector types = typeinfo.installed_type_names();
bool register_octave_swig_ref = true; bool register_octave_swig_ref = true;
bool register_octave_swig_packed = true; bool register_octave_swig_packed = true;
bool register_octave_swig_bound_func = true;
for (int i = 0; i < types.numel(); ++i) { for (int i = 0; i < types.numel(); ++i) {
if (types(i) == octave_swig_ref::static_type_name()) { if (types(i) == octave_swig_ref::static_type_name()) {
register_octave_swig_ref = false; register_octave_swig_ref = false;
@ -384,9 +383,6 @@ DEFUN_DLD( SWIG_name, args, nargout, SWIG_name_usage ) {
if (types(i) == octave_swig_packed::static_type_name()) { if (types(i) == octave_swig_packed::static_type_name()) {
register_octave_swig_packed = false; register_octave_swig_packed = false;
} }
if (types(i) == octave_swig_bound_func::static_type_name()) {
register_octave_swig_bound_func = false;
}
} }
if (register_octave_swig_ref) { if (register_octave_swig_ref) {
octave_swig_ref::register_type(); octave_swig_ref::register_type();
@ -394,9 +390,6 @@ DEFUN_DLD( SWIG_name, args, nargout, SWIG_name_usage ) {
if (register_octave_swig_packed) { if (register_octave_swig_packed) {
octave_swig_packed::register_type(); octave_swig_packed::register_type();
} }
if (register_octave_swig_bound_func) {
octave_swig_bound_func::register_type();
}
} }
#else #else
octave_swig_ref::register_type(); octave_swig_ref::register_type();