summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2011-05-17 13:25:44 (GMT)
committerBrad King <brad.king@kitware.com>2011-05-17 13:25:44 (GMT)
commit7c5be5114c1c1adb26cfe7e8556187bf9bd8bd0a (patch)
tree2e868bd7174c49f114fbfd5302e373edf4efd7da
parent169bb05f90258447a0b93379364374eb03e45bf7 (diff)
downloadCMake-7c5be5114c1c1adb26cfe7e8556187bf9bd8bd0a.zip
CMake-7c5be5114c1c1adb26cfe7e8556187bf9bd8bd0a.tar.gz
CMake-7c5be5114c1c1adb26cfe7e8556187bf9bd8bd0a.tar.bz2
run_compile_commands: Avoid shadow in std::map<>::at workaround
The map has a member called "empty" so use a different name for the local variable in our approximate at() method.
-rw-r--r--Tests/CMakeLib/run_compile_commands.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/Tests/CMakeLib/run_compile_commands.cxx b/Tests/CMakeLib/run_compile_commands.cxx
index d7422a8..cfb7ece 100644
--- a/Tests/CMakeLib/run_compile_commands.cxx
+++ b/Tests/CMakeLib/run_compile_commands.cxx
@@ -9,8 +9,8 @@ public:
{
const_iterator i = this->find(k);
if(i != this->end()) { return i->second; }
- static cmStdString empty;
- return empty;
+ static cmStdString emptyString;
+ return emptyString;
}
};
typedef std::vector<CommandType> TranslationUnitsType;