diff options
author | 2017-02-01 16:32:08 +0000 | |
---|---|---|
committer | 2017-02-01 16:36:58 +0000 | |
commit | 8bebcec47848b5129e0ce41fd4c3ee8a79ba7600 (patch) | |
tree | efa477e5fd57ebf68b56981258aca2ca478b6d8b /src/main/cpp/util/file_windows.cc | |
parent | efe3bf98b0430497ea1926b80e6dbb0b3642eac6 (diff) |
Rollback of commit 855fbe9ee447b7b37fd8c73dbc047d69b7ceffcf.
*** Reason for rollback ***
Causing bazel server restart every time on Windows
See https://github.com/bazelbuild/bazel/issues/2466
*** Original change description ***
Bazel client: platform-specific JoinPath
This allows joining paths on "\" instead of "/"
when building for Windows.
See https://github.com/bazelbuild/bazel/issues/2107
--
PiperOrigin-RevId: 146246700
MOS_MIGRATED_REVID=146246700
Diffstat (limited to 'src/main/cpp/util/file_windows.cc')
-rw-r--r-- | src/main/cpp/util/file_windows.cc | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/src/main/cpp/util/file_windows.cc b/src/main/cpp/util/file_windows.cc index 2577a41aa1..4b7570d188 100644 --- a/src/main/cpp/util/file_windows.cc +++ b/src/main/cpp/util/file_windows.cc @@ -323,44 +323,6 @@ static bool IsRootOrAbsolute(const basic_string<char_type>& path, HasDriveSpecifierPrefix(path.c_str() + 4) && IsPathSeparator(path[6])); } -string JoinPath(const string& path1, const string& path2) { - if (path1.empty()) { - // "" + "/bar" - return path2; - } - if (path2.empty()) { - // "foo/" + "" - return path1; - } - - string p1 = path1; - if (path1.back() == '/') { - p1.pop_back(); - } - string p2 = path2; - if (path2.front() == '/') { - p2[0] = '\\'; - } - - if (IsPathSeparator(p1.back())) { - if (!p2.empty() && IsPathSeparator(p2.front())) { - // foo/ + /bar - return p1 + p2.substr(1); - } else { - // foo/ + bar - return p1 + p2; - } - } else { - if (!p2.empty() && IsPathSeparator(p2.front())) { - // foo + /bar - return p1 + p2; - } else { - // foo + bar - return p1 + "\\" + p2; - } - } -} - pair<string, string> SplitPath(const string& path) { if (path.empty()) { return std::make_pair("", ""); |