shitty 2.5.8 fixes (--nProtect)
authorwerner
Wed, 15 May 1996 02:13:33 +0200
changeset 1399 fd17bde5f3a2
parent 1398 6c594289c589
child 1400 0ee12d945849
shitty 2.5.8 fixes (--nProtect)
Array.st
String.st
--- a/Array.st	Tue May 14 17:40:22 1996 +0200
+++ b/Array.st	Wed May 15 02:13:33 1996 +0200
@@ -446,11 +446,9 @@
 
     if (__qClass(self) == Array) {
 	sz = __qSize(self) + sizeof(OBJ);
-	__PROTECT__(something);
-	__PROTECT__(self);
+	__PROTECT2__(something, self);
 	__qAlignedNew(nObj, sz, __context);
-	__UNPROTECT__(self);
-	__UNPROTECT__(something);
+	__UNPROTECT2__(self, something);
 
 	if (nObj) {
 	    __InstPtr(nObj)->o_class = Array;
@@ -1621,5 +1619,5 @@
 !Array class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Array.st,v 1.68 1996-04-25 16:13:49 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Array.st,v 1.69 1996-05-15 00:13:31 werner Exp $'
 ! !
--- a/String.st	Tue May 14 17:40:22 1996 +0200
+++ b/String.st	Wed May 15 02:13:33 1996 +0200
@@ -143,9 +143,10 @@
 		instsize = OHDR_SIZE + __OBJS2BYTES__(nInstVars) + len + 1;
 	    }
 
-	    __PROTECT_CONTEXT__
+	    __PROTECT_CONTEXT__;
 	    __qNew(newString, instsize, SENDER);
-	    __UNPROTECT_CONTEXT__
+	    __UNPROTECT_CONTEXT__;
+
 	    if (newString == nil) goto fail;
 	    __InstPtr(newString)->o_class = self;
 	    __qSTORE(newString, self);
@@ -1456,10 +1457,11 @@
 	    }
 	    if (index2 <= len) {
 		count = index2 - index1 + 1;
+		sz = OHDR_SIZE + count + 1;
 		__PROTECT_CONTEXT__
-		sz = OHDR_SIZE + count + 1;
 		__qNew(newString, sz, SENDER);
 		__UNPROTECT_CONTEXT__
+
 		if (newString != nil) {
 		    __InstPtr(newString)->o_class = String;
 		    dstp = __stringVal(newString);
@@ -2207,5 +2209,5 @@
 !String class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/String.st,v 1.80 1996-05-12 15:37:41 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/String.st,v 1.81 1996-05-15 00:13:33 werner Exp $'
 ! !