diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-01-31 12:05:18 -0500 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-01-31 12:05:18 -0500 |
| commit | e6ec8bc52f74d1cb78229632040d3d496a3c55c9 (patch) | |
| tree | 34d0de45023376c7ea71bdf969e20f3c1ea32f5b /googletest/include/gtest/gtest-printers.h | |
| parent | e55fded0c88228fa40e998a6b54069d15853a9c0 (diff) | |
| download | googletest-e6ec8bc52f74d1cb78229632040d3d496a3c55c9.tar.gz googletest-e6ec8bc52f74d1cb78229632040d3d496a3c55c9.zip | |
Merges and also adding new bazel build mode
Diffstat (limited to 'googletest/include/gtest/gtest-printers.h')
| -rw-r--r-- | googletest/include/gtest/gtest-printers.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/googletest/include/gtest/gtest-printers.h b/googletest/include/gtest/gtest-printers.h index fa7da7ee..4deaad05 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 |
