From 7c2bd3af981e9f257a0b61ce664953008c105dad Mon Sep 17 00:00:00 2001 From: Krystian Kuzniarek Date: Sat, 7 Sep 2019 06:08:28 +0200 Subject: 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. --- googlemock/include/gmock/internal/gmock-internal-utils.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'googlemock/include/gmock/internal/gmock-internal-utils.h') 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 -- cgit v1.2.3