diff options
| author | dgp <dgp@users.sourceforge.net> | 2016-07-14 18:09:31 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2016-07-14 18:09:31 (GMT) |
| commit | 7412b3008dee907685cf74a7d468e8c4ad1f69ef (patch) | |
| tree | 7436eb169313533b62ea571fa780f9a8499edefd /generic/tclNamesp.c | |
| parent | fbdefc02776c41e6be1e6e96a92b6e6485851951 (diff) | |
| parent | 10f81d78ff4d5f5931412700726ce05d14d02fad (diff) | |
| download | tcl-7412b3008dee907685cf74a7d468e8c4ad1f69ef.zip tcl-7412b3008dee907685cf74a7d468e8c4ad1f69ef.tar.gz tcl-7412b3008dee907685cf74a7d468e8c4ad1f69ef.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tclNamesp.c')
| -rw-r--r-- | generic/tclNamesp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c index dd6ba55..ff9b2c3 100644 --- a/generic/tclNamesp.c +++ b/generic/tclNamesp.c @@ -2901,9 +2901,9 @@ GetNamespaceFromObj( nsPtr = resNamePtr->nsPtr; refNsPtr = resNamePtr->refNsPtr; - if (!(nsPtr->flags & NS_DYING) && (interp == nsPtr->interp) && - (!refNsPtr || ((interp == refNsPtr->interp) && - (refNsPtr== (Namespace *) Tcl_GetCurrentNamespace(interp))))){ + if (!(nsPtr->flags & NS_DYING) && (interp == nsPtr->interp) + && (!refNsPtr || (refNsPtr == + (Namespace *) TclGetCurrentNamespace(interp)))) { *nsPtrPtr = (Tcl_Namespace *) nsPtr; return TCL_OK; } @@ -4792,7 +4792,7 @@ SetNsNameFromAny( if ((name[0] == ':') && (name[1] == ':')) { resNamePtr->refNsPtr = NULL; } else { - resNamePtr->refNsPtr = (Namespace *) Tcl_GetCurrentNamespace(interp); + resNamePtr->refNsPtr = (Namespace *) TclGetCurrentNamespace(interp); } resNamePtr->refCount = 0; NsNameSetIntRep(objPtr, resNamePtr); |