[Cmake-commits] CMake branch, next, updated. v3.1.0-1350-g927204b

[Rolf Eike Beer]

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  927204b4dad683d7587efb0a855762aa17b3a833 (commit)
       via  82fbf490b56e0b070cbcfaf1568c496340cd6e8a (commit)
      from  c70add604d4dce7692c25bfb29c83b0bdc363877 (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=927204b4dad683d7587efb0a855762aa17b3a833
commit 927204b4dad683d7587efb0a855762aa17b3a833
Merge: c70add6 82fbf49
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Dec 22 15:53:41 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 22 15:53:41 2014 -0500

    Merge topic 'base64-constref' into next
    
    82fbf490 cmCTestTestHandler: take reference to temporary string instead of doing a copy


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82fbf490b56e0b070cbcfaf1568c496340cd6e8a
commit 82fbf490b56e0b070cbcfaf1568c496340cd6e8a
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Dec 22 21:38:59 2014 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Dec 22 21:38:59 2014 +0100

    cmCTestTestHandler: take reference to temporary string instead of doing a copy
    
    This will increase the lifetime of the temporary until the end of the function.

diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index f330e58..a058501 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -1317,7 +1317,7 @@ void cmCTestTestHandler::AttachFiles(std::ostream& os,
       result->Properties->AttachedFiles.begin();
       file != result->Properties->AttachedFiles.end(); ++file)
     {
-    std::string base64 = this->CTest->Base64GzipEncodeFile(*file);
+    const std::string &base64 = this->CTest->Base64GzipEncodeFile(*file);
     std::string fname = cmSystemTools::GetFilenameName(*file);
     os << "\t\t<NamedMeasurement name=\"Attached File\" encoding=\"base64\" "
       "compression=\"tar/gzip\" filename=\"" << fname << "\" type=\"file\">"

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

Summary of changes:
 Source/CTest/cmCTestTestHandler.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake