* eval.c (rb_disable_super, rb_enable_super): deprecate.

* eval.c (thgroup_s_alloc): re-implement group struct.

* eval.c (thgroup_add): add check for enclose and frozen status.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@4076 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 3 insertions, 8 deletions

diff --git a/class.c b/class.c
index 409d5d695..524c56a45 100644
--- a/class.c
+++ b/class.c
@@ -646,7 +646,7 @@ rb_define_method_id(klass, name, func, argc)
     VALUE (*func)();
     int argc;
 {
-    rb_add_method(klass, name, NEW_CFUNC(func,argc), NOEX_PUBLIC|NOEX_CFUNC);
+    rb_add_method(klass, name, NEW_CFUNC(func,argc), NOEX_PUBLIC);
 }
 
 void
@@ -660,9 +660,6 @@ rb_define_method(klass, name, func, argc)
     int ex = NOEX_PUBLIC;
 
 
-    if (BUILTIN_TYPE(klass) == T_CLASS) {
-	ex |= NOEX_CFUNC;
-    }
     rb_add_method(klass, id, NEW_CFUNC(func, argc), ex);
 }
 
@@ -673,8 +670,7 @@ rb_define_protected_method(klass, name, func, argc)
     VALUE (*func)();
     int argc;
 {
-    rb_add_method(klass, rb_intern(name), NEW_CFUNC(func, argc),
-		  NOEX_PROTECTED|NOEX_CFUNC);
+    rb_add_method(klass, rb_intern(name), NEW_CFUNC(func, argc), NOEX_PROTECTED);
 }
 
 void
@@ -684,8 +680,7 @@ rb_define_private_method(klass, name, func, argc)
     VALUE (*func)();
     int argc;
 {
-    rb_add_method(klass, rb_intern(name), NEW_CFUNC(func, argc),
-		  NOEX_PRIVATE|NOEX_CFUNC);
+    rb_add_method(klass, rb_intern(name), NEW_CFUNC(func, argc), NOEX_PRIVATE);
 }
 
 void