diff options
Diffstat (limited to 'googletest/test/googletest-param-test-test.cc')
| -rw-r--r-- | googletest/test/googletest-param-test-test.cc | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/googletest/test/googletest-param-test-test.cc b/googletest/test/googletest-param-test-test.cc index f789cab2..be9548ed 100644 --- a/googletest/test/googletest-param-test-test.cc +++ b/googletest/test/googletest-param-test-test.cc @@ -535,8 +535,6 @@ TEST(CombineTest, CombineWithMaxNumberOfParameters) { VerifyGenerator(gen, expected_values); } -#if GTEST_LANG_CXX11 - class NonDefaultConstructAssignString { public: NonDefaultConstructAssignString(const std::string& s) : str_(s) {} @@ -579,7 +577,6 @@ 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 @@ -913,8 +910,6 @@ INSTANTIATE_TEST_CASE_P(CustomParamNameFunction, Values(std::string("FunctionName")), CustomParamNameFunction); -#if GTEST_LANG_CXX11 - // Test custom naming with a lambda class CustomLambdaNamingTest : public TestWithParam<std::string> {}; @@ -926,8 +921,6 @@ INSTANTIATE_TEST_CASE_P(CustomParamNameLambda, CustomLambdaNamingTest, return inf.param; }); -#endif // GTEST_LANG_CXX11 - TEST(CustomNamingTest, CheckNameRegistry) { ::testing::UnitTest* unit_test = ::testing::UnitTest::GetInstance(); std::set<std::string> test_names; @@ -944,9 +937,7 @@ TEST(CustomNamingTest, CheckNameRegistry) { } EXPECT_EQ(1u, test_names.count("CustomTestNames/FunctorName")); EXPECT_EQ(1u, test_names.count("CustomTestNames/FunctionName")); -#if GTEST_LANG_CXX11 EXPECT_EQ(1u, test_names.count("CustomTestNames/LambdaName")); -#endif // GTEST_LANG_CXX11 } // Test a numeric name to ensure PrintToStringParamName works correctly. |