[Cmake-commits] CMake branch, next, updated. v2.8.8-3205-g2d81514

[Peter Kuemmel]

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  2d815148d2aa5d20f261a6cf318e6e88dd6eca62 (commit)
       via  5ead31da6341eb5a410f9f5b7b65cd5dcd8f0eae (commit)
       via  1333b576b56de852d826e886955d09de0f8c0ef6 (commit)
      from  27233915aa7d1e08d150805ffef8458a94a3b9a6 (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=2d815148d2aa5d20f261a6cf318e6e88dd6eca62
commit 2d815148d2aa5d20f261a6cf318e6e88dd6eca62
Merge: 2723391 5ead31d
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Sun Jun 17 04:19:09 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jun 17 04:19:09 2012 -0400

    Merge topic 'ninja-cldeps' into next
    
    5ead31d Ninja: try work around for bcc32 bug
    1333b57 Ninja: build server fixes


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ead31da6341eb5a410f9f5b7b65cd5dcd8f0eae
commit 5ead31da6341eb5a410f9f5b7b65cd5dcd8f0eae
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Sun Jun 17 10:14:36 2012 +0200
Commit:     Peter Kuemmel <syntheticpp at gmx.net>
CommitDate: Sun Jun 17 10:17:19 2012 +0200

    Ninja: try work around for bcc32 bug

diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx
index d8bb162..374ee10 100644
--- a/Source/cmcldeps.cxx
+++ b/Source/cmcldeps.cxx
@@ -32,6 +32,10 @@
 #include <signal.h>
 #endif
 
+
+// bcc32 only finds remove(const char*)
+namespace stlport { }
+
 #if defined(_WIN64)
 typedef unsigned __int64 cmULONG_PTR;
 #else
@@ -429,8 +433,10 @@ bool SubprocessSet::DoWork() {
   subproc->OnPipeReady();
 
   if (subproc->Done()) {
+    using namespace std;
+    using namespace stlport;
     std::vector<Subprocess*>::iterator end =
-        std::remove(running_.begin(), running_.end(), subproc);
+        remove(running_.begin(), running_.end(), subproc);
     if (running_.end() != end) {
       finished_.push(subproc);
       running_.resize(end - running_.begin());

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1333b576b56de852d826e886955d09de0f8c0ef6
commit 1333b576b56de852d826e886955d09de0f8c0ef6
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Sun Jun 17 10:08:57 2012 +0200
Commit:     Peter Kuemmel <syntheticpp at gmx.net>
CommitDate: Sun Jun 17 10:09:10 2012 +0200

    Ninja: build server fixes
    
    Why does the other compiler give no error?
    Seems there is somewhere a "using".

diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx
index bf5a17b..d8bb162 100644
--- a/Source/cmcldeps.cxx
+++ b/Source/cmcldeps.cxx
@@ -577,8 +577,8 @@ static void outputDepFile(const std::string& dfile, const std::string& objfile,
     return;
 
   // strip duplicates
-  sort(incs.begin(), incs.end());
-  incs.erase(unique(incs.begin(), incs.end()), incs.end());
+  std::sort(incs.begin(), incs.end());
+  incs.erase(std::unique(incs.begin(), incs.end()), incs.end());
 
   FILE* out = fopen(dfile.c_str(), "wb");
 
@@ -651,7 +651,7 @@ static int process( const std::string& srcfilename,
   std::string line;
   std::vector<std::string> includes;
   bool isFirstLine = true; // cl prints always first the source filename
-  while (getline(ss, line)) {
+  while (std::getline(ss, line)) {
     if (startsWith(line, prefix)) {
       std::string inc = trimLeadingSpace(line.substr(prefix.size()).c_str());
       if (inc[inc.size() - 1] == '\r') // blech, stupid \r\n

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

Summary of changes:
 Source/cmcldeps.cxx |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake