[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-869-gbd97df9

[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  bd97df988bb1ec213ef964dc4b90d300d5d74fa6 (commit)
       via  5589b7d7d5fb7f6c8d39063767fcbe3b99d1f564 (commit)
      from  ceca5ee4acd180476a12e15fc86608846796c783 (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=bd97df988bb1ec213ef964dc4b90d300d5d74fa6
commit bd97df988bb1ec213ef964dc4b90d300d5d74fa6
Merge: ceca5ee 5589b7d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 25 10:38:47 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 25 10:38:47 2014 -0500

    Merge topic 'revert-experimental-change' into next
    
    5589b7d7 Revert "cmTarget: Use clear and append on std::string."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5589b7d7d5fb7f6c8d39063767fcbe3b99d1f564
commit 5589b7d7d5fb7f6c8d39063767fcbe3b99d1f564
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 25 10:38:09 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 25 10:38:09 2014 -0500

    Revert "cmTarget: Use clear and append on std::string."
    
    This reverts commit f39baea8745ddee088dcfdf392966ccecea8d1d9.
    It will be restored as part of a larger check of old workaround
    removal.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 4f4feaf..d4889fd 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2908,14 +2908,14 @@ bool cmTarget::HandleLocationPropertyPolicy(cmMakefile* context) const
 static void MakePropertyList(std::string& output,
     std::vector<cmTargetInternals::TargetPropertyEntry*> const& values)
 {
-  output.clear();
+  output = "";
   std::string sep;
   for (std::vector<cmTargetInternals::TargetPropertyEntry*>::const_iterator
        it = values.begin(), end = values.end();
        it != end; ++it)
     {
-    output.append(sep);
-    output.append((*it)->ge->GetInput());
+    output += sep;
+    output += (*it)->ge->GetInput();
     sep = ";";
     }
 }

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

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


hooks/post-receive
-- 
CMake