diff options
author | 2017-01-30 08:41:26 +0000 | |
---|---|---|
committer | 2017-01-30 09:03:29 +0000 | |
commit | 855fbe9ee447b7b37fd8c73dbc047d69b7ceffcf (patch) | |
tree | b7e29aaf5d9807fa020455322b7f99d42a9867ec /src/main/cpp/util/file.cc | |
parent | 98cafe88f9b6eee6b56ba0b6cdbe7acc4e0adf04 (diff) |
Bazel client: platform-specific JoinPath
This allows joining paths on "\" instead of "/"
when building for Windows.
See https://github.com/bazelbuild/bazel/issues/2107
--
Change-Id: I417ba40af6530650be2394db4bd445f0883d40e5
Reviewed-on: https://cr.bazel.build/8495
PiperOrigin-RevId: 145961689
MOS_MIGRATED_REVID=145961689
Diffstat (limited to 'src/main/cpp/util/file.cc')
-rw-r--r-- | src/main/cpp/util/file.cc | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/src/main/cpp/util/file.cc b/src/main/cpp/util/file.cc index 392af372af..cae87198a7 100644 --- a/src/main/cpp/util/file.cc +++ b/src/main/cpp/util/file.cc @@ -77,31 +77,6 @@ string Basename(const string &path) { return SplitPath(path).second; } -string JoinPath(const string &path1, const string &path2) { - if (path1.empty()) { - // "" + "/bar" - return path2; - } - - if (path1[path1.size() - 1] == '/') { - if (path2.find('/') == 0) { - // foo/ + /bar - return path1 + path2.substr(1); - } else { - // foo/ + bar - return path1 + path2; - } - } else { - if (path2.find('/') == 0) { - // foo + /bar - return path1 + path2; - } else { - // foo + bar - return path1 + "/" + path2; - } - } -} - class DirectoryTreeWalker : public DirectoryEntryConsumer { public: DirectoryTreeWalker(vector<string> *files, |