summaryrefslogtreecommitdiffstats
path: root/Source/cmSystemTools.cxx
diff options
context:
space:
mode:
authorVitaly Stakhovsky <vvs31415@gitlab.org>2019-02-20 16:15:00 (GMT)
committerVitaly Stakhovsky <vvs31415@gitlab.org>2019-02-20 16:18:11 (GMT)
commit9dd255548d0a82994da71c3667f3b6668de50ffd (patch)
tree13cba689d3ebea9a5910b7237fb102ac65e49364 /Source/cmSystemTools.cxx
parentb76b83efd37a439e22d1d92af3b98c30e8f9ba97 (diff)
downloadCMake-9dd255548d0a82994da71c3667f3b6668de50ffd.zip
CMake-9dd255548d0a82994da71c3667f3b6668de50ffd.tar.gz
CMake-9dd255548d0a82994da71c3667f3b6668de50ffd.tar.bz2
cmSystemTools::Error: consolidate parameters into single std::string
Diffstat (limited to 'Source/cmSystemTools.cxx')
-rw-r--r--Source/cmSystemTools.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index f0e8077..1ca2360 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1425,12 +1425,12 @@ std::string cmSystemTools::RelativePath(std::string const& local,
std::string const& remote)
{
if (!cmSystemTools::FileIsFullPath(local)) {
- cmSystemTools::Error("RelativePath must be passed a full path to local: ",
- local.c_str());
+ cmSystemTools::Error("RelativePath must be passed a full path to local: " +
+ local);
}
if (!cmSystemTools::FileIsFullPath(remote)) {
- cmSystemTools::Error("RelativePath must be passed a full path to remote: ",
- remote.c_str());
+ cmSystemTools::Error(
+ "RelativePath must be passed a full path to remote: " + remote);
}
return cmsys::SystemTools::RelativePath(local, remote);
}
@@ -1909,8 +1909,8 @@ bool extract_tar(const char* outFileName, bool verbose, bool extract)
else {
cmSystemTools::Error("Problem with archive_write_header(): ",
archive_error_string(ext));
- cmSystemTools::Error("Current file: ",
- cm_archive_entry_pathname(entry).c_str());
+ cmSystemTools::Error("Current file: " +
+ cm_archive_entry_pathname(entry));
break;
}
}