diff options
| author | dgp <dgp@users.sourceforge.net> | 2016-11-16 15:04:10 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2016-11-16 15:04:10 (GMT) |
| commit | 16483765baae1e041496f1abdd615844ca08dba8 (patch) | |
| tree | da7bc7e3d61ec8cbde015a28bdc6d92fded02a1b /generic/tclOODefineCmds.c | |
| parent | 9b461748a00c4ac031b5c01d99daa9e1b9171f05 (diff) | |
| parent | 0dd529776d4895043aa957a1e7f21d4015733c4e (diff) | |
| download | tcl-16483765baae1e041496f1abdd615844ca08dba8.zip tcl-16483765baae1e041496f1abdd615844ca08dba8.tar.gz tcl-16483765baae1e041496f1abdd615844ca08dba8.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tclOODefineCmds.c')
| -rw-r--r-- | generic/tclOODefineCmds.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/generic/tclOODefineCmds.c b/generic/tclOODefineCmds.c index 8c3f28c..5b0dfc3 100644 --- a/generic/tclOODefineCmds.c +++ b/generic/tclOODefineCmds.c @@ -2217,7 +2217,7 @@ ClassSuperSet( "attempt to form circular dependency graph", -1)); Tcl_SetErrorCode(interp, "TCL", "OO", "CIRCULARITY", NULL); failedAfterAlloc: - ckfree((char *) superclasses); + ckfree(superclasses); return TCL_ERROR; } } @@ -2234,7 +2234,7 @@ ClassSuperSet( FOREACH(superPtr, oPtr->classPtr->superclasses) { TclOORemoveFromSubclasses(oPtr->classPtr, superPtr); } - ckfree((char *) oPtr->classPtr->superclasses.list); + ckfree(oPtr->classPtr->superclasses.list); } oPtr->classPtr->superclasses.list = superclasses; oPtr->classPtr->superclasses.num = superc; @@ -2323,7 +2323,7 @@ ClassVarsSet( } for (i=0 ; i<varc ; i++) { - const char *varName = Tcl_GetString(varv[i]); + const char *varName = TclGetString(varv[i]); if (strstr(varName, "::") != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( @@ -2349,7 +2349,7 @@ ClassVarsSet( } if (i != varc) { if (varc == 0) { - ckfree((char *) oPtr->classPtr->variables.list); + ckfree(oPtr->classPtr->variables.list); } else if (i) { oPtr->classPtr->variables.list = (Tcl_Obj **) ckrealloc((char *) oPtr->classPtr->variables.list, @@ -2604,7 +2604,7 @@ ObjVarsSet( } for (i=0 ; i<varc ; i++) { - const char *varName = Tcl_GetString(varv[i]); + const char *varName = TclGetString(varv[i]); if (strstr(varName, "::") != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( @@ -2630,7 +2630,7 @@ ObjVarsSet( } if (i != varc) { if (varc == 0) { - ckfree((char *) oPtr->variables.list); + ckfree(oPtr->variables.list); } else if (i) { oPtr->variables.list = (Tcl_Obj **) ckrealloc((char *) oPtr->variables.list, |