Merges and also adding new bazel build mode

2018-01-31 12:05:18 -05:00
parent e55fded0c8
commit e6ec8bc52f
3 changed files with 4 additions and 1 deletions
--- a/googletest/include/gtest/gtest-printers.h
+++ b/googletest/include/gtest/gtest-printers.h
@@ -113,6 +113,7 @@

 #if GTEST_HAS_ABSL
 #include "absl/types/optional.h"
+#include "absl/strings/string_view.h"
 #endif  // GTEST_HAS_ABSL

 namespace testing {
@@ -629,7 +630,7 @@ inline void PrintTo(const ::std::wstring& s, ::std::ostream* os) {
 #if GTEST_HAS_ABSL
 // Overload for absl::string_view.
 inline void PrintTo(absl::string_view sp, ::std::ostream* os) {
-  PrintTo(string(sp), os);
+  PrintTo(::std::string(sp), os);
 }
 #endif  // GTEST_HAS_ABSL