diff options
| author | kosak <kosak@google.com> | 2014-11-17 00:28:55 +0000 |
|---|---|---|
| committer | kosak <kosak@google.com> | 2014-11-17 00:28:55 +0000 |
| commit | 5b9cbbb16d774bfcb51572d52eda3f7319088e23 (patch) | |
| tree | 37a3062d21b4c056774ea2afe983c7050f1492be /test/gmock-actions_test.cc | |
| parent | 2336e9c171b5894bac98f828289f537e29691896 (diff) | |
| download | googletest-5b9cbbb16d774bfcb51572d52eda3f7319088e23.tar.gz googletest-5b9cbbb16d774bfcb51572d52eda3f7319088e23.tar.bz2 googletest-5b9cbbb16d774bfcb51572d52eda3f7319088e23.zip | |
Distinguish between C++11 language and library support for std::function, std::begin, std::end, and std::move in gtest and gmock.
Bring in gtest 694.
Diffstat (limited to 'test/gmock-actions_test.cc')
| -rw-r--r-- | test/gmock-actions_test.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/gmock-actions_test.cc b/test/gmock-actions_test.cc index 275dbbf5..2345a64f 100644 --- a/test/gmock-actions_test.cc +++ b/test/gmock-actions_test.cc @@ -264,7 +264,7 @@ TEST(DefaultValueDeathTest, GetReturnsBuiltInDefaultValueWhenUnset) { }, ""); } -#if GTEST_LANG_CXX11 +#if GTEST_HAS_STD_UNIQUE_PTR_ TEST(DefaultValueDeathTest, GetWorksForMoveOnlyIfSet) { EXPECT_FALSE(DefaultValue<std::unique_ptr<int>>::Exists()); EXPECT_DEATH_IF_SUPPORTED({ @@ -277,7 +277,7 @@ TEST(DefaultValueDeathTest, GetWorksForMoveOnlyIfSet) { std::unique_ptr<int> i = DefaultValue<std::unique_ptr<int>>::Get(); EXPECT_EQ(42, *i); } -#endif // GTEST_LANG_CXX11 +#endif // GTEST_HAS_STD_UNIQUE_PTR_ // Tests that DefaultValue<void>::Get() returns void. TEST(DefaultValueTest, GetWorksForVoid) { @@ -636,7 +636,7 @@ class MockClass { MOCK_METHOD1(IntFunc, int(bool flag)); // NOLINT MOCK_METHOD0(Foo, MyClass()); -#if GTEST_LANG_CXX11 +#if GTEST_HAS_STD_UNIQUE_PTR_ MOCK_METHOD0(MakeUnique, std::unique_ptr<int>()); MOCK_METHOD0(MakeVectorUnique, std::vector<std::unique_ptr<int>>()); #endif @@ -1273,7 +1273,7 @@ TEST(ByRefTest, PrintsCorrectly) { EXPECT_EQ(expected.str(), actual.str()); } -#if GTEST_LANG_CXX11 +#if GTEST_HAS_STD_UNIQUE_PTR_ std::unique_ptr<int> UniquePtrSource() { return std::unique_ptr<int>(new int(19)); @@ -1310,6 +1310,6 @@ TEST(MockMethodTest, CanReturnMoveOnlyValue) { EXPECT_EQ(7, *vresult[0]); } -#endif // GTEST_LANG_CXX11 +#endif // GTEST_HAS_STD_UNIQUE_PTR_ } // Unnamed namespace |