summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Cedilnik <andy.cedilnik@kitware.com>2002-12-08 22:34:17 -0500
committerAndy Cedilnik <andy.cedilnik@kitware.com>2002-12-08 22:34:17 -0500
commit39714fb179c5164ef96b251b82d08e930d6bdc50 (patch)
treea42cca2d5df2698992cfcad6bab9fa36d7cdde81
parent9eed6b91cff9995e48b32285cc25269bd67e1280 (diff)
downloadcmake-39714fb179c5164ef96b251b82d08e930d6bdc50.tar.gz
Rename variable to remove warning
-rw-r--r--Source/cmGlobalGenerator.cxx4
-rw-r--r--Source/cmLocalUnixMakefileGenerator.cxx12
2 files changed, 8 insertions, 8 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 36190d9676..3edb0d1c3d 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 bab9dfdf5f..55d87ebc71 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;