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-param-test-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-param-test-test.cc')
| -rw-r--r-- | googletest/test/googletest-param-test-test.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/googletest/test/googletest-param-test-test.cc b/googletest/test/googletest-param-test-test.cc index 0ab0d6f3..c852220e 100644 --- a/googletest/test/googletest-param-test-test.cc +++ b/googletest/test/googletest-param-test-test.cc @@ -490,11 +490,12 @@ TEST(CombineTest, CombineWithMaxNumberOfParameters) { class NonDefaultConstructAssignString { public: NonDefaultConstructAssignString(const std::string& s) : str_(s) {} + NonDefaultConstructAssignString() = delete; NonDefaultConstructAssignString(const NonDefaultConstructAssignString&) = default; - - NonDefaultConstructAssignString() = delete; - void operator=(const NonDefaultConstructAssignString&) = delete; + NonDefaultConstructAssignString& operator=( + const NonDefaultConstructAssignString&) = delete; + ~NonDefaultConstructAssignString() = default; const std::string& str() const { return str_; } |