jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

VC++ error/warning fixes

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@10029 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2007-10-23 21:57:19 +00:00
commit 1ecf5885a2
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/tcl/std_vector.i
View file

@ -37,8 +37,8 @@
#include <stdexcept> #include <stdexcept>
#include <string> #include <string>
Tcl_Obj* SwigString_FromString(std::string s) { Tcl_Obj* SwigString_FromString(const std::string &s) {
return Tcl_NewStringObj(s.data(), s.length()); return Tcl_NewStringObj(s.data(), (int)s.length());
} }
int Tcl_GetBoolFromObj(Tcl_Interp *interp, Tcl_Obj *o, bool *val) { int Tcl_GetBoolFromObj(Tcl_Interp *interp, Tcl_Obj *o, bool *val) {

3
Lib/tcl/tclprimtypes.swg
View file

@ -142,8 +142,9 @@ SWIG_AsVal_dec(long long)(Tcl_Obj *obj, long long *val)
const char *nptr = Tcl_GetStringFromObj(obj, &len); const char *nptr = Tcl_GetStringFromObj(obj, &len);
if (nptr && len > 0) { if (nptr && len > 0) {
char *endptr; char *endptr;
long long v;
errno = 0; errno = 0;
long long v = strtoll(nptr, &endptr,0); v = strtoll(nptr, &endptr,0);
if (nptr[0] == '\0' || *endptr != '\0') if (nptr[0] == '\0' || *endptr != '\0')
return SWIG_TypeError; return SWIG_TypeError;
if ((v == LLONG_MAX || v == LLONG_MIN) && errno == ERANGE) { if ((v == LLONG_MAX || v == LLONG_MIN) && errno == ERANGE) {

5
Lib/tcl/tclrun.swg
View file

@ -153,8 +153,7 @@ SWIG_Tcl_ConvertPtrFromString(Tcl_Interp *interp, const char *c, void **ptr, swi
return SWIG_ERROR; return SWIG_ERROR;
} }
Tcl_Obj *result = Tcl_GetObjResult(interp); c = Tcl_GetStringFromObj(Tcl_GetObjResult(interp), NULL);
c = Tcl_GetStringFromObj(result, NULL);
} }
c++; c++;
@ -458,7 +457,7 @@ SWIG_Tcl_MethodCommand(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_
meth = cls->methods; meth = cls->methods;
while (meth && meth->name) { while (meth && meth->name) {
char *cr = (char *) Tcl_GetStringResult(interp); char *cr = (char *) Tcl_GetStringResult(interp);
int meth_len = strlen(meth->name); size_t meth_len = strlen(meth->name);
char* where = strchr(cr,':'); char* where = strchr(cr,':');
while(where) { while(where) {
where = strstr(where, meth->name); where = strstr(where, meth->name);

6
Lib/tcl/tclwstrings.swg
View file

@ -49,8 +49,8 @@ SWIG_FromWCharPtrAndSize(const wchar_t* carray, size_t size)
if (size < INT_MAX) { if (size < INT_MAX) {
Tcl_Encoding encoding = NULL; Tcl_Encoding encoding = NULL;
char *src = (char *) carray; char *src = (char *) carray;
int srcLen = (size)*sizeof(wchar_t); int srcLen = (int)(size*sizeof(wchar_t));
int dstLen = (size)*sizeof(Tcl_UniChar); int dstLen = (int)(size*sizeof(Tcl_UniChar));
char *dst = %new_array(dstLen, char); char *dst = %new_array(dstLen, char);
int flags = 0; int flags = 0;
Tcl_EncodingState *statePtr = 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, Tcl_ExternalToUtf(0, encoding, src, srcLen, flags, statePtr, dst,
dstLen, &srcRead, &dstWrote, &dstChars); dstLen, &srcRead, &dstWrote, &dstChars);
res = Tcl_NewUnicodeObj((Tcl_UniChar*)dst, size); res = Tcl_NewUnicodeObj((Tcl_UniChar*)dst, (int)size);
%delete_array(dst); %delete_array(dst);
} }
return res; return res;