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"), ^
This commit is contained in:
parent
213a8a8f39
commit
9199f8feaf
@ -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) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user