diff options
| author | nijtmans@users.sourceforge.net <jan.nijtmans> | 2013-01-31 10:31:55 (GMT) |
|---|---|---|
| committer | nijtmans@users.sourceforge.net <jan.nijtmans> | 2013-01-31 10:31:55 (GMT) |
| commit | 29da2ac12ea0bde09eb329a21d397db9479b3e02 (patch) | |
| tree | 93d16010bea954703aad736080cb17ea3af82b51 /generic/tclRegexp.c | |
| parent | 315b974bfcf46565080e49a0544f1ce761c61492 (diff) | |
| parent | 3402499a6e557ee447cd796f168e59c3a9fe7ebd (diff) | |
| download | tcl-29da2ac12ea0bde09eb329a21d397db9479b3e02.zip tcl-29da2ac12ea0bde09eb329a21d397db9479b3e02.tar.gz tcl-29da2ac12ea0bde09eb329a21d397db9479b3e02.tar.bz2 | |
merge core-8-5-branch
Diffstat (limited to 'generic/tclRegexp.c')
| -rw-r--r-- | generic/tclRegexp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/generic/tclRegexp.c b/generic/tclRegexp.c index 6c1dc08..6348e4a 100644 --- a/generic/tclRegexp.c +++ b/generic/tclRegexp.c @@ -578,7 +578,7 @@ Tcl_GetRegExpFromObj( * TclRegexp* when the type is tclRegexpType. */ - regexpPtr = objPtr->internalRep.otherValuePtr; + regexpPtr = objPtr->internalRep.twoPtrValue.ptr1; if ((objPtr->typePtr != &tclRegexpType) || (regexpPtr->flags != flags)) { pattern = TclGetStringFromObj(objPtr, &length); @@ -601,7 +601,7 @@ Tcl_GetRegExpFromObj( */ TclFreeIntRep(objPtr); - objPtr->internalRep.otherValuePtr = regexpPtr; + objPtr->internalRep.twoPtrValue.ptr1 = regexpPtr; objPtr->typePtr = &tclRegexpType; } return (Tcl_RegExp) regexpPtr; @@ -749,7 +749,7 @@ static void FreeRegexpInternalRep( Tcl_Obj *objPtr) /* Regexp object with internal rep to free. */ { - TclRegexp *regexpRepPtr = objPtr->internalRep.otherValuePtr; + TclRegexp *regexpRepPtr = objPtr->internalRep.twoPtrValue.ptr1; /* * If this is the last reference to the regexp, free it. @@ -783,10 +783,10 @@ DupRegexpInternalRep( Tcl_Obj *srcPtr, /* Object with internal rep to copy. */ Tcl_Obj *copyPtr) /* Object with internal rep to set. */ { - TclRegexp *regexpPtr = srcPtr->internalRep.otherValuePtr; + TclRegexp *regexpPtr = srcPtr->internalRep.twoPtrValue.ptr1; regexpPtr->refCount++; - copyPtr->internalRep.otherValuePtr = srcPtr->internalRep.otherValuePtr; + copyPtr->internalRep.twoPtrValue.ptr1 = srcPtr->internalRep.twoPtrValue.ptr1; copyPtr->typePtr = &tclRegexpType; } |