An update will be applied January 25th, between 12PM and 1:00PM EST (UTC -5:00). The site may be slow during that time.

Commit 71c79973 authored by Bill Hoffman's avatar Bill Hoffman
Browse files

ENH: add support for win64 for visual studio 2005 ide and nmake, also fix...

ENH: add support for win64 for visual studio 2005 ide and nmake, also fix warnings produced by building for win64
parent 138a1a8f
......@@ -513,7 +513,7 @@ const char* CommandLineArguments::GetArgv0()
//----------------------------------------------------------------------------
unsigned int CommandLineArguments::GetLastArgument()
{
return this->Internals->LastArgument + 1;
return (unsigned int)this->Internals->LastArgument + 1;
}
//----------------------------------------------------------------------------
......@@ -620,7 +620,7 @@ void CommandLineArguments::GenerateHelp()
str << buffer;
}
const char* ptr = this->Internals->Callbacks[mpit->first].Help;
int len = strlen(ptr);
size_t len = strlen(ptr);
int cnt = 0;
while ( len > 0)
{
......
......@@ -338,7 +338,7 @@ bool Glob::FindFiles(const kwsys_stl::string& inexpr)
{
if ( cc > 0 && expr[cc] == '/' && expr[cc-1] != '\\' )
{
last_slash = cc;
last_slash = (int)cc;
}
if ( cc > 0 &&
(expr[cc] == '[' || expr[cc] == '?' || expr[cc] == '*') &&
......@@ -371,7 +371,7 @@ bool Glob::FindFiles(const kwsys_stl::string& inexpr)
}
}
}
skip = cc + 1;
skip = int(cc + 1);
}
else
#endif
......
......@@ -2141,7 +2141,7 @@ void kwsysProcessCleanup(kwsysProcess* cp, int error)
void kwsysProcessCleanErrorMessage(kwsysProcess* cp)
{
/* Remove trailing period and newline, if any. */
int length = strlen(cp->ErrorMessage);
size_t length = strlen(cp->ErrorMessage);
if(cp->ErrorMessage[length-1] == '\n')
{
cp->ErrorMessage[length-1] = 0;
......
......@@ -705,7 +705,7 @@ void RegistryHelper::SetSubKey(const char* sk)
char *RegistryHelper::Strip(char *str)
{
int cc;
int len;
size_t len;
char *nstr;
if ( !str )
{
......@@ -713,7 +713,7 @@ char *RegistryHelper::Strip(char *str)
}
len = strlen(str);
nstr = str;
for( cc=0; cc<len; cc++ )
for( cc=0; cc<(int)len; cc++ )
{
if ( !isspace( *nstr ) )
{
......@@ -721,7 +721,7 @@ char *RegistryHelper::Strip(char *str)
}
nstr ++;
}
for( cc=(strlen(nstr)-1); cc>=0; cc-- )
for( cc=int(strlen(nstr)-1); cc>=0; cc-- )
{
if ( !isspace( nstr[cc] ) )
{
......
......@@ -1166,7 +1166,7 @@ int SystemTools::EstimateFormatLength(const char *format, va_list ap)
// Start with the length of the format string itself.
int length = strlen(format);
size_t length = strlen(format);
// Increase the length for every argument in the format.
......@@ -1219,7 +1219,7 @@ int SystemTools::EstimateFormatLength(const char *format, va_list ap)
}
}
return length;
return (int)length;
}
kwsys_stl::string SystemTools::EscapeChars(
......@@ -2581,7 +2581,7 @@ int OldWindowsGetLongPath(kwsys_stl::string const& shortPath,
{
longPath = shortPath;
}
return longPath.size();
return (int)longPath.size();
}
......
......@@ -392,7 +392,7 @@ static const unsigned long _stl_prime_list[_stl_num_primes] =
1610612741ul, 3221225473ul, 4294967291ul
};
inline unsigned long _stl_next_prime(unsigned long __n)
inline size_t _stl_next_prime(size_t __n)
{
const unsigned long* __first = _stl_prime_list;
const unsigned long* __last = _stl_prime_list + (int)_stl_num_primes;
......
......@@ -86,6 +86,9 @@ int TestDynamicLoader(const char* libname, const char* symbol, int r1, int r2, i
int main(int argc, char *argv[])
{
#if defined(_WIN32)
SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX);
#endif
int res;
if( argc == 3 )
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment