diff --git a/binding-mri/binding-util.h b/binding-mri/binding-util.h index b4fd142..784f9a7 100644 --- a/binding-mri/binding-util.h +++ b/binding-mri/binding-util.h @@ -199,14 +199,14 @@ rb_bool_new(bool value) #define INITCOPY_FUN(Klass) \ RB_METHOD(Klass##InitializeCopy) \ { \ - VALUE orig; \ - rb_get_args(argc, argv, "o", &orig, RB_ARG_END); \ - if (!OBJ_INIT_COPY(self, orig)) /* When would this fail??*/\ + VALUE origObj; \ + rb_get_args(argc, argv, "o", &origObj, RB_ARG_END); \ + if (!OBJ_INIT_COPY(self, origObj)) /* When would this fail??*/\ return self; \ - Klass *k = getPrivateData(orig); \ - Klass *dup = 0; \ - GUARD_EXC( dup = new Klass(*k); ) \ - setPrivateData(self, dup); \ + Klass *orig = getPrivateData(origObj); \ + Klass *k = 0; \ + GUARD_EXC( k = new Klass(*orig); ) \ + setPrivateData(self, k); \ return self; \ } diff --git a/binding-mri/font-binding.cpp b/binding-mri/font-binding.cpp index 819e568..f8c8478 100644 --- a/binding-mri/font-binding.cpp +++ b/binding-mri/font-binding.cpp @@ -56,15 +56,15 @@ RB_METHOD(fontInitialize) RB_METHOD(fontInitializeCopy) { - VALUE orig; - rb_get_args(argc, argv, "o", &orig, RB_ARG_END); + VALUE origObj; + rb_get_args(argc, argv, "o", &origObj, RB_ARG_END); - if (!OBJ_INIT_COPY(self, orig)) + if (!OBJ_INIT_COPY(self, origObj)) return self; - Font *f = getPrivateData(orig); - Font *dup = new Font(*f); - setPrivateData(self, dup); + Font *orig = getPrivateData(origObj); + Font *f = new Font(*orig); + setPrivateData(self, f); /* Wrap property objects */ f->setColor(new Color(*f->getColor()));