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 97a3df3be710654a7f23d394eaa66c3edcda053f (commit)
via 42e39bb37d874e2bd71f982c213a5f1de5a7bf3d (commit)
from f1bc40b9c387d18dacebfa82ba7dcb3855aeb1d1 (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=97a3df3be710654a7f23d394eaa66c3edcda053f
commit 97a3df3be710654a7f23d394eaa66c3edcda053f
Merge: f1bc40b 42e39bb
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Sat Oct 4 16:30:52 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sat Oct 4 16:30:52 2014 -0400
Merge topic 'encoding-fstream' into next
42e39bb3 Fix a few more places to use cmsys::[io]fstream instead of
std::fstream.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=42e39bb37d874e2bd71f982c213a5f1de5a7bf3d
commit 42e39bb37d874e2bd71f982c213a5f1de5a7bf3d
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Sat Oct 4 14:19:13 2014 -0600
Commit: Clinton Stimpson <clin...@elemtech.com>
CommitDate: Sat Oct 4 14:20:04 2014 -0600
Fix a few more places to use cmsys::[io]fstream instead of std::fstream.
diff --git a/Source/CTest/cmCTestBatchTestHandler.cxx
b/Source/CTest/cmCTestBatchTestHandler.cxx
index 934481b..7f966aa 100644
--- a/Source/CTest/cmCTestBatchTestHandler.cxx
+++ b/Source/CTest/cmCTestBatchTestHandler.cxx
@@ -33,8 +33,8 @@ void cmCTestBatchTestHandler::WriteBatchScript()
{
this->Script = this->CTest->GetBinaryDir()
+ "/Testing/CTestBatch.txt";
- std::fstream fout;
- fout.open(this->Script.c_str(), std::ios::out);
+ cmsys::ofstream fout;
+ fout.open(this->Script.c_str());
fout << "#!/bin/sh\n";
for(TestMap::iterator i = this->Tests.begin(); i != this->Tests.end(); ++i)
@@ -48,7 +48,7 @@ void cmCTestBatchTestHandler::WriteBatchScript()
}
//---------------------------------------------------------
-void cmCTestBatchTestHandler::WriteSrunArgs(int test, std::fstream& fout)
+void cmCTestBatchTestHandler::WriteSrunArgs(int test, cmsys::ofstream& fout)
{
cmCTestTestHandler::cmCTestTestProperties* properties =
this->Properties[test];
@@ -79,7 +79,7 @@ void cmCTestBatchTestHandler::WriteSrunArgs(int test,
std::fstream& fout)
}
//---------------------------------------------------------
-void cmCTestBatchTestHandler::WriteTestCommand(int test, std::fstream& fout)
+void cmCTestBatchTestHandler::WriteTestCommand(int test, cmsys::ofstream& fout)
{
std::vector<std::string> args = this->Properties[test]->Args;
std::vector<std::string> processArgs;
diff --git a/Source/CTest/cmCTestBatchTestHandler.h
b/Source/CTest/cmCTestBatchTestHandler.h
index ab0d081..e0c6e48 100644
--- a/Source/CTest/cmCTestBatchTestHandler.h
+++ b/Source/CTest/cmCTestBatchTestHandler.h
@@ -17,6 +17,7 @@
#include <cmCTestTestHandler.h>
#include <cmCTestMultiProcessHandler.h>
#include <cmCTestRunTest.h>
+#include <cmsys/FStream.hxx>
/** \class cmCTestBatchTestHandler
* \brief run parallel ctest
@@ -30,8 +31,8 @@ public:
virtual void RunTests();
protected:
void WriteBatchScript();
- void WriteSrunArgs(int test, std::fstream& fout);
- void WriteTestCommand(int test, std::fstream& fout);
+ void WriteSrunArgs(int test, cmsys::ofstream& fout);
+ void WriteTestCommand(int test, cmsys::ofstream& fout);
void SubmitBatchScript();
diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx
b/Source/CTest/cmCTestMultiProcessHandler.cxx
index b9e6721..7ba434c 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.cxx
+++ b/Source/CTest/cmCTestMultiProcessHandler.cxx
@@ -319,8 +319,8 @@ void cmCTestMultiProcessHandler::UpdateCostData()
{
std::string fname = this->CTest->GetCostDataFile();
std::string tmpout = fname + ".tmp";
- std::fstream fout;
- fout.open(tmpout.c_str(), std::ios::out);
+ cmsys::ofstream fout;
+ fout.open(tmpout.c_str());
PropertiesMap temp = this->Properties;
@@ -610,8 +610,8 @@ void cmCTestMultiProcessHandler::WriteCheckpoint(int index)
{
std::string fname = this->CTest->GetBinaryDir()
+ "/Testing/Temporary/CTestCheckpoint.txt";
- std::fstream fout;
- fout.open(fname.c_str(), std::ios::app | std::ios::out);
+ cmsys::ofstream fout;
+ fout.open(fname.c_str(), std::ios::app);
fout << index << "\n";
fout.close();
}
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index cb070cc..93ebde6 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -1180,9 +1180,9 @@ cmQtAutoGenerators::WriteOldMocDefinitionsFile(
cmSystemTools::ConvertToUnixSlashes(filename);
filename += "/AutomocOldMocDefinitions.cmake";
- std::fstream outfile;
+ cmsys::ofstream outfile;
outfile.open(filename.c_str(),
- std::ios::out | std::ios::trunc);
+ std::ios::trunc);
outfile << "set(AM_OLD_COMPILE_SETTINGS "
<< cmLocalGenerator::EscapeForCMake(
this->CurrentCompileSettingsStr) << ")\n";
@@ -1451,9 +1451,9 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
}
// source file that includes all remaining moc files (_automoc.cpp file)
- std::fstream outfile;
+ cmsys::ofstream outfile;
outfile.open(this->OutMocCppFilename.c_str(),
- std::ios::out | std::ios::trunc);
+ std::ios::trunc);
outfile << automocSource;
outfile.close();
-----------------------------------------------------------------------
Summary of changes:
Source/CTest/cmCTestBatchTestHandler.cxx | 8 ++++----
Source/CTest/cmCTestBatchTestHandler.h | 5 +++--
Source/CTest/cmCTestMultiProcessHandler.cxx | 8 ++++----
Source/cmQtAutoGenerators.cxx | 8 ++++----
4 files changed, 15 insertions(+), 14 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
