diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-12-08 17:52:36 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-12-08 17:52:36 (GMT) |
| commit | 328461c6cf73105f97aee07048a22741b4d2cc2b (patch) | |
| tree | f63ff64347762a52ad09abde4e031727526c05c5 /generic/tclBasic.c | |
| parent | 99d3d95f4b8ae074c1c23d5599e32d976a6cb529 (diff) | |
| parent | 6da0c767cd83c18aa8a2c152ad6b0298ea4f28ab (diff) | |
| download | tcl-328461c6cf73105f97aee07048a22741b4d2cc2b.zip tcl-328461c6cf73105f97aee07048a22741b4d2cc2b.tar.gz tcl-328461c6cf73105f97aee07048a22741b4d2cc2b.tar.bz2 | |
Bring back stub table in original state.
Merge trunk
Diffstat (limited to 'generic/tclBasic.c')
| -rw-r--r-- | generic/tclBasic.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c index c1dd52d..81b3513 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -3024,13 +3024,6 @@ Tcl_DeleteCommandFromToken( Tcl_Command importCmd; /* - * Bump the command epoch counter. This will invalidate all cached - * references that point to this command. - */ - - cmdPtr->cmdEpoch++; - - /* * The code here is tricky. We can't delete the hash table entry before * invoking the deletion callback because there are cases where the * deletion callback needs to invoke the command (e.g. object systems such @@ -3052,6 +3045,14 @@ Tcl_DeleteCommandFromToken( Tcl_DeleteHashEntry(cmdPtr->hPtr); cmdPtr->hPtr = NULL; } + + /* + * Bump the command epoch counter. This will invalidate all cached + * references that point to this command. + */ + + cmdPtr->cmdEpoch++; + return 0; } @@ -3154,6 +3155,13 @@ Tcl_DeleteCommandFromToken( if (cmdPtr->hPtr != NULL) { Tcl_DeleteHashEntry(cmdPtr->hPtr); cmdPtr->hPtr = NULL; + + /* + * Bump the command epoch counter. This will invalidate all cached + * references that point to this command. + */ + + cmdPtr->cmdEpoch++; } /* |