MapleShrine/mkxp
1
0
Fork 0
Code Issues 32 Pull requests 11 Projects Releases Wiki Activity

MRI-Binding: Optimize RB_ARG_END vaarg guard

Browse source 
It's enough to check this only in debug mode.
Make this an empty define in release mode.
This commit is contained in:
Jonas Kulla 2013-12-20 11:29:12 +01:00
parent d7ceff91a2
commit c504a383ba
16 changed files with 61 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

11
binding-mri/binding-util.h
View file

@ -134,7 +134,12 @@ int
rb_get_args(int argc, VALUE *argv, const char *format, ...);
/* Always terminate 'rb_get_args' with this */
#define RB_ARG_END ((void*) -1)
#ifndef QT_NO_DEBUG
# define RB_ARG_END_VAL ((void*) -1)
# define RB_ARG_END ,RB_ARG_END_VAL
#else
# define RB_ARG_END
#endif
typedef VALUE (*RubyMethod)(int argc, VALUE *argv, VALUE self);
@ -165,7 +170,7 @@ objectLoad(int argc, VALUE *argv, VALUE self)
{
const char *data;
int dataLen;
rb_get_args(argc, argv, "s", &data, &dataLen, RB_ARG_END);
rb_get_args(argc, argv, "s", &data, &dataLen RB_ARG_END);
VALUE obj = rb_obj_alloc(self);
@ -264,7 +269,7 @@ rb_check_argc(int actual, int expected)
RB_METHOD(Klass##InitializeCopy) \
{ \
VALUE origObj; \
rb_get_args(argc, argv, "o", &origObj, RB_ARG_END); \
rb_get_args(argc, argv, "o", &origObj RB_ARG_END); \
if (!OBJ_INIT_COPY(self, origObj)) /* When would this fail??*/\
return self; \
Klass *orig = getPrivateData<Klass>(origObj); \