[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6603-g230e011

[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  230e0114d38f2c31771ed086ae00aa2e33a4bce9 (commit)
       via  b9662dba0e38a2d42f7ef27d521308bf631e5400 (commit)
      from  5f8900cb38086687051edbd9904dbe21819b5e9a (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=230e0114d38f2c31771ed086ae00aa2e33a4bce9
commit 230e0114d38f2c31771ed086ae00aa2e33a4bce9
Merge: 5f8900c b9662db
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 2 03:14:00 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 2 03:14:00 2014 -0500

    Merge topic 'minor-cleanups' into next
    
    b9662db Replace algorithm with loop.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b9662dba0e38a2d42f7ef27d521308bf631e5400
commit b9662dba0e38a2d42f7ef27d521308bf631e5400
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 2 09:12:58 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Jan 2 09:12:58 2014 +0100

    Replace algorithm with loop.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index a7821a3..22913fa 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -180,7 +180,11 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const char *dir,
       unique.insert(*li);
       }
     result.clear();
-    result.insert(result.end(), unique.begin(), unique.end());
+    for(std::set<cmStdString>::iterator li = unique.begin();
+        li != unique.end(); ++li)
+      {
+      result.push_back(*li);
+      }
 
     IncludeCacheType::value_type entry(config_upper, result);
     iter = this->SystemIncludesCache.insert(entry).first;

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

Summary of changes:
 Source/cmGeneratorTarget.cxx |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake