[Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-539-g61f41f3

[Stephen Kelly]

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  61f41f354b513b64040401a201fdeb834b38aa6e (commit)
       via  3764e447b0a3ad2fcb441ea4cd4cb7b7e0ad0091 (commit)
      from  e69434fa257c42e39b96101c37c39e9178369573 (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=61f41f354b513b64040401a201fdeb834b38aa6e
commit 61f41f354b513b64040401a201fdeb834b38aa6e
Merge: e69434f 3764e44
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 20 14:53:24 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 20 14:53:24 2015 -0500

    Merge topic 'use-algorithms' into next
    
    3764e447 Fix order of execution problems and whitespace.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3764e447b0a3ad2fcb441ea4cd4cb7b7e0ad0091
commit 3764e447b0a3ad2fcb441ea4cd4cb7b7e0ad0091
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Feb 15 13:40:56 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 20 20:52:52 2015 +0100

    Fix order of execution problems and whitespace.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index 05cdfeb..eb49041 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -282,10 +282,10 @@ template<typename Range>
 std::string cmWrap(std::string prefix, Range const& r, std::string suffix,
                    std::string sep)
 {
-   if (r.empty())
-     {
-     return std::string();
-     }
+  if (r.empty())
+    {
+    return std::string();
+    }
   return prefix + cmJoin(r, (suffix + sep + prefix).c_str()) + suffix;
 }
 
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 391a965..432cb3a 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1325,7 +1325,7 @@ cmLocalUnixMakefileGenerator3
                       this->Makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
     fout << "\n"
          << "# Per-language clean rules from dependency scanning.\n"
-         << "foreach(lang" << cmJoin(languages, " ") << ")\n"
+         << "foreach(lang " << cmJoin(languages, " ") << ")\n"
          << "  include(" << this->GetTargetDirectory(target)
          << "/cmake_clean_${lang}.cmake OPTIONAL)\n"
          << "endforeach()\n";
diff --git a/Source/cmRST.cxx b/Source/cmRST.cxx
index b7330ce..cb61ed9 100644
--- a/Source/cmRST.cxx
+++ b/Source/cmRST.cxx
@@ -491,7 +491,9 @@ void cmRST::UnindentLines(std::vector<std::string>& lines)
   size_t trailingEmpty = std::distance(rit,
                             cmFindNot(cmReverseRange(lines), std::string()));
 
-  lines.erase(cmRotate(lines.begin(),
-              lines.begin() + leadingEmpty,
-              lines.end() - trailingEmpty), lines.end());
+  std::vector<std::string>::iterator contentEnd
+      = cmRotate(lines.begin(),
+                 lines.begin() + leadingEmpty,
+                 lines.end() - trailingEmpty);
+  lines.erase(contentEnd, lines.end());
 }
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 7673554..ebcd810 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1542,8 +1542,9 @@ void cmTarget::DeleteDependencyForVS6( DependencyMap& depMap,
   if( map_itr != depMap.end() )
     {
     DependencyList& depList = map_itr->second;
-    depList.erase(std::remove(depList.begin(), depList.end(), dep),
-                  depList.end());
+    DependencyList::iterator begin =
+        std::remove(depList.begin(), depList.end(), dep);
+    depList.erase(begin, depList.end());
     }
 }
 

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

Summary of changes:
 Source/cmAlgorithms.h                    |    8 ++++----
 Source/cmLocalUnixMakefileGenerator3.cxx |    2 +-
 Source/cmRST.cxx                         |    8 +++++---
 Source/cmTarget.cxx                      |    5 +++--
 4 files changed, 13 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake