From b6b85f6eaf51d4a258cc228319721367cd1f2e0c Mon Sep 17 00:00:00 2001 From: ko1 Date: Mon, 13 May 2013 06:33:48 +0000 Subject: * object.c (rb_obj_setup): added. * include/ruby/ruby.h (OBJSETUP): ues rb_obj_setup() instead of a macro. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40687 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- include/ruby/ruby.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'include/ruby') diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 062e3dba98..1838a399af 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -667,13 +667,10 @@ VALUE rb_int2big(SIGNED_VALUE); VALUE rb_newobj(void); VALUE rb_newobj_of(VALUE, VALUE); +VALUE rb_obj_setup(VALUE obj, VALUE klass, VALUE type); #define NEWOBJ(obj,type) type *(obj) = (type*)rb_newobj() #define NEWOBJ_OF(obj,type,klass,flags) type *(obj) = (type*)rb_newobj_of(klass, flags) -#define OBJSETUP(obj,c,t) do {\ - RBASIC(obj)->flags = (t);\ - RBASIC(obj)->klass = (c);\ - if (rb_safe_level() >= 3) FL_SET((obj), FL_TAINT | FL_UNTRUSTED);\ -} while (0) +#define OBJSETUP(obj,c,t) rb_obj_setup(obj, c, t) /* use NEWOBJ_OF instead of NEWOBJ()+OBJSTUP() */ #define CLONESETUP(clone,obj) do {\ OBJSETUP((clone),rb_singleton_class_clone((VALUE)(obj)),RBASIC(obj)->flags);\ rb_singleton_class_attached(RBASIC(clone)->klass, (VALUE)(clone));\ -- cgit v1.2.3