diff options
author | Brad King <brad.king@kitware.com> | 2014-04-02 18:44:35 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2014-04-02 18:44:35 (GMT) |
commit | 8018fcca6e055a0f12a17fc8324128080a9ec568 (patch) | |
tree | accecb14f80dece735e2822b76ad0c88825149b6 /Source/CPack/cmCPackLog.cxx | |
parent | a41c0a9dcbc201b183bcc0a0c0f6bf9f2cebd079 (diff) | |
parent | 5ada4be81bdb7695b2a4741db76ec66473ccd961 (diff) | |
download | CMake-8018fcca6e055a0f12a17fc8324128080a9ec568.zip CMake-8018fcca6e055a0f12a17fc8324128080a9ec568.tar.gz CMake-8018fcca6e055a0f12a17fc8324128080a9ec568.tar.bz2 |
Merge branch 'master' into revise-compiler-id-policies
Diffstat (limited to 'Source/CPack/cmCPackLog.cxx')
-rw-r--r-- | Source/CPack/cmCPackLog.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/CPack/cmCPackLog.cxx b/Source/CPack/cmCPackLog.cxx index 4e8bf0f..7befca0 100644 --- a/Source/CPack/cmCPackLog.cxx +++ b/Source/CPack/cmCPackLog.cxx @@ -169,27 +169,27 @@ void cmCPackLog::Log(int tag, const char* file, int line, { if ( error && !this->ErrorPrefix.empty() ) { - *this->DefaultError << this->ErrorPrefix.c_str(); + *this->DefaultError << this->ErrorPrefix; } else if ( warning && !this->WarningPrefix.empty() ) { - *this->DefaultError << this->WarningPrefix.c_str(); + *this->DefaultError << this->WarningPrefix; } else if ( output && !this->OutputPrefix.empty() ) { - *this->DefaultOutput << this->OutputPrefix.c_str(); + *this->DefaultOutput << this->OutputPrefix; } else if ( verbose && !this->VerbosePrefix.empty() ) { - *this->DefaultOutput << this->VerbosePrefix.c_str(); + *this->DefaultOutput << this->VerbosePrefix; } else if ( debug && !this->DebugPrefix.empty() ) { - *this->DefaultOutput << this->DebugPrefix.c_str(); + *this->DefaultOutput << this->DebugPrefix; } else if ( !this->Prefix.empty() ) { - *this->DefaultOutput << this->Prefix.c_str(); + *this->DefaultOutput << this->Prefix; } if ( useFileAndLine ) { |