diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2014-01-02 09:38:03 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2014-01-02 09:38:03 (GMT) |
| commit | cd7f1c6c44d929ae0f9ad4ef46038765969a94a6 (patch) | |
| tree | 0986e9708ae5ed1a4f027f0142e942aac7b3f29f /generic/tclOOBasic.c | |
| parent | 6418dc63fd2459110ec65445bbc611c4aa2e32fe (diff) | |
| parent | 7d35dc662f87cf8c5b430c248f1da15ba16104b7 (diff) | |
| download | tcl-cd7f1c6c44d929ae0f9ad4ef46038765969a94a6.zip tcl-cd7f1c6c44d929ae0f9ad4ef46038765969a94a6.tar.gz tcl-cd7f1c6c44d929ae0f9ad4ef46038765969a94a6.tar.bz2 | |
merge main working branch
Diffstat (limited to 'generic/tclOOBasic.c')
| -rw-r--r-- | generic/tclOOBasic.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/generic/tclOOBasic.c b/generic/tclOOBasic.c index 853e2ec..49c917b 100644 --- a/generic/tclOOBasic.c +++ b/generic/tclOOBasic.c @@ -25,8 +25,6 @@ static int FinalizeConstruction(ClientData data[], Tcl_Interp *interp, int result); static int FinalizeEval(ClientData data[], Tcl_Interp *interp, int result); -static int RestoreFrame(ClientData data[], - Tcl_Interp *interp, int result); /* * ---------------------------------------------------------------------- @@ -808,7 +806,7 @@ TclOONextObjCmd( * that this is like [uplevel 1] and not [eval]. */ - TclNRAddCallback(interp, RestoreFrame, framePtr, NULL, NULL, NULL); + TclNRAddCallback(interp, TclOONextRestoreFrame, framePtr, NULL,NULL,NULL); iPtr->varFramePtr = framePtr->callerVarPtr; return TclNRObjectContextInvokeNext(interp, context, objc, objv, 1); } @@ -877,8 +875,8 @@ TclOONextToObjCmd( * context. Note that this is like [uplevel 1] and not [eval]. */ - TclNRAddCallback(interp, RestoreFrame, framePtr, contextPtr, - INT2PTR(contextPtr->index), NULL); + TclNRAddCallback(interp, TclOONextRestoreFrame, framePtr, + contextPtr, INT2PTR(contextPtr->index), NULL); contextPtr->index = i-1; iPtr->varFramePtr = framePtr->callerVarPtr; return TclNRObjectContextInvokeNext(interp, @@ -907,8 +905,8 @@ TclOONextToObjCmd( return TCL_ERROR; } -static int -RestoreFrame( +int +TclOONextRestoreFrame( ClientData data[], Tcl_Interp *interp, int result) |