aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/include/gmock/internal/gmock-internal-utils.h
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2019-10-10 09:21:38 -0400
committerGennadiy Civil <misterg@google.com>2019-10-10 09:21:38 -0400
commitcb1d5db1a104c7161fce89483dcfbe0ccb9bb28b (patch)
treeb58ff93963fe15b329ccdcc141e74dc357ecc5ee /googlemock/include/gmock/internal/gmock-internal-utils.h
parentcd17fa2abda2a2e4111cdabd62a87aea16835014 (diff)
parent3339b97c6a7fb908cd343ff8251d86782ea264a8 (diff)
downloadgoogletest-cb1d5db1a104c7161fce89483dcfbe0ccb9bb28b.tar.gz
googletest-cb1d5db1a104c7161fce89483dcfbe0ccb9bb28b.tar.bz2
googletest-cb1d5db1a104c7161fce89483dcfbe0ccb9bb28b.zip
Merge pull request #2448 from kuzkry:bad-googletest-export
PiperOrigin-RevId: 273585026
Diffstat (limited to 'googlemock/include/gmock/internal/gmock-internal-utils.h')
-rw-r--r--googlemock/include/gmock/internal/gmock-internal-utils.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/googlemock/include/gmock/internal/gmock-internal-utils.h b/googlemock/include/gmock/internal/gmock-internal-utils.h
index fdc049c5..d012e710 100644
--- a/googlemock/include/gmock/internal/gmock-internal-utils.h
+++ b/googlemock/include/gmock/internal/gmock-internal-utils.h
@@ -334,8 +334,6 @@ class WithoutMatchers {
// Internal use only: access the singleton instance of WithoutMatchers.
GTEST_API_ WithoutMatchers GetWithoutMatchers();
-// Type traits.
-
// Disable MSVC warnings for infinite recursion, since in this case the
// the recursion is unreachable.
#ifdef _MSC_VER