diff --git a/Source/cmCacheManager.h b/Source/cmCacheManager.h index 5bc757ab5..d79db9999 100644 --- a/Source/cmCacheManager.h +++ b/Source/cmCacheManager.h @@ -61,10 +61,10 @@ public: CacheEntryType GetType() const { return this->GetEntry().m_Type; } cmCacheManager &m_Container; std::map::iterator m_Position; - CacheIterator(cmCacheManager &foo) : m_Container(foo) { + CacheIterator(cmCacheManager &cm) : m_Container(cm) { this->Begin(); } - CacheIterator(cmCacheManager &foo, const char* key) : m_Container(foo) { + CacheIterator(cmCacheManager &cm, const char* key) : m_Container(cm) { this->Find(key); } private: diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 81c4fa3ae..c82f9df6f 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -1336,8 +1336,9 @@ bool cmSystemTools::RunCommand(const char* command, bool verbose, int timeout) { - int foo; - return cmSystemTools::RunCommand(command, output, foo, dir, verbose, timeout); + int dummy; + return cmSystemTools::RunCommand(command, output, dummy, + dir, verbose, timeout); } #if defined(WIN32) && !defined(__CYGWIN__) @@ -2476,4 +2477,3 @@ void cmSystemTools::SplitProgramFromArgs(const char* path, program = ""; args = ""; } -