From e6ec8bc52f74d1cb78229632040d3d496a3c55c9 Mon Sep 17 00:00:00 2001
From: Gennadiy Civil <misterg@google.com>
Date: Wed, 31 Jan 2018 12:05:18 -0500
Subject: Merges and also adding new bazel build mode

---
 BUILD.bazel                               | 1 +
 ci/build-linux-bazel.sh                   | 1 +
 googletest/include/gtest/gtest-printers.h | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/BUILD.bazel b/BUILD.bazel
index 91dd3b7..6d82829 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -104,6 +104,7 @@ cc_library(
     deps = select ({
         ":has_absl": [
         "@com_google_absl//absl/types:optional",
+        "@com_google_absl//absl/strings"
         ],
         "//conditions:default": [],
     }
diff --git a/ci/build-linux-bazel.sh b/ci/build-linux-bazel.sh
index 2f63896..3f1c784 100755
--- a/ci/build-linux-bazel.sh
+++ b/ci/build-linux-bazel.sh
@@ -33,3 +33,4 @@ set -e
 
 bazel build --curses=no //...:all
 bazel test --curses=no //...:all
+bazel test --curses=no //...:all --define absl=1
diff --git a/googletest/include/gtest/gtest-printers.h b/googletest/include/gtest/gtest-printers.h
index fa7da7e..4deaad0 100644
--- 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
 
-- 
cgit v0.12