diff options
| author | Jerry Turcios <jerryturcios08@gmail.com> | 2018-10-29 21:09:25 -0400 |
|---|---|---|
| committer | Jerry Turcios <jerryturcios08@gmail.com> | 2018-10-29 21:09:25 -0400 |
| commit | 3896e3b593c332087564a767b3d8f2e7c8dbbd25 (patch) | |
| tree | 1bac50c1afdb97db255a4fbef0b33941c8025f12 /googlemock/test/gmock-internal-utils_test.cc | |
| parent | b8a03c80ad59a4735f852ab13725f2d14ead424f (diff) | |
| parent | b9347b31c338851879d0105f0fe32d09007f0433 (diff) | |
| download | googletest-3896e3b593c332087564a767b3d8f2e7c8dbbd25.tar.gz googletest-3896e3b593c332087564a767b3d8f2e7c8dbbd25.tar.bz2 googletest-3896e3b593c332087564a767b3d8f2e7c8dbbd25.zip | |
Merge branch 'master' of https://github.com/google/googletest
Diffstat (limited to 'googlemock/test/gmock-internal-utils_test.cc')
| -rw-r--r-- | googlemock/test/gmock-internal-utils_test.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/googlemock/test/gmock-internal-utils_test.cc b/googlemock/test/gmock-internal-utils_test.cc index 41498f0e..aa0162b8 100644 --- a/googlemock/test/gmock-internal-utils_test.cc +++ b/googlemock/test/gmock-internal-utils_test.cc @@ -123,8 +123,6 @@ TEST(ConvertIdentifierNameToWordsTest, WorksWhenNameIsMixture) { } TEST(PointeeOfTest, WorksForSmartPointers) { - CompileAssertTypesEqual<const char, - PointeeOf<internal::linked_ptr<const char> >::type>(); #if GTEST_HAS_STD_UNIQUE_PTR_ CompileAssertTypesEqual<int, PointeeOf<std::unique_ptr<int> >::type>(); #endif // GTEST_HAS_STD_UNIQUE_PTR_ @@ -151,10 +149,6 @@ TEST(GetRawPointerTest, WorksForSmartPointers) { const std::shared_ptr<double> p2(raw_p2); EXPECT_EQ(raw_p2, GetRawPointer(p2)); #endif // GTEST_HAS_STD_SHARED_PTR_ - - const char* const raw_p4 = new const char('a'); // NOLINT - const internal::linked_ptr<const char> p4(raw_p4); - EXPECT_EQ(raw_p4, GetRawPointer(p4)); } TEST(GetRawPointerTest, WorksForRawPointers) { @@ -687,7 +681,7 @@ TEST(StlContainerViewTest, WorksForDynamicNativeArray) { StlContainerView<std::tuple<const int*, size_t> >::type>(); StaticAssertTypeEq< NativeArray<double>, - StlContainerView<std::tuple<linked_ptr<double>, int> >::type>(); + StlContainerView<std::tuple<std::shared_ptr<double>, int> >::type>(); StaticAssertTypeEq< const NativeArray<int>, |