diff options
| author | Miguel Sofer <miguel.sofer@gmail.com> | 2011-03-04 11:57:38 (GMT) |
|---|---|---|
| committer | Miguel Sofer <miguel.sofer@gmail.com> | 2011-03-04 11:57:38 (GMT) |
| commit | 91f3302e5805d69ba4f6cffed08c27bebdf595fa (patch) | |
| tree | eed823ea914a3da2c67ed1f1dcb6b1978fb4894e | |
| parent | 3812d1d48551882d0350ac37965e2b7f456cc381 (diff) | |
| download | tcl-91f3302e5805d69ba4f6cffed08c27bebdf595fa.zip tcl-91f3302e5805d69ba4f6cffed08c27bebdf595fa.tar.gz tcl-91f3302e5805d69ba4f6cffed08c27bebdf595fa.tar.bz2 | |
* generic/tclBasic.c (TclNREvalObjv): missing a variable declaration in commented out non-optimised code, left for ref in checkin [b97b771b6d]
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | generic/tclBasic.c | 17 |
2 files changed, 18 insertions, 9 deletions
@@ -1,3 +1,9 @@ +2011-03-01 Miguel Sofer <msofer@users.sf.net> + + * generic/tclBasic.c (TclNREvalObjv): missing a variable + declaration in commented out non-optimised code, left for ref in + checkin [b97b771b6d] + 2011-03-03 Don Porter <dgp@users.sourceforge.net> * generic/tclResult.c (Tcl_AppendResultVA): Use the directive @@ -7,8 +13,8 @@ 2011-03-01 Miguel Sofer <msofer@users.sf.net> - * generic/tclCompCmdsSZ.c (TclCompileThrowCmd) - (TclCompileUnsetCmd): fix leaks + * generic/tclCompCmdsSZ.c (TclCompileThrowCmd, TclCompileUnsetCmd): + fix leaks * generic/tclBasic.c: This is [Patch 3168398], * generic/tclCompCmdsSZ.c: Joe Mistachkin's optimisation diff --git a/generic/tclBasic.c b/generic/tclBasic.c index 30039a4..9187306 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -4263,14 +4263,17 @@ TclNREvalObjv( */ #if 0 - objProc = cmdPtr->nreProc; - if (!objProc) { - objProc = cmdPtr->objProc; + { + Tcl_ObjCmdProc *objProc = cmdPtr->nreProc; + + if (!objProc) { + objProc = cmdPtr->objProc; + } + + TclNRAddCallback(interp, NRRunObjProc, objProc, cmdPtr->objClientData, + INT2PTR(objc), (ClientData) objv); } - objClientData = cmdPtr->objClientData; - - TclNRAddCallback(interp, NRRunObjProc, objProc, objClientData, - INT2PTR(objc), (ClientData) objv); + return TCL_OK; #else if (cmdPtr->nreProc) { TclNRAddCallback(interp, NRRunObjProc, cmdPtr->nreProc, |