From b86007e385fc0f4cc45149b68cafebad749bf6e8 Mon Sep 17 00:00:00 2001
From: Daniel Pfeifer <daniel@pfeifer-mail.de>
Date: Mon, 20 Jun 2016 22:31:57 +0200
Subject: 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.
---
 Source/cmOutputConverter.cxx | 17 ++++++++++++-----
 Source/cmOutputConverter.h   |  3 +--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Source/cmOutputConverter.cxx b/Source/cmOutputConverter.cxx
index a45e37b..8f1e3af 100644
--- a/Source/cmOutputConverter.cxx
+++ b/Source/cmOutputConverter.cxx
@@ -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);
   }
 
diff --git a/Source/cmOutputConverter.h b/Source/cmOutputConverter.h
index f138d0e..f661572 100644
--- a/Source/cmOutputConverter.h
+++ b/Source/cmOutputConverter.h
@@ -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;
 
-- 
cgit v0.12