[Cmake-commits] CMake branch, next, updated. v2.8.5-1649-g97cb8c9

[Alexander Neundorf]

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  97cb8c957b200d7e8fecfacd4d46fdf940b4a772 (commit)
       via  1879bcc09cb180efec041ccd5b1e42c47b790084 (commit)
      from  ec403565df94e2bd2773c9604d23c3b90f3f1cb8 (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=97cb8c957b200d7e8fecfacd4d46fdf940b4a772
commit 97cb8c957b200d7e8fecfacd4d46fdf940b4a772
Merge: ec40356 1879bcc
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Thu Aug 18 12:49:25 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 18 12:49:25 2011 -0400

    Merge topic 'AutomocForQt' into next
    
    1879bcc Fix build: use std::ios::out|ios::trunc instead of std::ios_base::out


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1879bcc09cb180efec041ccd5b1e42c47b790084
commit 1879bcc09cb180efec041ccd5b1e42c47b790084
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Thu Aug 18 18:53:14 2011 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Thu Aug 18 18:53:14 2011 +0200

    Fix build: use std::ios::out|ios::trunc instead of std::ios_base::out
    
    Alex

diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx
index df09f37..7dd450e 100644
--- a/Source/cmQtAutomoc.cxx
+++ b/Source/cmQtAutomoc.cxx
@@ -245,7 +245,7 @@ void cmQtAutomoc::WriteOldMocDefinitionsFile(const char* targetDirectory)
 
   std::fstream outfile;
   outfile.open(filename.c_str(),
-               std::ios_base::out | std::ios_base::trunc);
+               std::ios::out | std::ios::trunc);
   outfile << "set(AM_OLD_MOC_DEFINITIONS \""
               << this->Join(this->MocDefinitions, ' ') << "\")\n";
 
@@ -477,7 +477,7 @@ bool cmQtAutomoc::RunAutomocQt4()
   // source file that includes all remaining moc files (_automoc.cpp file)
   std::fstream outfile;
   outfile.open(this->OutMocCppFilename.c_str(),
-               std::ios_base::out | std::ios_base::trunc);
+               std::ios::out | std::ios::trunc);
   outfile << automocSource;
   outfile.close();
 

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

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


hooks/post-receive
-- 
CMake