diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-02-03 16:05:31 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-02-03 16:05:31 (GMT) |
| commit | 6b77853e6dcdec7566901f635b7298c8fa5dd349 (patch) | |
| tree | 01db44fdacc53c737b3eca7e953393794e326a41 /generic/tclRegexp.c | |
| parent | 50a21353617798019e1200fb102877f4c1e1ca22 (diff) | |
| parent | d92d307894b14bbb065fdb65c5158f391da00cf1 (diff) | |
| download | tcl-6b77853e6dcdec7566901f635b7298c8fa5dd349.zip tcl-6b77853e6dcdec7566901f635b7298c8fa5dd349.tar.gz tcl-6b77853e6dcdec7566901f635b7298c8fa5dd349.tar.bz2 | |
merge trunk
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 4977934..e3d40b4 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; } |