diff options
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 4 | ||||
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator.cxx | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 36190d9..3edb0d1 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -196,8 +196,8 @@ void cmGlobalGenerator::EnableLanguage(const char* lang, = mf->GetDefinition("CMAKE_MINIMUM_REQUIRED_VERSION"); if (!versionValue || atof(versionValue) <= 1.4) { - std::string fpath = root + "/Modules/CMakeBackwardCompatibilityCXX.cmake"; - mf->ReadListFile(0,fpath.c_str()); + std::string nfpath = root + "/Modules/CMakeBackwardCompatibilityCXX.cmake"; + mf->ReadListFile(0,nfpath.c_str()); } } } diff --git a/Source/cmLocalUnixMakefileGenerator.cxx b/Source/cmLocalUnixMakefileGenerator.cxx index bab9dfd..55d87eb 100644 --- a/Source/cmLocalUnixMakefileGenerator.cxx +++ b/Source/cmLocalUnixMakefileGenerator.cxx @@ -2578,16 +2578,16 @@ cmLocalUnixMakefileGenerator::CreateMakeVariable(const char* s, const char* s2) str1 = str1.substr(0, size - str2.size()); } char buffer[5]; - int i = 0; - sprintf(buffer, "%04d", i); + int ni = 0; + sprintf(buffer, "%04d", ni); ret = str1 + str2 + buffer; - while(m_ShortMakeVariableMap.count(ret) && i < 1000) + while(m_ShortMakeVariableMap.count(ret) && ni < 1000) { - ++i; - sprintf(buffer, "%04d", i); + ++ni; + sprintf(buffer, "%04d", ni); ret = str1 + str2 + buffer; } - if(i == 1000) + if(ni == 1000) { cmSystemTools::Error("Borland makefile varible length too long"); return unmodified; |