From 9199f8feaf4e3642a4afac1819d4d1887bb19ac1 Mon Sep 17 00:00:00 2001
From: Arthur O'Dwyer <arthur.j.odwyer@gmail.com>
Date: Sat, 28 Mar 2020 14:47:55 -0400
Subject: [PATCH] Fix -Wdeprecated warnings in this test. NFC.

/home/travis/build/Quuxplusone/googletest/googletest/test/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&);
       ^
/home/travis/build/Quuxplusone/googletest/googletest/test/googletest-param-test-test.cc:507:36: note:
      implicit copy constructor for 'NonDefaultConstructAssignString' first
      required here
      Combine(Values(0, 1), Values(NonDefaultConstructAssignString("A"),
                                   ^
---
 googletest/test/googletest-param-test-test.cc | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/googletest/test/googletest-param-test-test.cc b/googletest/test/googletest-param-test-test.cc
index 6ba89654..ef2f844b 100644
--- a/googletest/test/googletest-param-test-test.cc
+++ b/googletest/test/googletest-param-test-test.cc
@@ -489,17 +489,16 @@ TEST(CombineTest, CombineWithMaxNumberOfParameters) {
 
 class NonDefaultConstructAssignString {
  public:
+  NonDefaultConstructAssignString() = delete;
+  NonDefaultConstructAssignString& operator=(const NonDefaultConstructAssignString&) = delete;
+
   NonDefaultConstructAssignString(const std::string& s) : str_(s) {}
+  NonDefaultConstructAssignString(const 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) {