[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2514-g9f95328

[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  9f953285c9ed4c26414699966713fa8cd389a849 (commit)
       via  817db64c2c3b27098e0fd45825e29e01d784435a (commit)
      from  20e64f01e4537f70fe3a7c35ad4161acfa42bf4b (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=9f953285c9ed4c26414699966713fa8cd389a849
commit 9f953285c9ed4c26414699966713fa8cd389a849
Merge: 20e64f0 817db64
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Apr 22 16:23:43 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Apr 22 16:23:43 2014 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=817db64c2c3b27098e0fd45825e29e01d784435a
commit 817db64c2c3b27098e0fd45825e29e01d784435a
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 22:21:31 2014 +0200

    fix compile error on AIX/gcc-2.9 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:


hooks/post-receive
-- 
CMake