diff options
author | Jim Grosbach <grosbach@apple.com> | 2010-11-18 01:38:07 +0000 |
---|---|---|
committer | Jim Grosbach <grosbach@apple.com> | 2010-11-18 01:38:07 +0000 |
commit | e541528e351668fb5b6eebbd168aed73d7ff563b (patch) | |
tree | 7ba3dfc1041acced3dafa49673257e0be1aca26b /unittests/VMCore | |
parent | b4ac2858dad1f6e892c8bfe981a6cf32e9a385f8 (diff) | |
download | external_llvm-e541528e351668fb5b6eebbd168aed73d7ff563b.zip external_llvm-e541528e351668fb5b6eebbd168aed73d7ff563b.tar.gz external_llvm-e541528e351668fb5b6eebbd168aed73d7ff563b.tar.bz2 |
Revert 119600 to unbreak the build. Francois, please investigate.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@119606 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'unittests/VMCore')
-rw-r--r-- | unittests/VMCore/ValueMapTest.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/unittests/VMCore/ValueMapTest.cpp b/unittests/VMCore/ValueMapTest.cpp index 0968d06..152e8ea 100644 --- a/unittests/VMCore/ValueMapTest.cpp +++ b/unittests/VMCore/ValueMapTest.cpp @@ -72,29 +72,29 @@ TYPED_TEST(ValueMapTest, OperationsWork) { typename ValueMap<TypeParam*, int>::iterator I = VM.find(this->BitcastV.get()); ASSERT_TRUE(I != VM.end()); - EXPECT_EQ(BitcastV.get(), I->first); + EXPECT_EQ(this->BitcastV.get(), I->first); EXPECT_EQ(7, I->second); - EXPECT_TRUE(VM.find(AddV.get()) == VM.end()); + EXPECT_TRUE(VM.find(this->AddV.get()) == VM.end()); // Const find: const ValueMap<TypeParam*, int> &CVM = VM; typename ValueMap<TypeParam*, int>::const_iterator CI = CVM.find(this->BitcastV.get()); ASSERT_TRUE(CI != CVM.end()); - EXPECT_EQ(BitcastV.get(), CI->first); + EXPECT_EQ(this->BitcastV.get(), CI->first); EXPECT_EQ(7, CI->second); EXPECT_TRUE(CVM.find(this->AddV.get()) == CVM.end()); // Insert: std::pair<typename ValueMap<TypeParam*, int>::iterator, bool> InsertResult1 = VM.insert(std::make_pair(this->AddV.get(), 3)); - EXPECT_EQ(/*->this*/AddV.get(), InsertResult1.first->first); + EXPECT_EQ(this->AddV.get(), InsertResult1.first->first); EXPECT_EQ(3, InsertResult1.first->second); EXPECT_TRUE(InsertResult1.second); EXPECT_EQ(true, VM.count(this->AddV.get())); std::pair<typename ValueMap<TypeParam*, int>::iterator, bool> InsertResult2 = VM.insert(std::make_pair(this->AddV.get(), 5)); - EXPECT_EQ(/*this->*/AddV.get(), InsertResult2.first->first); + EXPECT_EQ(this->AddV.get(), InsertResult2.first->first); EXPECT_EQ(3, InsertResult2.first->second); EXPECT_FALSE(InsertResult2.second); @@ -131,10 +131,10 @@ TYPED_TEST(ValueMapTest, Iteration) { std::pair<TypeParam*, int> value = *I; (void)value; CompileAssertHasType<TypeParam*>(I->first); if (I->second == 2) { - EXPECT_EQ(/*this->*/BitcastV.get(), I->first); + EXPECT_EQ(this->BitcastV.get(), I->first); I->second = 5; } else if (I->second == 3) { - EXPECT_EQ(/*this->*/AddV.get(), I->first); + EXPECT_EQ(this->AddV.get(), I->first); I->second = 6; } else { ADD_FAILURE() << "Iterated through an extra value."; @@ -153,9 +153,9 @@ TYPED_TEST(ValueMapTest, Iteration) { std::pair<TypeParam*, int> value = *I; (void)value; CompileAssertHasType<TypeParam*>(I->first); if (I->second == 5) { - EXPECT_EQ(/*this->*/BitcastV.get(), I->first); + EXPECT_EQ(this->BitcastV.get(), I->first); } else if (I->second == 6) { - EXPECT_EQ(/*this->*/AddV.get(), I->first); + EXPECT_EQ(this->AddV.get(), I->first); } else { ADD_FAILURE() << "Iterated through an extra value."; } |