[Cmake-commits] CMake branch, next, updated. v2.8.4-923-gdc04e7e

Brad King brad.king at kitware.com
Thu Feb 17 08:47:49 EST 2011


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  dc04e7e33de0e819f0b199ab0094da275de67b4a (commit)
       via  006124b44618db3ed672c7ea069b174b966429a1 (commit)
      from  7b486c8ddae50668bf2f71feb24ceb6596c27833 (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=dc04e7e33de0e819f0b199ab0094da275de67b4a
commit dc04e7e33de0e819f0b199ab0094da275de67b4a
Merge: 7b486c8 006124b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 17 08:47:48 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 17 08:47:48 2011 -0500

    Merge topic 'add-STRING-subcommand-FIND-issue-11795' into next
    
    006124b Avoid direct use of std::stringstream


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=006124b44618db3ed672c7ea069b174b966429a1
commit 006124b44618db3ed672c7ea069b174b966429a1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 17 08:44:22 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 17 08:44:22 2011 -0500

    Avoid direct use of std::stringstream
    
    In method cmStringCommand::HandleFindCommand added by parent commit use
    the cmOStringStream compatibility wrapper instead of std::stringstream.

diff --git a/Source/cmStringCommand.cxx b/Source/cmStringCommand.cxx
index 1f873e2..19d2369 100644
--- a/Source/cmStringCommand.cxx
+++ b/Source/cmStringCommand.cxx
@@ -553,7 +553,7 @@ bool cmStringCommand::HandleFindCommand(std::vector<std::string> const&
     }
   if(std::string::npos != pos)
     {
-    std::stringstream s;
+    cmOStringStream s;
     s << pos;
     this->Makefile->AddDefinition(outvar.c_str(), s.str().c_str());
     return true;

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

Summary of changes:
 Source/cmStringCommand.cxx |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list