From 7c5be5114c1c1adb26cfe7e8556187bf9bd8bd0a Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 17 May 2011 09:25:44 -0400 Subject: 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. --- Tests/CMakeLib/run_compile_commands.cxx | 4 ++-- 1 file 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 TranslationUnitsType; -- cgit v0.12