square away the stuff that hasn't been merged in a manual review

This fixes up ab8f346b (a manual merge) that has abandoned some things from PR #2395.
2019-09-07 06:08:28 +02:00
parent f2fb48c3b3
commit 7c2bd3af98
3 changed files with 2 additions and 5 deletions
--- 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