Merge pull request #2815 from Quuxplusone:simple

PiperOrigin-RevId: 308625388
2020-05-01 17:11:43 -04:00
parent 955552518b 1b066f4edf
commit ef25d27d46
13 changed files with 21 additions and 176 deletions
--- a/googlemock/test/gmock-actions_test.cc
+++ b/googlemock/test/gmock-actions_test.cc
@@ -574,8 +574,6 @@ class FromType {

 private:
  bool* const converted_;
-
-  GTEST_DISALLOW_ASSIGN_(FromType);
 };

 class ToType {