diff options
| author | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2009-06-17 22:11:04 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2009-06-17 22:11:04 +0000 |
| commit | 90c90f9250f19c3f3a5c2c0887c1d9e414afe41b (patch) | |
| tree | 9b8569830d91673719c6ddc98667fb4e1e7f5a5c /test/gmock-internal-utils_test.cc | |
| parent | 4cd148e588c7433d12a143108c15127aa283407a (diff) | |
| download | googletest-90c90f9250f19c3f3a5c2c0887c1d9e414afe41b.tar.gz googletest-90c90f9250f19c3f3a5c2c0887c1d9e414afe41b.tar.bz2 googletest-90c90f9250f19c3f3a5c2c0887c1d9e414afe41b.zip | |
Switches from Boost TR1 tuple to gtest's TR1 tuple.
Diffstat (limited to 'test/gmock-internal-utils_test.cc')
| -rw-r--r-- | test/gmock-internal-utils_test.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/gmock-internal-utils_test.cc b/test/gmock-internal-utils_test.cc index 912ee357..9ab15af2 100644 --- a/test/gmock-internal-utils_test.cc +++ b/test/gmock-internal-utils_test.cc @@ -812,8 +812,9 @@ TEST(NativeArrayTest, ConstructorFromArrayReferenceWorks) { TEST(NativeArrayTest, ConstructorFromTupleWorks) { int a[3] = { 0, 1, 2 }; + int* const p = a; // Tests with a plain pointer. - NativeArray<int> na(make_tuple(a, 3U), kReference); + NativeArray<int> na(make_tuple(p, 3U), kReference); EXPECT_EQ(a, na.begin()); const linked_ptr<char> b(new char); @@ -935,8 +936,9 @@ TEST(StlContainerViewTest, WorksForDynamicNativeArray) { StlContainerView<tuple<const int*, int> >::const_reference>(); int a1[3] = { 0, 1, 2 }; + const int* const p1 = a1; NativeArray<int> a2 = StlContainerView<tuple<const int*, int> >:: - ConstReference(make_tuple(a1, 3)); + ConstReference(make_tuple(p1, 3)); EXPECT_EQ(3, a2.size()); EXPECT_EQ(a1, a2.begin()); |