[Cmake-commits] CMake branch, next, updated. v2.8.4-1555-g2c0ba4f

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  2c0ba4f3ca83554bd5bad403a2ecb02bafecfc43 (commit)
       via  7c5be5114c1c1adb26cfe7e8556187bf9bd8bd0a (commit)
      from  a6b573ab744f37cb4ba89c0aaac45312db7831e6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2c0ba4f3ca83554bd5bad403a2ecb02bafecfc43
commit 2c0ba4f3ca83554bd5bad403a2ecb02bafecfc43
Merge: a6b573a 7c5be51
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 17 09:27:18 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 17 09:27:18 2011 -0400

    Merge topic 'output-compile-lines' into next
    
    7c5be51 run_compile_commands: Avoid shadow in std::map<>::at workaround


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7c5be5114c1c1adb26cfe7e8556187bf9bd8bd0a
commit 7c5be5114c1c1adb26cfe7e8556187bf9bd8bd0a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 17 09:25:44 2011 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue May 17 09:25:44 2011 -0400

    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.

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;

-----------------------------------------------------------------------

Summary of changes:
 Tests/CMakeLib/run_compile_commands.cxx |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake