diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-02-13 16:48:32 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-02-13 16:48:32 (GMT) |
| commit | 30d276da03468d08bcde1820b6b9ed17e9fffbe6 (patch) | |
| tree | e6dae109779162f5eef69e1cde1a252f93d5868b /googletest | |
| parent | 3b1fe3ec45276c58aac6522dc009a2e8f193d996 (diff) | |
| download | googletest-30d276da03468d08bcde1820b6b9ed17e9fffbe6.zip googletest-30d276da03468d08bcde1820b6b9ed17e9fffbe6.tar.gz googletest-30d276da03468d08bcde1820b6b9ed17e9fffbe6.tar.bz2 | |
cxxx11refs/pull/1454/head
Diffstat (limited to 'googletest')
| -rw-r--r-- | googletest/test/gtest-param-test_test.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/googletest/test/gtest-param-test_test.cc b/googletest/test/gtest-param-test_test.cc index 0236e87..fb2e44b 100644 --- a/googletest/test/gtest-param-test_test.cc +++ b/googletest/test/gtest-param-test_test.cc @@ -536,6 +536,8 @@ TEST(CombineTest, CombineWithMaxNumberOfParameters) { VerifyGenerator(gen, expected_values); } +#if GTEST_LANG_CXX11 + class NonDefaultConstructAssignString { public: NonDefaultConstructAssignString(const std::string& s) : str_(s) {} @@ -578,6 +580,7 @@ TEST(CombineTest, NonDefaultConstructAssign) { EXPECT_TRUE(it == gen.end()); } +#endif // GTEST_LANG_CXX11 # endif // GTEST_HAS_COMBINE // Tests that an generator produces correct sequence after being |