kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

COMP: Fix new cmGeneratedFileStream for MSVC.

Browse Source
This commit is contained in:
Brad King 2004-11-03 07:27:44 -05:00
parent d46d8df0ed
commit e34207c1f0
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmGeneratedFileStream.cxx
View File

@ -31,7 +31,7 @@ cmGeneratedFileStream::cmGeneratedFileStream(const char* name,
bool copy_if_different, bool copy_if_different,
bool quiet): bool quiet):
cmGeneratedFileStreamBase(name, copy_if_different), cmGeneratedFileStreamBase(name, copy_if_different),
std::ofstream(m_TempName.c_str()) Stream(m_TempName.c_str())
{ {
// Check if the file opened. // Check if the file opened.
if(!*this && !quiet) if(!*this && !quiet)
@ -49,7 +49,7 @@ cmGeneratedFileStream::~cmGeneratedFileStream()
// stream will be destroyed which will close the temporary file. // stream will be destroyed which will close the temporary file.
// Finally the base destructor will be called to replace the // Finally the base destructor will be called to replace the
// destination file. // destination file.
m_Okay = *this; m_Okay = (*this)?true:false;
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------

2
Source/cmGeneratedFileStream.h
View File

@ -61,6 +61,8 @@ class cmGeneratedFileStream: private cmGeneratedFileStreamBase,
public std::ofstream public std::ofstream
{ {
public: public:
typedef std::ofstream Stream;
/** /**
* The constructor takes the name of the file to be generated. It * The constructor takes the name of the file to be generated. It
* automatically generates a name for the temporary file. The * automatically generates a name for the temporary file. The

7
Source/cmGlobalVisualStudio7Generator.cxx
View File

@ -289,15 +289,12 @@ void cmGlobalVisualStudio7Generator::OutputSLNFile(cmLocalGenerator* root,
fname += "/"; fname += "/";
fname += root->GetMakefile()->GetProjectName(); fname += root->GetMakefile()->GetProjectName();
fname += ".sln"; fname += ".sln";
cmGeneratedFileStream fout(fname.c_str()); cmGeneratedFileStream fout(fname.c_str(), true);
if(!fout) if(!fout)
{ {
cmSystemTools::Error("Error can not open DSW file for write: ",
fname.c_str());
cmSystemTools::ReportLastSystemError("");
return; return;
} }
this->WriteSLNFile(fout.GetStream(), root, generators); this->WriteSLNFile(fout, root, generators);
} }
// output the SLN file // output the SLN file