From 1ecf5885a2ca387def4afaaa7a2a68ede676282a Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Tue, 23 Oct 2007 21:57:19 +0000
Subject: [PATCH] VC++ error/warning fixes

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@10029 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/tcl/std_vector.i     | 4 ++--
 Lib/tcl/tclprimtypes.swg | 3 ++-
 Lib/tcl/tclrun.swg       | 5 ++---
 Lib/tcl/tclwstrings.swg  | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Lib/tcl/std_vector.i b/Lib/tcl/std_vector.i
index 700547fe9..d913f00cc 100644
--- a/Lib/tcl/std_vector.i
+++ b/Lib/tcl/std_vector.i
@@ -37,8 +37,8 @@
 #include <stdexcept>
 #include <string>
 
-Tcl_Obj* SwigString_FromString(std::string s) {
-    return Tcl_NewStringObj(s.data(), s.length());
+Tcl_Obj* SwigString_FromString(const std::string &s) {
+    return Tcl_NewStringObj(s.data(), (int)s.length());
 }
 
 int Tcl_GetBoolFromObj(Tcl_Interp *interp, Tcl_Obj *o, bool *val) {
diff --git a/Lib/tcl/tclprimtypes.swg b/Lib/tcl/tclprimtypes.swg
index ff59631c6..e781798e0 100644
--- a/Lib/tcl/tclprimtypes.swg
+++ b/Lib/tcl/tclprimtypes.swg
@@ -142,8 +142,9 @@ SWIG_AsVal_dec(long long)(Tcl_Obj *obj, long long *val)
     const char *nptr = Tcl_GetStringFromObj(obj, &len);
     if (nptr && len > 0) {
       char *endptr;
+      long long v;
       errno = 0;
-      long long v = strtoll(nptr, &endptr,0);
+      v = strtoll(nptr, &endptr,0);
       if (nptr[0] == '\0' || *endptr != '\0')
 	return SWIG_TypeError;
       if ((v == LLONG_MAX || v == LLONG_MIN) && errno == ERANGE) {
diff --git a/Lib/tcl/tclrun.swg b/Lib/tcl/tclrun.swg
index d4a680bda..47c6d7b04 100644
--- a/Lib/tcl/tclrun.swg
+++ b/Lib/tcl/tclrun.swg
@@ -153,8 +153,7 @@ SWIG_Tcl_ConvertPtrFromString(Tcl_Interp *interp, const char *c, void **ptr, swi
       return SWIG_ERROR;
     }
 
-    Tcl_Obj *result = Tcl_GetObjResult(interp);
-    c = Tcl_GetStringFromObj(result, NULL);
+    c = Tcl_GetStringFromObj(Tcl_GetObjResult(interp), NULL);
   }
 
   c++;
@@ -458,7 +457,7 @@ SWIG_Tcl_MethodCommand(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_
     meth = cls->methods;
     while (meth && meth->name) {
       char *cr = (char *) Tcl_GetStringResult(interp);
-      int meth_len = strlen(meth->name);
+      size_t meth_len = strlen(meth->name);
       char* where = strchr(cr,':');
       while(where) {
         where = strstr(where, meth->name);
diff --git a/Lib/tcl/tclwstrings.swg b/Lib/tcl/tclwstrings.swg
index 20ee90069..2d344c20f 100644
--- a/Lib/tcl/tclwstrings.swg
+++ b/Lib/tcl/tclwstrings.swg
@@ -49,8 +49,8 @@ SWIG_FromWCharPtrAndSize(const wchar_t* carray, size_t size)
   if (size < INT_MAX) {
     Tcl_Encoding encoding = NULL;
     char *src = (char *) carray;
-    int srcLen = (size)*sizeof(wchar_t);
-    int dstLen = (size)*sizeof(Tcl_UniChar);
+    int srcLen = (int)(size*sizeof(wchar_t));
+    int dstLen = (int)(size*sizeof(Tcl_UniChar));
     char *dst = %new_array(dstLen, char);
     int flags = 0;
     Tcl_EncodingState *statePtr = 0;
@@ -61,7 +61,7 @@ SWIG_FromWCharPtrAndSize(const wchar_t* carray, size_t size)
     Tcl_ExternalToUtf(0, encoding, src, srcLen, flags, statePtr, dst,
 		      dstLen, &srcRead, &dstWrote, &dstChars);
     
-    res = Tcl_NewUnicodeObj((Tcl_UniChar*)dst, size);
+    res = Tcl_NewUnicodeObj((Tcl_UniChar*)dst, (int)size);
     %delete_array(dst);
   }
   return res;