commit c3aee5a2f279a96f917ef4674eb047c1c27ee4a8
author Thiago Farina <tfarina@chromium.org> Mon Apr 24 18:02:52 2017 +0200
committer Vladimir Moskva <vladmos@google.com> Tue Apr 25 14:45:35 2017 +0200
tree 99959bcff91cd78a7f451f0e8dde2ca470298ec1
parent 6265878e6a85db66ff38a6019c87e0b4e7127b9d

cpp: turn ListSeparator() function into a constant

It does not need to be a fully allocated std::string every time.
A simple character constant is enough for it.

Change-Id: I98b9d4bb77932ea18646fbc793132e089bc66124
PiperOrigin-RevId: 154054987

src/main/cpp/blaze.cc

diff --git a/src/main/cpp/blaze.cc b/src/main/cpp/blaze.cc
index 1d58055..af3fedb 100644
--- a/src/main/cpp/blaze.cc
+++ b/src/main/cpp/blaze.cc
@@ -374,7 +374,7 @@
   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(

src/main/cpp/blaze_util_platform.h

diff --git a/src/main/cpp/blaze_util_platform.h b/src/main/cpp/blaze_util_platform.h
index 1ebacf6..b553518 100644
--- a/src/main/cpp/blaze_util_platform.h
+++ b/src/main/cpp/blaze_util_platform.h
@@ -135,8 +135,8 @@
 // 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.

src/main/cpp/blaze_util_posix.cc

diff --git a/src/main/cpp/blaze_util_posix.cc b/src/main/cpp/blaze_util_posix.cc
index 67d52fe..30e9353 100644
--- a/src/main/cpp/blaze_util_posix.cc
+++ b/src/main/cpp/blaze_util_posix.cc
@@ -168,7 +168,7 @@
 
 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;

src/main/cpp/blaze_util_windows.cc

diff --git a/src/main/cpp/blaze_util_windows.cc b/src/main/cpp/blaze_util_windows.cc
index bf17d15..d8311d5 100644
--- a/src/main/cpp/blaze_util_windows.cc
+++ b/src/main/cpp/blaze_util_windows.cc
@@ -904,7 +904,7 @@
   exit(exit_code);
 }
 
-string ListSeparator() { return ";"; }
+const char kListSeparator = ';';
 
 string PathAsJvmFlag(const string& path) {
   string spath;