From ae0969dc1fc93fffcaffba7b9558c852a33d624f Mon Sep 17 00:00:00 2001 From: patthoyts Date: Wed, 20 Aug 2008 23:48:42 +0000 Subject: Added casts to make MSVC happy and re-enable the debug build. --- ChangeLog | 5 +++++ generic/tclBasic.c | 4 ++-- generic/tclOOMethod.c | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 14372f2..7725eb1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-08-21 Pat Thoyts + + * generic/tclOOMethod.c: Added casts to make MSVC happy + * generic/tclBasic.c: + 2008-08-20 Donal K. Fellows * generic/tclOO.c (AllocObject): Suppress compilation of commands in diff --git a/generic/tclBasic.c b/generic/tclBasic.c index 40c76b5..ac7fd5e 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -16,7 +16,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclBasic.c,v 1.356 2008/08/20 15:31:06 dkf Exp $ + * RCS: @(#) $Id: tclBasic.c,v 1.357 2008/08/20 23:48:42 patthoyts Exp $ */ #include "tclInt.h" @@ -2270,7 +2270,7 @@ TclInvokeStringCommand( result = (*cmdPtr->proc)(cmdPtr->clientData, interp, objc, argv); - TclStackFree(interp, argv); + TclStackFree(interp, (char **)argv); return result; } diff --git a/generic/tclOOMethod.c b/generic/tclOOMethod.c index 0110283..c33638d 100644 --- a/generic/tclOOMethod.c +++ b/generic/tclOOMethod.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclOOMethod.c,v 1.14 2008/08/20 15:41:26 dkf Exp $ + * RCS: @(#) $Id: tclOOMethod.c,v 1.15 2008/08/20 23:48:42 patthoyts Exp $ */ #ifdef HAVE_CONFIG_H @@ -799,7 +799,7 @@ PushMethodCallFrame( ByteCode *codePtr = pmPtr->procPtr->bodyPtr->internalRep.otherValuePtr; - codePtr->nsPtr = nsPtr; + codePtr->nsPtr = (Namespace *) nsPtr; } result = TclProcCompileProc(interp, pmPtr->procPtr, pmPtr->procPtr->bodyPtr, (Namespace *) nsPtr, "body of method", -- cgit v0.12