summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Boeckel <ben.boeckel@kitware.com>2014-02-07 20:37:02 (GMT)
committerBrad King <brad.king@kitware.com>2014-03-08 18:05:33 (GMT)
commitd76a6e08d06ef0fa6d52f67e88b0cfe4d96f24d1 (patch)
tree3327133f8e58322de32564710879a25ceafa4d9a
parent38c7544578f4154dfaaa0a55b118b79b11ec6ae1 (diff)
downloadCMake-d76a6e08d06ef0fa6d52f67e88b0cfe4d96f24d1.zip
CMake-d76a6e08d06ef0fa6d52f67e88b0cfe4d96f24d1.tar.gz
CMake-d76a6e08d06ef0fa6d52f67e88b0cfe4d96f24d1.tar.bz2
stringapi: Use strings for generated file stream names
-rw-r--r--Source/cmGeneratedFileStream.cxx7
-rw-r--r--Source/cmGeneratedFileStream.h2
2 files changed, 2 insertions, 7 deletions
diff --git a/Source/cmGeneratedFileStream.cxx b/Source/cmGeneratedFileStream.cxx
index 34efc15..78ad4b2 100644
--- a/Source/cmGeneratedFileStream.cxx
+++ b/Source/cmGeneratedFileStream.cxx
@@ -249,12 +249,7 @@ int cmGeneratedFileStreamBase::RenameFile(const char* oldname,
}
//----------------------------------------------------------------------------
-void cmGeneratedFileStream::SetName(const char* fname)
+void cmGeneratedFileStream::SetName(const std::string& fname)
{
- if ( !fname )
- {
- this->Name = "";
- return;
- }
this->Name = fname;
}
diff --git a/Source/cmGeneratedFileStream.h b/Source/cmGeneratedFileStream.h
index 99f3b47..7adee7b 100644
--- a/Source/cmGeneratedFileStream.h
+++ b/Source/cmGeneratedFileStream.h
@@ -140,7 +140,7 @@ public:
* Set name of the file that will hold the actual output. This method allows
* the output file to be changed during the use of cmGeneratedFileStream.
*/
- void SetName(const char* fname);
+ void SetName(const std::string& fname);
private:
cmGeneratedFileStream(cmGeneratedFileStream const&); // not implemented