diff options
-rw-r--r-- | src/main/cpp/blaze.cc | 2 | ||||
-rw-r--r-- | src/main/cpp/blaze_util_platform.h | 4 | ||||
-rw-r--r-- | src/main/cpp/blaze_util_posix.cc | 2 | ||||
-rw-r--r-- | src/main/cpp/blaze_util_windows.cc | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/main/cpp/blaze.cc b/src/main/cpp/blaze.cc index 1d58055603..af3fedb75c 100644 --- a/src/main/cpp/blaze.cc +++ b/src/main/cpp/blaze.cc @@ -374,7 +374,7 @@ static vector<string> GetArgumentArray() { for (const auto &it : globals->extracted_binaries) { if (IsSharedLibrary(it)) { if (!first) { - java_library_path += blaze::ListSeparator(); + java_library_path += kListSeparator; } first = false; java_library_path += blaze::PathAsJvmFlag( diff --git a/src/main/cpp/blaze_util_platform.h b/src/main/cpp/blaze_util_platform.h index 1ebacf6c26..b553518b36 100644 --- a/src/main/cpp/blaze_util_platform.h +++ b/src/main/cpp/blaze_util_platform.h @@ -135,8 +135,8 @@ std::string ConvertPathList(const std::string& path_list); // See https://github.com/bazelbuild/bazel/issues/2576 std::string PathAsJvmFlag(const std::string& path); -// Return a string used to separate paths in a list. -std::string ListSeparator(); +// A character used to separate paths in a list. +extern const char kListSeparator; // Create a symlink to directory ``target`` at location ``link``. // Returns true on success, false on failure. The target must be absolute. diff --git a/src/main/cpp/blaze_util_posix.cc b/src/main/cpp/blaze_util_posix.cc index 67d52fec6b..30e9353e59 100644 --- a/src/main/cpp/blaze_util_posix.cc +++ b/src/main/cpp/blaze_util_posix.cc @@ -168,7 +168,7 @@ std::string ConvertPathList(const std::string& path_list) { return path_list; } std::string PathAsJvmFlag(const std::string& path) { return path; } -std::string ListSeparator() { return ":"; } +const char kListSeparator = ':'; bool SymlinkDirectories(const string &target, const string &link) { return symlink(target.c_str(), link.c_str()) == 0; diff --git a/src/main/cpp/blaze_util_windows.cc b/src/main/cpp/blaze_util_windows.cc index bf17d15b97..d8311d5297 100644 --- a/src/main/cpp/blaze_util_windows.cc +++ b/src/main/cpp/blaze_util_windows.cc @@ -904,7 +904,7 @@ void ExecuteProgram(const string& exe, const std::vector<string>& args_vector) { exit(exit_code); } -string ListSeparator() { return ";"; } +const char kListSeparator = ';'; string PathAsJvmFlag(const string& path) { string spath; |