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

Allow swig wrapped modules to compile with -Bsymbolic

Browse source
This commit is contained in:
Robert Fries 2021-05-12 19:44:17 -04:00 • committed by William S Fulton
commit 852eab7db3
2 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/octave/octrun.swg
View file

@ -1178,6 +1178,10 @@ SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own);
#endif #endif
{ return ptr->print(os, pr_as_read_syntax); } { return ptr->print(os, pr_as_read_syntax); }
#if SWIG_OCTAVE_PREREQ(4,4,0)
static void set_type_id(int type_id) { t_id=type_id; }
#endif
virtual type_conv_info numeric_conversion_function(void) const { virtual type_conv_info numeric_conversion_function(void) const {
return octave_base_value::type_conv_info (default_numeric_conversion_function, return octave_base_value::type_conv_info (default_numeric_conversion_function,
octave_scalar::static_type_id ()); octave_scalar::static_type_id ());
@ -1285,6 +1289,10 @@ SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own);
# endif # endif
#endif #endif
#if SWIG_OCTAVE_PREREQ(4,4,0)
static void set_type_id(int type_id) { t_id=type_id; }
#endif
private: private:
#if !SWIG_OCTAVE_PREREQ(4,0,0) #if !SWIG_OCTAVE_PREREQ(4,0,0)
DECLARE_OCTAVE_ALLOCATOR; DECLARE_OCTAVE_ALLOCATOR;

2
Lib/octave/octruntime.swg
View file

@ -295,9 +295,11 @@ DEFUN_DLD( SWIG_name, args, nargout, SWIG_name_usage ) {
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;
octave_swig_ref::set_type_id(i);
} }
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;
octave_swig_packed::set_type_id(i);
} }
} }
if (register_octave_swig_ref) { if (register_octave_swig_ref) {