kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove some borland 6 warnings

This commit is contained in:
Bill Hoffman 2003-05-28 09:21:37 -04:00
parent 64db4e2cd8
commit 8cb6645ad8
5 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/CTest/cmCTestSubmit.cxx
View File

@ -299,7 +299,6 @@ bool cmCTestSubmit::TriggerUsingHTTP(const std::vector<std::string>& files,
const std::string& url) const std::string& url)
{ {
CURL *curl; CURL *curl;
CURLcode res = CURLcode();
/* In windows, this will init the winsock stuff */ /* In windows, this will init the winsock stuff */
::curl_global_init(CURL_GLOBAL_ALL); ::curl_global_init(CURL_GLOBAL_ALL);
@ -363,8 +362,7 @@ bool cmCTestSubmit::TriggerUsingHTTP(const std::vector<std::string>& files,
std::cout << "Trigger url: " << turl.c_str() << std::endl; std::cout << "Trigger url: " << turl.c_str() << std::endl;
} }
curl_easy_setopt(curl, CURLOPT_URL, turl.c_str()); curl_easy_setopt(curl, CURLOPT_URL, turl.c_str());
res = curl_easy_perform(curl); if ( curl_easy_perform(curl) )
if ( res )
{ {
std::cout << "Error when uploading" << std::endl; std::cout << "Error when uploading" << std::endl;
::curl_easy_cleanup(curl); ::curl_easy_cleanup(curl);

3
Source/cmCTest.cxx
View File

@ -170,10 +170,9 @@ static const char* cmCTestWarningExceptions[] = {
std::string cmCTest::MakeXMLSafe(const std::string& str) std::string cmCTest::MakeXMLSafe(const std::string& str)
{ {
std::string::size_type pos = 0;
cmOStringStream ost; cmOStringStream ost;
char buffer[10]; char buffer[10];
for ( pos = 0; pos < str.size(); pos ++ ) for (std::string::size_type pos = 0; pos < str.size(); pos ++ )
{ {
unsigned char ch = str[pos]; unsigned char ch = str[pos];
if ( (ch > 126 || ch < 32) && ch != 9 && ch != 10 && ch != 13 ) if ( (ch > 126 || ch < 32) && ch != 9 && ch != 10 && ch != 13 )

13
Source/cmDynamicLoader.cxx
View File

@ -259,15 +259,14 @@ int cmDynamicLoader::CloseLibrary(cmLibHandle lib)
cmDynamicLoaderFunction cmDynamicLoaderFunction
cmDynamicLoader::GetSymbolAddress(cmLibHandle lib, const char* sym) cmDynamicLoader::GetSymbolAddress(cmLibHandle lib, const char* sym)
{ {
void* result = 0;
#ifdef UNICODE #ifdef UNICODE
wchar_t *wsym = new wchar_t [mbstowcs(NULL, sym, 32000)]; wchar_t *wsym = new wchar_t [mbstowcs(NULL, sym, 32000)];
mbstowcs(wsym, sym, 32000); mbstowcs(wsym, sym, 32000);
void *ret = GetProcAddress(lib, wsym); void *ret = GetProcAddress(lib, wsym);
delete [] wsym; delete [] wsym;
result = ret; void* result = ret;
#else #else
result = GetProcAddress(lib, sym); void* result = GetProcAddress(lib, sym);
#endif #endif
// Hack to cast pointer-to-data to pointer-to-function. // Hack to cast pointer-to-data to pointer-to-function.
return *reinterpret_cast<cmDynamicLoaderFunction*>(&result); return *reinterpret_cast<cmDynamicLoaderFunction*>(&result);

2
Source/cmGlobalVisualStudio71Generator.cxx
View File

@ -203,7 +203,6 @@ void cmGlobalVisualStudio71Generator::WriteProjectDepends(std::ostream& fout,
const cmTarget& target const cmTarget& target
) )
{ {
int depcount = 0;
// insert Begin Project Dependency Project_Dep_Name project stuff here // insert Begin Project Dependency Project_Dep_Name project stuff here
if (target.GetType() != cmTarget::STATIC_LIBRARY) if (target.GetType() != cmTarget::STATIC_LIBRARY)
{ {
@ -237,7 +236,6 @@ void cmGlobalVisualStudio71Generator::WriteProjectDepends(std::ostream& fout,
{ {
fout << "\t\t{" << this->CreateGUID(i->c_str()) << "} = {" fout << "\t\t{" << this->CreateGUID(i->c_str()) << "} = {"
<< this->CreateGUID(i->c_str()) << "}\n"; << this->CreateGUID(i->c_str()) << "}\n";
depcount++;
} }
} }
} }

6
Source/cmSystemTools.cxx
View File

@ -704,12 +704,12 @@ void cmSystemTools::ConvertToUnixSlashes(std::string& path)
pos++; pos++;
} }
// Remove all // from the path just like most unix shells // Remove all // from the path just like most unix shells
#ifndef _WIN32
int start_find = 0; int start_find = 0;
#else
#ifdef _WIN32
// However, on windows if the first characters are both slashes, // However, on windows if the first characters are both slashes,
// then keep them that way, so that network paths can be handled. // then keep them that way, so that network paths can be handled.
start_find = 1; int start_find = 1;
#endif #endif
while((pos = path.find("//", start_find)) != std::string::npos) while((pos = path.find("//", start_find)) != std::string::npos)