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

Move new macros for Ruby to their dedicated namespace

Browse source
This commit is contained in:
Thomas Reitmayr 2020-01-03 21:45:53 +01:00
commit 5542cc228a
3 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/ruby/rubyhead.swg
View file

@ -114,14 +114,14 @@
# define PROTECTFUNC(f) ((VALUE (*)(VALUE)) f) # define PROTECTFUNC(f) ((VALUE (*)(VALUE)) f)
# define VALUEFUNC(f) ((VALUE (*)(ANYARGS)) f) # define VALUEFUNC(f) ((VALUE (*)(ANYARGS)) f)
# define VOIDFUNC(f) ((RUBY_DATA_FUNC) f) # define VOIDFUNC(f) ((RUBY_DATA_FUNC) f)
# define VOID_ANYARGS_FUNC(f) ((void (*)(ANYARGS))(f)) # define SWIG_RUBY_VOID_ANYARGS_FUNC(f) ((void (*)(ANYARGS))(f))
# define INT_ANYARGS_FUNC(f) ((int (*)(ANYARGS))(f)) # define SWIG_RUBY_INT_ANYARGS_FUNC(f) ((int (*)(ANYARGS))(f))
#else #else
# define PROTECTFUNC(f) (f) # define PROTECTFUNC(f) (f)
# define VALUEFUNC(f) (f) # define VALUEFUNC(f) (f)
# define VOIDFUNC(f) (f) # define VOIDFUNC(f) (f)
# define VOID_ANYARGS_FUNC(f) (f) # define SWIG_RUBY_VOID_ANYARGS_FUNC(f) (f)
# define INT_ANYARGS_FUNC(f) (f) # define SWIG_RUBY_INT_ANYARGS_FUNC(f) (f)
#endif #endif
/* Don't use for expressions have side effect */ /* Don't use for expressions have side effect */

8
Lib/ruby/rubytracking.swg
View file

@ -69,7 +69,9 @@ SWIGRUNTIME void SWIG_RubyInitializeTrackings(void) {
swig_ruby_trackings = (st_table*)NUM2SWIG(trackings_value); swig_ruby_trackings = (st_table*)NUM2SWIG(trackings_value);
} }
rb_define_virtual_variable("SWIG_TRACKINGS_COUNT", VALUEFUNC(swig_ruby_trackings_count), VOID_ANYARGS_FUNC((rb_gvar_setter_t*)NULL)); rb_define_virtual_variable("SWIG_TRACKINGS_COUNT",
VALUEFUNC(swig_ruby_trackings_count),
SWIG_RUBY_VOID_ANYARGS_FUNC((rb_gvar_setter_t*)NULL));
} }
/* Add a Tracking from a C/C++ struct to a Ruby object */ /* Add a Tracking from a C/C++ struct to a Ruby object */
@ -124,7 +126,9 @@ static int swig_ruby_internal_iterate_callback(st_data_t ptr, st_data_t obj, st_
} }
SWIGRUNTIME void SWIG_RubyIterateTrackings( void(*meth)(void* ptr, VALUE obj) ) { SWIGRUNTIME void SWIG_RubyIterateTrackings( void(*meth)(void* ptr, VALUE obj) ) {
st_foreach(swig_ruby_trackings, INT_ANYARGS_FUNC(swig_ruby_internal_iterate_callback), (st_data_t)meth); st_foreach(swig_ruby_trackings,
SWIG_RUBY_INT_ANYARGS_FUNC(swig_ruby_internal_iterate_callback),
(st_data_t)meth);
} }
#ifdef __cplusplus #ifdef __cplusplus

2
Source/Modules/ruby.cxx
View file

@ -2274,7 +2274,7 @@ public:
if (CPlusPlus) { if (CPlusPlus) {
Insert(getfname, 0, "VALUEFUNC("); Insert(getfname, 0, "VALUEFUNC(");
Append(getfname, ")"); Append(getfname, ")");
Insert(setfname, 0, (use_virtual_var) ? "VOID_ANYARGS_FUNC(" : "VALUEFUNC("); Insert(setfname, 0, (use_virtual_var) ? "SWIG_RUBY_VOID_ANYARGS_FUNC(" : "VALUEFUNC(");
Append(setfname, ")"); Append(setfname, ")");
} }