diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-01-31 10:31:55 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-01-31 10:31:55 (GMT) |
| commit | 2f3e5e010b0f103d9c1afbe009a9ca9aa648766e (patch) | |
| tree | 93d16010bea954703aad736080cb17ea3af82b51 /generic/tclOOCall.c | |
| parent | f50bf4d17a2021e535f47e5253e24bd3dc1269b5 (diff) | |
| parent | 31f3f5ff6333217316c5da442a0194085211dfe1 (diff) | |
| download | tcl-2f3e5e010b0f103d9c1afbe009a9ca9aa648766e.zip tcl-2f3e5e010b0f103d9c1afbe009a9ca9aa648766e.tar.gz tcl-2f3e5e010b0f103d9c1afbe009a9ca9aa648766e.tar.bz2 | |
merge core-8-5-branch
Diffstat (limited to 'generic/tclOOCall.c')
| -rw-r--r-- | generic/tclOOCall.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/generic/tclOOCall.c b/generic/tclOOCall.c index a79e4fa..26fd09f 100644 --- a/generic/tclOOCall.c +++ b/generic/tclOOCall.c @@ -178,7 +178,7 @@ StashCallChain( callPtr->refCount++; TclFreeIntRep(objPtr); objPtr->typePtr = &methodNameType; - objPtr->internalRep.otherValuePtr = callPtr; + objPtr->internalRep.twoPtrValue.ptr1 = callPtr; } void @@ -205,10 +205,10 @@ DupMethodNameRep( Tcl_Obj *srcPtr, Tcl_Obj *dstPtr) { - register CallChain *callPtr = srcPtr->internalRep.otherValuePtr; + register CallChain *callPtr = srcPtr->internalRep.twoPtrValue.ptr1; dstPtr->typePtr = &methodNameType; - dstPtr->internalRep.otherValuePtr = callPtr; + dstPtr->internalRep.twoPtrValue.ptr1 = callPtr; callPtr->refCount++; } @@ -216,10 +216,9 @@ static void FreeMethodNameRep( Tcl_Obj *objPtr) { - register CallChain *callPtr = objPtr->internalRep.otherValuePtr; + register CallChain *callPtr = objPtr->internalRep.twoPtrValue.ptr1; TclOODeleteChain(callPtr); - objPtr->internalRep.otherValuePtr = NULL; objPtr->typePtr = NULL; } @@ -952,7 +951,7 @@ TclOOGetCallContext( const int reuseMask = ((flags & PUBLIC_METHOD) ? ~0 : ~PUBLIC_METHOD); if (cacheInThisObj->typePtr == &methodNameType) { - callPtr = cacheInThisObj->internalRep.otherValuePtr; + callPtr = cacheInThisObj->internalRep.twoPtrValue.ptr1; if (IsStillValid(callPtr, oPtr, flags, reuseMask)) { callPtr->refCount++; goto returnContext; |