[Cmake-commits] CMake branch, next, updated. v2.8.4-1544-g5be39b5

Brad King brad.king at kitware.com
Mon May 16 12:53:57 EDT 2011


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  5be39b5f028672e8dc2100451afca10b41c9b0b5 (commit)
       via  a7e7a04aafdcb91e13180f421df550418041d9bf (commit)
      from  a7fe2ed5bc6a4c961cee186970d4e215beef9a3d (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=5be39b5f028672e8dc2100451afca10b41c9b0b5
commit 5be39b5f028672e8dc2100451afca10b41c9b0b5
Merge: a7fe2ed a7e7a04
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 16 12:53:55 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 16 12:53:55 2011 -0400

    Merge topic 'output-compile-lines' into next
    
    a7e7a04 Fix run_compile_commands build on Apple GCC 3.3


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a7e7a04aafdcb91e13180f421df550418041d9bf
commit a7e7a04aafdcb91e13180f421df550418041d9bf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 16 12:05:49 2011 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon May 16 12:05:49 2011 -0400

    Fix run_compile_commands build on Apple GCC 3.3
    
    This compiler does not provide the "at" method of std::map.  Approximate
    it well enough for our needs.

diff --git a/Tests/CMakeLib/run_compile_commands.cxx b/Tests/CMakeLib/run_compile_commands.cxx
index c925167..31049d3 100644
--- a/Tests/CMakeLib/run_compile_commands.cxx
+++ b/Tests/CMakeLib/run_compile_commands.cxx
@@ -2,7 +2,19 @@
 
 class CompileCommandParser {
 public:
-  typedef std::map<std::string, std::string> CommandType;
+  class CommandType: public std::map<cmStdString, cmStdString>
+  {
+  public:
+#if defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ < 4
+    cmStdString const& at(cmStdString const& k) const
+      {
+      const_iterator i = this->find(k);
+      if(i != this->end()) { return i->second; }
+      static cmStdString empty;
+      return empty;
+      }
+#endif
+  };
   typedef std::vector<CommandType> TranslationUnitsType;
 
   CompileCommandParser(std::ifstream *input)

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list