From 671b498070c0fa33fa6afaf4f4672441ae61661a Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 19 Oct 2010 03:25:29 +0000
Subject: Commit miss.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29534 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 object.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'object.c')

diff --git a/object.c b/object.c
index 7eecf49bfc..5ad5680d88 100644
--- a/object.c
+++ b/object.c
@@ -712,7 +712,9 @@ rb_obj_taint(VALUE obj)
 {
     rb_secure(4);
     if (!OBJ_TAINTED(obj)) {
-	rb_check_frozen(obj);
+	if (OBJ_FROZEN(obj)) {
+	    rb_error_frozen("object");
+	}
 	OBJ_TAINT(obj);
     }
     return obj;
@@ -731,7 +733,9 @@ rb_obj_untaint(VALUE obj)
 {
     rb_secure(3);
     if (OBJ_TAINTED(obj)) {
-	rb_check_frozen(obj);
+	if (OBJ_FROZEN(obj)) {
+	    rb_error_frozen("object");
+	}
 	FL_UNSET(obj, FL_TAINT);
     }
     return obj;
@@ -764,7 +768,9 @@ rb_obj_untrust(VALUE obj)
 {
     rb_secure(4);
     if (!OBJ_UNTRUSTED(obj)) {
-	rb_check_frozen(obj);
+	if (OBJ_FROZEN(obj)) {
+	    rb_error_frozen("object");
+	}
 	OBJ_UNTRUST(obj);
     }
     return obj;
@@ -783,7 +789,9 @@ rb_obj_trust(VALUE obj)
 {
     rb_secure(3);
     if (OBJ_UNTRUSTED(obj)) {
-	rb_check_frozen(obj);
+	if (OBJ_FROZEN(obj)) {
+	    rb_error_frozen("object");
+	}
 	FL_UNSET(obj, FL_UNTRUSTED);
     }
     return obj;
-- 
cgit v1.2.3