Skip to content

GitLab

Commit 30d276da authored by Gennadiy Civil's avatar Gennadiy Civil
Browse files

cxxx11

parent 3b1fe3ec
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
googletest/test/gtest-param-test_test.cc
View file @ 30d276da
...@@ -536,6 +536,8 @@ TEST(CombineTest, CombineWithMaxNumberOfParameters) { ...@@ -536,6 +536,8 @@ TEST(CombineTest, CombineWithMaxNumberOfParameters) {
VerifyGenerator(gen, expected_values); VerifyGenerator(gen, expected_values);
} }
#if GTEST_LANG_CXX11
class NonDefaultConstructAssignString { class NonDefaultConstructAssignString {
public: public:
NonDefaultConstructAssignString(const std::string& s) : str_(s) {} NonDefaultConstructAssignString(const std::string& s) : str_(s) {}
...@@ -578,6 +580,7 @@ TEST(CombineTest, NonDefaultConstructAssign) { ...@@ -578,6 +580,7 @@ TEST(CombineTest, NonDefaultConstructAssign) {
EXPECT_TRUE(it == gen.end()); EXPECT_TRUE(it == gen.end());
} }
#endif // GTEST_LANG_CXX11
# endif // GTEST_HAS_COMBINE # endif // GTEST_HAS_COMBINE
// Tests that an generator produces correct sequence after being // Tests that an generator produces correct sequence after being
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment