From 9440d5776bf48778d452e2d3a48d4e93d7b6f7a7 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sat, 27 Aug 2016 13:44:51 +0200 Subject: Convert: Remove unused overload --- Source/cmOutputConverter.cxx | 21 --------------------- Source/cmOutputConverter.h | 2 -- 2 files changed, 23 deletions(-) diff --git a/Source/cmOutputConverter.cxx b/Source/cmOutputConverter.cxx index 411184c..47c2928 100644 --- a/Source/cmOutputConverter.cxx +++ b/Source/cmOutputConverter.cxx @@ -146,27 +146,6 @@ std::string cmOutputConverter::ConvertDirectorySeparatorsForShell( return result; } -std::string cmOutputConverter::Convert(RelativeRoot remote, - const std::string& local, - OutputFormat output) const -{ - // 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 != CM_NULLPTR); - - if (local.empty()) { - return this->ConvertToOutputFormat(remotePath, output); - } - - std::vector components; - cmSystemTools::SplitPath(local, components); - std::string result = this->ConvertToRelativePath(components, remotePath); - return this->ConvertToOutputFormat(result, output); -} - static bool cmOutputConverterNotAbove(const char* a, const char* b) { return (cmSystemTools::ComparePath(a, b) || diff --git a/Source/cmOutputConverter.h b/Source/cmOutputConverter.h index 23f2e62..d3ded25 100644 --- a/Source/cmOutputConverter.h +++ b/Source/cmOutputConverter.h @@ -57,8 +57,6 @@ public: OutputFormat output) const; 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) const; std::string ConvertDirectorySeparatorsForShell( const std::string& source) const; -- cgit v0.12