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 /googletest/test/googletest-port-test.cc | |
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 'googletest/test/googletest-port-test.cc')
-rw-r--r-- | googletest/test/googletest-port-test.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/googletest/test/googletest-port-test.cc b/googletest/test/googletest-port-test.cc index 60d637c3..44b99ce5 100644 --- a/googletest/test/googletest-port-test.cc +++ b/googletest/test/googletest-port-test.cc @@ -90,10 +90,10 @@ TEST(IsXDigitTest, ReturnsFalseForWideNonAscii) { class Base { public: - // Copy constructor and assignment operator do exactly what we need, so we - // use them. Base() : member_(0) {} explicit Base(int n) : member_(n) {} + Base(const Base&) = default; + Base& operator=(const Base&) = default; virtual ~Base() {} int member() { return member_; } @@ -1180,8 +1180,6 @@ class DestructorTracker { return DestructorCall::List().size() - 1; } const size_t index_; - - GTEST_DISALLOW_ASSIGN_(DestructorTracker); }; typedef ThreadLocal<DestructorTracker>* ThreadParam; |