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

Rename variable to remove warning

This commit is contained in:
Andy Cedilnik 2002-12-08 22:34:17 -05:00
parent 9eed6b91cf
commit 39714fb179
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmGlobalGenerator.cxx
View File

@ -196,8 +196,8 @@ void cmGlobalGenerator::EnableLanguage(const char* lang,
= mf->GetDefinition("CMAKE_MINIMUM_REQUIRED_VERSION"); = mf->GetDefinition("CMAKE_MINIMUM_REQUIRED_VERSION");
if (!versionValue || atof(versionValue) <= 1.4) if (!versionValue || atof(versionValue) <= 1.4)
{ {
std::string fpath = root + "/Modules/CMakeBackwardCompatibilityCXX.cmake"; std::string nfpath = root + "/Modules/CMakeBackwardCompatibilityCXX.cmake";
mf->ReadListFile(0,fpath.c_str()); mf->ReadListFile(0,nfpath.c_str());
} }
} }
} }

12
Source/cmLocalUnixMakefileGenerator.cxx
View File

@ -2578,16 +2578,16 @@ cmLocalUnixMakefileGenerator::CreateMakeVariable(const char* s, const char* s2)
str1 = str1.substr(0, size - str2.size()); str1 = str1.substr(0, size - str2.size());
} }
char buffer[5]; char buffer[5];
int i = 0; int ni = 0;
sprintf(buffer, "%04d", i); sprintf(buffer, "%04d", ni);
ret = str1 + str2 + buffer; ret = str1 + str2 + buffer;
while(m_ShortMakeVariableMap.count(ret) && i < 1000) while(m_ShortMakeVariableMap.count(ret) && ni < 1000)
{ {
++i; ++ni;
sprintf(buffer, "%04d", i); sprintf(buffer, "%04d", ni);
ret = str1 + str2 + buffer; ret = str1 + str2 + buffer;
} }
if(i == 1000) if(ni == 1000)
{ {
cmSystemTools::Error("Borland makefile varible length too long"); cmSystemTools::Error("Borland makefile varible length too long");
return unmodified; return unmodified;