From 58b71c9ea2fa52a7412e2267895d016abe14a971 Mon Sep 17 00:00:00 2001 From: Brian Date: Wed, 5 Jan 2022 21:33:05 -0800 Subject: [PATCH] Remove another GTEST_DISALLOW_ASSIGN_ that crept in They were all removed in #2815, but it looks like this one got added from a Google export which missed the update. See #2815 for reasons why removing this is desirable. --- googlemock/include/gmock/gmock-matchers.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h index 2f846ba0fe..e92577aafc 100644 --- a/googlemock/include/gmock/gmock-matchers.h +++ b/googlemock/include/gmock/gmock-matchers.h @@ -1462,8 +1462,6 @@ class ConditionalMatcher { bool condition_; MatcherTrue matcher_true_; MatcherFalse matcher_false_; - - GTEST_DISALLOW_ASSIGN_(ConditionalMatcher); }; // Wrapper for implementation of Any/AllOfArray().