From 58b71c9ea2fa52a7412e2267895d016abe14a971 Mon Sep 17 00:00:00 2001 From: Brian Date: Wed, 5 Jan 2022 21:33:05 -0800 Subject: [PATCH 1/2] 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 2f846ba0..e92577aa 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(). From 2d07f12b607c528b21795ab672cff3afaf64f7a1 Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Wed, 12 Jan 2022 07:19:16 -0800 Subject: [PATCH 2/2] Fix run-on sentence dispatch. It will use the definition from the class the constructor of which PiperOrigin-RevId: 421291241 Change-Id: If81e3d6d3774edfbbb4baaec8a3cd96566b3b09c --- docs/faq.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/faq.md b/docs/faq.md index 8e4fd5ec..b2db186f 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -328,7 +328,7 @@ You may still want to use `SetUp()/TearDown()` in the following cases: * C++ does not allow virtual function calls in constructors and destructors. You can call a method declared as virtual, but it will not use dynamic - dispatch, it will use the definition from the class the constructor of which + dispatch. It will use the definition from the class the constructor of which is currently executing. This is because calling a virtual method before the derived class constructor has a chance to run is very dangerous - the virtual method might operate on uninitialized data. Therefore, if you need