diff options
| author | Gennadiy Rozental <rogeeff@google.com> | 2020-05-01 17:11:43 -0400 |
|---|---|---|
| committer | Gennadiy Rozental <rogeeff@google.com> | 2020-05-01 17:11:43 -0400 |
| commit | ef25d27d4604556a1bee916f1c2bf03227c13c4e (patch) | |
| tree | abb0a3db076ddf033721fa04a3d768513f7619d2 /googlemock/test | |
| parent | 955552518b4e0ad0249396e6885c0f18cd4ce529 (diff) | |
| parent | 1b066f4edfd5f84beed1bb164bd3816a6d7158fe (diff) | |
| download | googletest-ef25d27d4604556a1bee916f1c2bf03227c13c4e.tar.gz googletest-ef25d27d4604556a1bee916f1c2bf03227c13c4e.tar.bz2 googletest-ef25d27d4604556a1bee916f1c2bf03227c13c4e.zip | |
Merge pull request #2815 from Quuxplusone:simple
PiperOrigin-RevId: 308625388
Diffstat (limited to 'googlemock/test')
| -rw-r--r-- | googlemock/test/gmock-actions_test.cc | 2 | ||||
| -rw-r--r-- | googlemock/test/gmock-matchers_test.cc | 6 |
2 files changed, 0 insertions, 8 deletions
diff --git a/googlemock/test/gmock-actions_test.cc b/googlemock/test/gmock-actions_test.cc index 6cd1847c..cac8f94f 100644 --- 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 { diff --git a/googlemock/test/gmock-matchers_test.cc b/googlemock/test/gmock-matchers_test.cc index 186d8aae..5db0a7ae 100644 --- a/googlemock/test/gmock-matchers_test.cc +++ b/googlemock/test/gmock-matchers_test.cc @@ -3746,17 +3746,11 @@ struct AStruct { const double y; // A const field. Uncopyable z; // An uncopyable field. const char* p; // A pointer field. - - private: - GTEST_DISALLOW_ASSIGN_(AStruct); }; // A derived struct for testing Field(). struct DerivedStruct : public AStruct { char ch; - - private: - GTEST_DISALLOW_ASSIGN_(DerivedStruct); }; // Tests that Field(&Foo::field, ...) works when field is non-const. |