[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2512-g20e64f0

[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  20e64f01e4537f70fe3a7c35ad4161acfa42bf4b (commit)
       via  206af99e545b2e67e0c453a479ed0e212281e7f6 (commit)
      from  9a07ac55ded236ed85c46e1a5466dae7c73a6471 (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=20e64f01e4537f70fe3a7c35ad4161acfa42bf4b
commit 20e64f01e4537f70fe3a7c35ad4161acfa42bf4b
Merge: 9a07ac5 206af99
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Apr 22 15:57:26 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Apr 22 15:57:26 2014 -0400

    Merge topic 'aix-streams' into next
    
    206af99e fix compile error on AIX/gcc because of unknown std::stringstream


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=206af99e545b2e67e0c453a479ed0e212281e7f6
commit 206af99e545b2e67e0c453a479ed0e212281e7f6
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Apr 22 21:57:16 2014 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Tue Apr 22 21:57:16 2014 +0200

    fix compile error on AIX/gcc because of unknown std::stringstream

diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx
index 946d9d2..cc42bca 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -454,7 +454,7 @@ cmExtraCodeLiteGenerator::GetBuildCommand(const cmMakefile* mf) const
   else if ( generator == "MinGW Makefiles" ||
             generator == "Unix Makefiles" )
     {
-    std::stringstream ss;
+    cmOStringStream ss;
     ss << make << " -j " << this->CpuCount;
     buildCommand = ss.str();
     }
@@ -482,7 +482,7 @@ cmExtraCodeLiteGenerator::GetSingleFileBuildCommand
   std::string generator = mf->GetSafeDefinition("CMAKE_GENERATOR");
   if ( generator == "Unix Makefiles" || generator == "MinGW Makefiles" )
     {
-    std::stringstream ss;
+    cmOStringStream ss;
     ss << make << " -f$(ProjectPath)/Makefile $(CurrentFileName).cpp.o";
     buildCommand = ss.str();
     }

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

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


hooks/post-receive
-- 
CMake