aboutsummaryrefslogtreecommitdiffstats
path: root/googletest/include
diff options
context:
space:
mode:
authorGennadiy Rozental <rogeeff@google.com>2019-11-26 15:47:05 -0500
committerGennadiy Rozental <rogeeff@google.com>2019-11-26 15:47:05 -0500
commit7a8a5bcec0051196775eb438727760913749c215 (patch)
tree499a601d9cbf408db2094012e566fe0103495144 /googletest/include
parenta32a2000947300720264205e0de88eee729f6b48 (diff)
parent2241be0c3f2477781c1d9c37b380c1dae1fe37ad (diff)
downloadgoogletest-7a8a5bcec0051196775eb438727760913749c215.tar.gz
googletest-7a8a5bcec0051196775eb438727760913749c215.tar.bz2
googletest-7a8a5bcec0051196775eb438727760913749c215.zip
Merge pull request #2591 from kuzkry:remove-workaround_g++-using-on-operator<<
PiperOrigin-RevId: 282575040
Diffstat (limited to 'googletest/include')
-rw-r--r--googletest/include/gtest/gtest-printers.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/googletest/include/gtest/gtest-printers.h b/googletest/include/gtest/gtest-printers.h
index 56a05450..c443625f 100644
--- a/googletest/include/gtest/gtest-printers.h
+++ b/googletest/include/gtest/gtest-printers.h
@@ -266,10 +266,8 @@ void DefaultPrintNonContainerTo(const T& value, ::std::ostream* os) {
// 7.3.4-1 [namespace.udir]. This allows us to fall back onto
// testing::internal2::operator<< in case T doesn't come with a <<
// operator.
- //
- // We cannot write 'using ::testing::internal2::operator<<;', which
- // gcc 3.3 fails to compile due to a compiler bug.
- using namespace ::testing::internal2; // NOLINT
+
+ using ::testing::internal2::operator<<;
// Assuming T is defined in namespace foo, in the next statement,
// the compiler will consider all of: