aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArthur O'Dwyer <arthur.j.odwyer@gmail.com>2020-04-16 16:15:10 -0400
committerArthur O'Dwyer <arthur.j.odwyer@gmail.com>2020-04-23 22:22:34 -0400
commitc7d8ec72cc4baedbe1c3b1b304119e7a8b1a9262 (patch)
tree56b4b24f009a6de1f452f0b97403dbeba8819e80
parent01c0ff5e23735ed6b2e71904cde69f57efeae499 (diff)
downloadgoogletest-c7d8ec72cc4baedbe1c3b1b304119e7a8b1a9262.tar.gz
googletest-c7d8ec72cc4baedbe1c3b1b304119e7a8b1a9262.tar.bz2
googletest-c7d8ec72cc4baedbe1c3b1b304119e7a8b1a9262.zip
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&); ^
-rw-r--r--googletest/test/googletest-param-test-test.cc9
1 files 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..2b26e95f 100644
--- 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) {