[Cmake-commits] CMake branch, next, updated. v2.8.8-3166-gcf4d487

[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  cf4d487347b1a90963047b8a93ef50251721f87b (commit)
       via  f1aa026fb9bc5219a59a4c3a273023da51e50dbd (commit)
      from  e70cfcd6cea8efe2c663af9365a8689a132d3fdd (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=cf4d487347b1a90963047b8a93ef50251721f87b
commit cf4d487347b1a90963047b8a93ef50251721f87b
Merge: e70cfcd f1aa026
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Thu Jun 14 12:09:58 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 14 12:09:58 2012 -0400

    Merge topic 'ninja-cldeps' into next
    
    f1aa026 Ninja: build with old vc versions


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f1aa026fb9bc5219a59a4c3a273023da51e50dbd
commit f1aa026fb9bc5219a59a4c3a273023da51e50dbd
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Thu Jun 14 18:02:20 2012 +0200
Commit:     Peter Kuemmel <syntheticpp at gmx.net>
CommitDate: Thu Jun 14 18:02:43 2012 +0200

    Ninja: build with old vc versions

diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 2c00e06..0c7da89 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -833,7 +833,7 @@ void cmGlobalNinjaGenerator::AddTargetAlias(const std::string& alias,
   // Insert the alias into the map.  If the alias was already present in the
   // map and referred to another target, mark it as ambiguous.
   std::pair<TargetAliasMap::iterator, bool> newAlias =
-    TargetAliases.insert(make_pair(alias, target));
+    TargetAliases.insert(std::make_pair(alias, target));
   if (newAlias.second && newAlias.first->second != target)
     newAlias.first->second = 0;
 }

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

Summary of changes:
 Source/cmGlobalNinjaGenerator.cxx |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake