diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | generic/tclNamesp.c | 8 |
2 files changed, 10 insertions, 5 deletions
@@ -1,3 +1,10 @@ +2006-05-31 Jeff Hobbs <jeffh@ActiveState.com> + + * generic/tclNamesp.c (NamespaceInscopeCmd): revert [Bug 1400572] + fix of 2006-01-09 for [namespace inscope] as it seems to mess with + itcl scope decoding. Leaving namespace-29.6 test failure until + final cause it determined. + 2006-05-29 Jeff Hobbs <jeffh@ActiveState.com> * generic/tcl.h (Tcl_DecrRefCount): use if/else construct to allow diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c index 1d12831..9955e02 100644 --- a/generic/tclNamesp.c +++ b/generic/tclNamesp.c @@ -19,7 +19,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclNamesp.c,v 1.31.2.11 2006/01/09 18:34:17 dgp Exp $ + * RCS: @(#) $Id: tclNamesp.c,v 1.31.2.12 2006/05/31 23:29:31 hobbs Exp $ */ #include "tclInt.h" @@ -3357,7 +3357,7 @@ NamespaceInscopeCmd(dummy, interp, objc, objv) Tcl_Obj *CONST objv[]; /* Argument objects. */ { Tcl_Namespace *namespacePtr; - CallFrame frame; + Tcl_CallFrame frame; int i, result; if (objc < 4) { @@ -3384,13 +3384,11 @@ NamespaceInscopeCmd(dummy, interp, objc, objv) * Make the specified namespace the current namespace. */ - result = Tcl_PushCallFrame(interp, (Tcl_CallFrame *)&frame, namespacePtr, + result = Tcl_PushCallFrame(interp, &frame, namespacePtr, /*isProcCallFrame*/ 0); if (result != TCL_OK) { return result; } - frame.objc = objc; - frame.objv = objv; /* * Execute the command. If there is just one argument, just treat it as |