[Cmake-commits] CMake branch, next, updated. v3.0.0-4092-g3ecd134

[Brad King]

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  3ecd1347b54bbfa2745880de9631f86ae4b90305 (commit)
       via  a74dd22288761fc0056c6400ed45a50bbd6f8a81 (commit)
      from  b72314722defab702e034288f06941157206a668 (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=3ecd1347b54bbfa2745880de9631f86ae4b90305
commit 3ecd1347b54bbfa2745880de9631f86ae4b90305
Merge: b723147 a74dd22
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 3 10:15:18 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 3 10:15:18 2014 -0400

    Merge topic 'refactor-usage-requirement-evaluation' into next
    
    a74dd222 cmTarget: Workaround old compiler bugs in vector<>::insert


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a74dd22288761fc0056c6400ed45a50bbd6f8a81
commit a74dd22288761fc0056c6400ed45a50bbd6f8a81
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 3 09:18:16 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 3 09:28:40 2014 -0400

    cmTarget: Workaround old compiler bugs in vector<>::insert
    
    Sun CC 5.9 and VS 6 have trouble inserting at the end of a vector when a
    type conversion is required.  Use std::copy with std::back_inserter
    instead.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 94da3c2..0a7724c 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -6193,9 +6193,8 @@ const char* cmTarget::ComputeLinkInterfaceLibraries(const std::string& config,
     // The link implementation is the default link interface.
     LinkImplementation const* impl =
         this->GetLinkImplementationLibrariesInternal(config, headTarget);
-    iface.Libraries.insert(iface.Libraries.end(),
-                           impl->Libraries.begin(),
-                           impl->Libraries.end());
+    std::copy(impl->Libraries.begin(), impl->Libraries.end(),
+              std::back_inserter(iface.Libraries));
     if(this->PolicyStatusCMP0022 == cmPolicies::WARN &&
        !this->Internal->PolicyWarnedCMP0022 && !usage_requirements_only)
       {

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

Summary of changes:
 Source/cmTarget.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake