Make getDirnameSep a static method (not part of Path's interface).
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@49354 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/System/Path.cpp b/lib/System/Path.cpp
index 43c36d5..e8fd5f2 100644
--- a/lib/System/Path.cpp
+++ b/lib/System/Path.cpp
@@ -196,7 +196,7 @@
Paths.push_back(tmpPath);
}
-std::string Path::getDirnameCharSep(char Sep) const {
+static std::string getDirnameCharSep(const std::string& path, char Sep) {
if (path.empty())
return ".";
diff --git a/lib/System/Unix/Path.inc b/lib/System/Unix/Path.inc
index fe2e3c6..aca4b93 100644
--- a/lib/System/Unix/Path.inc
+++ b/lib/System/Unix/Path.inc
@@ -277,7 +277,9 @@
}
-std::string Path::getDirname() const { return getDirnameCharSep('/'); }
+std::string Path::getDirname() const {
+ return getDirnameCharSep(path, '/');
+}
std::string
Path::getBasename() const {
diff --git a/lib/System/Win32/Path.inc b/lib/System/Win32/Path.inc
index 35bae33..357cb2f 100644
--- a/lib/System/Win32/Path.inc
+++ b/lib/System/Win32/Path.inc
@@ -229,7 +229,9 @@
return len > 0 && path[len-1] == '/';
}
-std::string Path::getDirname() const { return getDirnameCharSep('\\'); }
+std::string Path::getDirname() const {
+ return getDirnameCharSep(path, '\\');
+}
std::string
Path::getBasename() const {