summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorpatthoyts <patthoyts@users.sourceforge.net>2009-07-01 15:29:48 (GMT)
committerpatthoyts <patthoyts@users.sourceforge.net>2009-07-01 15:29:48 (GMT)
commit96886634efaa755005489a262696057f0611f32f (patch)
tree7a2e5f98850a2634a8356019e2d14006d6dcc531 /generic
parent32696239facf495e5bcf0d662143edb3009aef9e (diff)
downloadtcl-96886634efaa755005489a262696057f0611f32f.zip
tcl-96886634efaa755005489a262696057f0611f32f.tar.gz
tcl-96886634efaa755005489a262696057f0611f32f.tar.bz2
Cast wide integer to int conversion and some signed/unsigned conversions. (silence msvc6 warnings)
Diffstat (limited to 'generic')
-rw-r--r--generic/tclExecute.c22
-rw-r--r--generic/tclStringObj.c6
2 files changed, 14 insertions, 14 deletions
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 2c9685f..a63508e 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -13,7 +13,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclExecute.c,v 1.369.2.10 2009/06/02 19:10:21 dgp Exp $
+ * RCS: @(#) $Id: tclExecute.c,v 1.369.2.11 2009/07/01 15:29:48 patthoyts Exp $
*/
#include "tclInt.h"
@@ -5752,7 +5752,7 @@ TclExecuteByteCode(
goto overflow;
}
#if (LONG_MAX == 0x7fffffff)
- if (l2 - 2 < MaxBase32Size
+ if (l2 - 2 < (long)MaxBase32Size
&& l1 <= MaxBase32[l2 - 2]
&& l1 >= -MaxBase32[l2 - 2]) {
/*
@@ -5797,8 +5797,8 @@ TclExecuteByteCode(
TRACE(("%s\n", O2S(valuePtr)));
NEXT_INST_F(1, 1, 0);
}
- if (l1 - 3 >= 0 && l1 - 2 < Exp32IndexSize
- && l2 - 2 < Exp32ValueSize + MaxBase32Size) {
+ if (l1 - 3 >= 0 && l1 - 2 < (long)Exp32IndexSize
+ && l2 - 2 < (long)(Exp32ValueSize + MaxBase32Size)) {
unsigned short base = Exp32Index[l1 - 3]
+ (unsigned short) (l2 - 2 - MaxBase32Size);
@@ -5819,8 +5819,8 @@ TclExecuteByteCode(
NEXT_INST_F(1, 1, 0);
}
}
- if (-l1 - 3 >= 0 && -l1 - 2 < Exp32IndexSize
- && l2 - 2 < Exp32ValueSize + MaxBase32Size) {
+ if (-l1 - 3 >= 0 && -l1 - 2 < (long)Exp32IndexSize
+ && l2 - 2 < (long)(Exp32ValueSize + MaxBase32Size)) {
unsigned short base = Exp32Index[-l1 - 3]
+ (unsigned short) (l2 - 2 - MaxBase32Size);
if (base < Exp32Index[-l1 - 2]) {
@@ -5855,7 +5855,7 @@ TclExecuteByteCode(
} else {
goto overflow;
}
- if (l2 - 2 < MaxBase64Size
+ if (l2 - 2 < (long)MaxBase64Size
&& w1 <= MaxBase64[l2 - 2]
&& w1 >= -MaxBase64[l2 - 2]) {
/*
@@ -5947,8 +5947,8 @@ TclExecuteByteCode(
* Handle cases of powers > 16 that still fit in a 64-bit word by
* doing table lookup.
*/
- if (w1 - 3 >= 0 && w1 - 2 < Exp64IndexSize
- && l2 - 2 < Exp64ValueSize + MaxBase64Size) {
+ if (w1 - 3 >= 0 && w1 - 2 < (long)Exp64IndexSize
+ && l2 - 2 < (long)(Exp64ValueSize + MaxBase64Size)) {
unsigned short base = Exp64Index[w1 - 3]
+ (unsigned short) (l2 - 2 - MaxBase64Size);
@@ -5970,8 +5970,8 @@ TclExecuteByteCode(
}
}
- if (-w1 - 3 >= 0 && -w1 - 2 < Exp64IndexSize
- && l2 - 2 < Exp64ValueSize + MaxBase64Size) {
+ if (-w1 - 3 >= 0 && -w1 - 2 < (long)Exp64IndexSize
+ && l2 - 2 < (long)(Exp64ValueSize + MaxBase64Size)) {
unsigned short base = Exp64Index[-w1 - 3]
+ (unsigned short) (l2 - 2 - MaxBase64Size);
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index b1f232d..7c0ccaf 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -33,7 +33,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclStringObj.c,v 1.70.2.14 2009/06/15 18:52:25 dgp Exp $ */
+ * RCS: @(#) $Id: tclStringObj.c,v 1.70.2.15 2009/07/01 15:29:48 patthoyts Exp $ */
#include "tclInt.h"
#include "tommath.h"
@@ -2265,9 +2265,9 @@ Tcl_AppendFormatToObj(
numDigits = 1;
}
pure = Tcl_NewObj();
- Tcl_SetObjLength(pure, numDigits);
+ Tcl_SetObjLength(pure, (int)numDigits);
bytes = TclGetString(pure);
- toAppend = length = numDigits;
+ toAppend = length = (int)numDigits;
while (numDigits--) {
int digitOffset;