Commit b86007e3 authored by Daniel Pfeifer's avatar Daniel Pfeifer
Browse files

cmOutputConverter: remove 'optional' argument

Remove the 'optional' paramenter from the second overload of the Convert
function.  This parameter is used from one single location.  Inline the
codepath for which the argument is true to the callsite.
parent cde127b0
......@@ -61,11 +61,19 @@ std::string cmOutputConverter::ConvertToOutputForExisting(
std::string cmOutputConverter::ConvertToOutputForExisting(
RelativeRoot remote, const std::string& local, OutputFormat format) const
{
static_cast<void>(local);
// The relative root must have a path (i.e. not FULL or NONE)
assert(remote != FULL);
assert(remote != NONE);
const char* remotePath = this->GetRelativeRootPath(remote);
assert(remotePath != 0);
// Perform standard conversion.
std::string result = this->Convert(remote, local, format, true);
std::string result = this->ConvertToOutputFormat(remotePath, format);
// Consider short-path.
const char* remotePath = this->GetRelativeRootPath(remote);
return this->ConvertToOutputForExistingCommon(remotePath, result, format);
}
......@@ -158,8 +166,7 @@ std::string cmOutputConverter::ConvertDirectorySeparatorsForShell(
std::string cmOutputConverter::Convert(RelativeRoot remote,
const std::string& local,
OutputFormat output,
bool optional) const
OutputFormat output) const
{
// The relative root must have a path (i.e. not FULL or NONE)
assert(remote != FULL);
......@@ -168,7 +175,7 @@ std::string cmOutputConverter::Convert(RelativeRoot remote,
const char* remotePath = this->GetRelativeRootPath(remote);
assert(remotePath != 0);
if (local.empty() || optional) {
if (local.empty()) {
return this->ConvertToOutputFormat(remotePath, output);
}
......
......@@ -58,8 +58,7 @@ public:
std::string Convert(const std::string& remote, RelativeRoot local,
OutputFormat output = UNCHANGED) const;
std::string Convert(RelativeRoot remote, const std::string& local,
OutputFormat output = UNCHANGED,
bool optional = false) const;
OutputFormat output = UNCHANGED) const;
std::string ConvertDirectorySeparatorsForShell(
const std::string& source) const;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment