Fix a -Wdeprecated warning.

googletest-param-test-test.cc:502:8: error: definition of implicit copy constructor for 'NonDefaultConstructAssignString' is deprecated because it has a user-declared copy assignment operator [-Werror,-Wdeprecated] void operator=(const NonDefaultConstructAssignString&); ^

Fix a -Wdeprecated warning.
c7d8ec72 · Arthur O'Dwyer · 01c0ff5e · c7d8ec72
Commit c7d8ec72 authored Apr 16, 2020 by Arthur O'Dwyer
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

googletest-param-test-test.cc googletest/test/googletest-param-test-test.cc +4 -5

No files found.
--- a/googletest/test/googletest-param-test-test.cc
+++ b/googletest/test/googletest-param-test-test.cc
@@ -490,16 +490,15 @@ TEST(CombineTest, CombineWithMaxNumberOfParameters) {
 class NonDefaultConstructAssignString {
 public:
  NonDefaultConstructAssignString(const std::string& s) : str_(s) {}
+  NonDefaultConstructAssignString() = delete;
+  NonDefaultConstructAssignString(const NonDefaultConstructAssignString&) = default;
+  NonDefaultConstructAssignString& operator=(const NonDefaultConstructAssignString&) = delete;
+  ~NonDefaultConstructAssignString() = default;

  const std::string& str() const { return str_; }

 private:
  std::string str_;
-
-  // Not default constructible
-  NonDefaultConstructAssignString();
-  // Not assignable
-  void operator=(const NonDefaultConstructAssignString&);
 };

 TEST(CombineTest, NonDefaultConstructAssign) {