Subject: * generic/tclTestObj.c: Revise updates to [teststringobj] so we don't get blocked by MODULE_SCOPE limits.

From: dgp <[email-masked]>
Date: Sat, 14 Feb 2009 22:54:18 +0000

---
 ChangeLog            |  5 +++++
 generic/tclTestObj.c | 12 +++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c211fac..207e308 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-14  Don Porter  <[email-masked]>
+
+	* generic/tclTestObj.c:	Revise updates to [teststringobj] so we don't
+	get blocked by MODULE_SCOPE limits.
+
 2009-02-12  Don Porter  <[email-masked]>
 
 	* generic/tclStringObj.c:	Rewrites of the routines
diff --git a/generic/tclTestObj.c b/generic/tclTestObj.c
index 524f05a..cc194b8 100644
--- a/generic/tclTestObj.c
+++ b/generic/tclTestObj.c
@@ -13,7 +13,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclTestObj.c,v 1.31 2009/02/12 17:08:45 dgp Exp $
+ * RCS: @(#) $Id: tclTestObj.c,v 1.32 2009/02/14 22:54:19 dgp Exp $
  */
 
 #include "tclInt.h"
@@ -1096,9 +1096,8 @@ TeststringobjCmd(
 		goto wrongNumArgs;
 	    }
 	    if (varPtr[varIndex] != NULL) {
-		if ((varPtr[varIndex])->typePtr != &tclStringType) {
-		    Tcl_ConvertToType(NULL, varPtr[varIndex], &tclStringType);
-		}
+		Tcl_ConvertToType(NULL, varPtr[varIndex],
+			Tcl_GetObjType("string"));
 		strPtr = (TestString *)
 		    (varPtr[varIndex])->internalRep.otherValuePtr;
 		length = (int) strPtr->allocated;
@@ -1152,9 +1151,8 @@ TeststringobjCmd(
 		goto wrongNumArgs;
 	    }
 	    if (varPtr[varIndex] != NULL) {
-		if ((varPtr[varIndex])->typePtr != &tclStringType) {
-		    Tcl_ConvertToType(NULL, varPtr[varIndex], &tclStringType);
-		}
+		Tcl_ConvertToType(NULL, varPtr[varIndex],
+			Tcl_GetObjType("string"));
 		strPtr = (TestString *)
 		    (varPtr[varIndex])->internalRep.otherValuePtr;
 		length = (int) strPtr->uallocated;
-- 
cgit v0.12