|
@@ -24,8 +24,8 @@ cmGeneratedFileStream::cmGeneratedFileStream(Encoding encoding)
|
|
|
#endif
|
|
#endif
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-cmGeneratedFileStream::cmGeneratedFileStream(const char* name, bool quiet,
|
|
|
|
|
- Encoding encoding)
|
|
|
|
|
|
|
+cmGeneratedFileStream::cmGeneratedFileStream(std::string const& name,
|
|
|
|
|
+ bool quiet, Encoding encoding)
|
|
|
: cmGeneratedFileStreamBase(name)
|
|
: cmGeneratedFileStreamBase(name)
|
|
|
, Stream(TempName.c_str())
|
|
, Stream(TempName.c_str())
|
|
|
{
|
|
{
|
|
@@ -54,7 +54,7 @@ cmGeneratedFileStream::~cmGeneratedFileStream()
|
|
|
this->Okay = !this->fail();
|
|
this->Okay = !this->fail();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-cmGeneratedFileStream& cmGeneratedFileStream::Open(const char* name,
|
|
|
|
|
|
|
+cmGeneratedFileStream& cmGeneratedFileStream::Open(std::string const& name,
|
|
|
bool quiet, bool binaryFlag)
|
|
bool quiet, bool binaryFlag)
|
|
|
{
|
|
{
|
|
|
// Store the file name and construct the temporary file name.
|
|
// Store the file name and construct the temporary file name.
|
|
@@ -114,7 +114,7 @@ cmGeneratedFileStreamBase::cmGeneratedFileStreamBase()
|
|
|
{
|
|
{
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-cmGeneratedFileStreamBase::cmGeneratedFileStreamBase(const char* name)
|
|
|
|
|
|
|
+cmGeneratedFileStreamBase::cmGeneratedFileStreamBase(std::string const& name)
|
|
|
: Name()
|
|
: Name()
|
|
|
, TempName()
|
|
, TempName()
|
|
|
, CopyIfDifferent(false)
|
|
, CopyIfDifferent(false)
|
|
@@ -130,7 +130,7 @@ cmGeneratedFileStreamBase::~cmGeneratedFileStreamBase()
|
|
|
this->Close();
|
|
this->Close();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-void cmGeneratedFileStreamBase::Open(const char* name)
|
|
|
|
|
|
|
+void cmGeneratedFileStreamBase::Open(std::string const& name)
|
|
|
{
|
|
{
|
|
|
// Save the original name of the file.
|
|
// Save the original name of the file.
|
|
|
this->Name = name;
|
|
this->Name = name;
|
|
@@ -188,10 +188,10 @@ bool cmGeneratedFileStreamBase::Close()
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
#ifdef CMAKE_BUILD_WITH_CMAKE
|
|
#ifdef CMAKE_BUILD_WITH_CMAKE
|
|
|
-int cmGeneratedFileStreamBase::CompressFile(const char* oldname,
|
|
|
|
|
- const char* newname)
|
|
|
|
|
|
|
+int cmGeneratedFileStreamBase::CompressFile(std::string const& oldname,
|
|
|
|
|
+ std::string const& newname)
|
|
|
{
|
|
{
|
|
|
- gzFile gf = gzopen(newname, "w");
|
|
|
|
|
|
|
+ gzFile gf = gzopen(newname.c_str(), "w");
|
|
|
if (!gf) {
|
|
if (!gf) {
|
|
|
return 0;
|
|
return 0;
|
|
|
}
|
|
}
|
|
@@ -214,16 +214,17 @@ int cmGeneratedFileStreamBase::CompressFile(const char* oldname,
|
|
|
return 1;
|
|
return 1;
|
|
|
}
|
|
}
|
|
|
#else
|
|
#else
|
|
|
-int cmGeneratedFileStreamBase::CompressFile(const char*, const char*)
|
|
|
|
|
|
|
+int cmGeneratedFileStreamBase::CompressFile(std::string const&,
|
|
|
|
|
+ std::string const&)
|
|
|
{
|
|
{
|
|
|
return 0;
|
|
return 0;
|
|
|
}
|
|
}
|
|
|
#endif
|
|
#endif
|
|
|
|
|
|
|
|
-int cmGeneratedFileStreamBase::RenameFile(const char* oldname,
|
|
|
|
|
- const char* newname)
|
|
|
|
|
|
|
+int cmGeneratedFileStreamBase::RenameFile(std::string const& oldname,
|
|
|
|
|
+ std::string const& newname)
|
|
|
{
|
|
{
|
|
|
- return cmSystemTools::RenameFile(oldname, newname);
|
|
|
|
|
|
|
+ return cmSystemTools::RenameFile(oldname.c_str(), newname.c_str());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
void cmGeneratedFileStream::SetName(const std::string& fname)
|
|
void cmGeneratedFileStream::SetName(const std::string& fname)
|