diff options
author | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2019-02-20 16:15:00 (GMT) |
---|---|---|
committer | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2019-02-20 16:18:11 (GMT) |
commit | 9dd255548d0a82994da71c3667f3b6668de50ffd (patch) | |
tree | 13cba689d3ebea9a5910b7237fb102ac65e49364 /Source/cmUseMangledMesaCommand.cxx | |
parent | b76b83efd37a439e22d1d92af3b98c30e8f9ba97 (diff) | |
download | CMake-9dd255548d0a82994da71c3667f3b6668de50ffd.zip CMake-9dd255548d0a82994da71c3667f3b6668de50ffd.tar.gz CMake-9dd255548d0a82994da71c3667f3b6668de50ffd.tar.bz2 |
cmSystemTools::Error: consolidate parameters into single std::string
Diffstat (limited to 'Source/cmUseMangledMesaCommand.cxx')
-rw-r--r-- | Source/cmUseMangledMesaCommand.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmUseMangledMesaCommand.cxx b/Source/cmUseMangledMesaCommand.cxx index 9648b21..e4a1b5f 100644 --- a/Source/cmUseMangledMesaCommand.cxx +++ b/Source/cmUseMangledMesaCommand.cxx @@ -19,7 +19,7 @@ bool cmUseMangledMesaCommand::InitialPass(std::vector<std::string> const& args, this->SetError("called with incorrect number of arguments"); return false; } - const char* inputDir = args[0].c_str(); + const std::string& inputDir = args[0]; std::string glh = inputDir; glh += "/"; glh += "gl.h"; @@ -34,7 +34,7 @@ bool cmUseMangledMesaCommand::InitialPass(std::vector<std::string> const& args, std::vector<std::string> files; cmSystemTools::Glob(inputDir, "\\.h$", files); if (files.empty()) { - cmSystemTools::Error("Could not open Mesa Directory ", inputDir); + cmSystemTools::Error("Could not open Mesa Directory " + inputDir); return false; } cmSystemTools::MakeDirectory(destDir); @@ -60,8 +60,8 @@ void cmUseMangledMesaCommand::CopyAndFullPathMesaHeader(const char* source, tempOutputFile += ".tmp"; cmsys::ofstream fout(tempOutputFile.c_str()); if (!fout) { - cmSystemTools::Error("Could not open file for write in copy operation: ", - tempOutputFile.c_str(), outdir); + cmSystemTools::Error("Could not open file for write in copy operation: " + + tempOutputFile + outdir); cmSystemTools::ReportLastSystemError(""); return; } |