RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-26 04:32:44 +01:00
Code Issues Projects Releases Wiki Activity

Fix build due to comparison of std::pairs.

Browse Source 
llvm-svn: 283342
This commit is contained in:
Zachary Turner 2016-10-05 17:04:36 +00:00
parent 10f9def152
commit c9a75c816c
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
unittests/ADT/STLExtrasTest.cpp
View File

@ -43,26 +43,28 @@ TEST(STLExtrasTest, EnumerateLValue) {
// Test that a simple LValue can be enumerated and gives correct results with // Test that a simple LValue can be enumerated and gives correct results with
// multiple types, including the empty container. // multiple types, including the empty container.
std::vector<char> foo = {'a', 'b', 'c'}; std::vector<char> foo = {'a', 'b', 'c'};
std::vector<std::pair<std::size_t, char>> CharResults; typedef std::pair<std::size_t, char> CharPairType;
std::vector<CharPairType> CharResults;
for (auto X : llvm::enumerate(foo)) { for (auto X : llvm::enumerate(foo)) {
CharResults.emplace_back(X.Index, X.Value); CharResults.emplace_back(X.Index, X.Value);
} }
ASSERT_EQ(3u, CharResults.size()); ASSERT_EQ(3u, CharResults.size());
EXPECT_EQ(std::make_pair(0u, 'a'), CharResults[0]); EXPECT_EQ(CharPairType(0u, 'a'), CharResults[0]);
EXPECT_EQ(std::make_pair(1u, 'b'), CharResults[1]); EXPECT_EQ(CharPairType(1u, 'b'), CharResults[1]);
EXPECT_EQ(std::make_pair(2u, 'c'), CharResults[2]); EXPECT_EQ(CharPairType(2u, 'c'), CharResults[2]);
// Test a const range of a different type. // Test a const range of a different type.
std::vector<std::pair<std::size_t, int>> IntResults; typedef std::pair<std::size_t, int> IntPairType;
std::vector<IntPairType> IntResults;
const std::vector<int> bar = {1, 2, 3}; const std::vector<int> bar = {1, 2, 3};
for (auto X : llvm::enumerate(bar)) { for (auto X : llvm::enumerate(bar)) {
IntResults.emplace_back(X.Index, X.Value); IntResults.emplace_back(X.Index, X.Value);
} }
ASSERT_EQ(3u, IntResults.size()); ASSERT_EQ(3u, IntResults.size());
EXPECT_EQ(std::make_pair(0u, 1), IntResults[0]); EXPECT_EQ(IntPairType(0u, 1), IntResults[0]);
EXPECT_EQ(std::make_pair(1u, 2), IntResults[1]); EXPECT_EQ(IntPairType(1u, 2), IntResults[1]);
EXPECT_EQ(std::make_pair(2u, 3), IntResults[2]); EXPECT_EQ(IntPairType(2u, 3), IntResults[2]);
// Test an empty range. // Test an empty range.
IntResults.clear(); IntResults.clear();
@ -88,7 +90,8 @@ TEST(STLExtrasTest, EnumerateModifyLValue) {
TEST(STLExtrasTest, EnumerateRValueRef) { TEST(STLExtrasTest, EnumerateRValueRef) {
// Test that an rvalue can be enumerated. // Test that an rvalue can be enumerated.
std::vector<std::pair<std::size_t, int>> Results; typedef std::pair<std::size_t, int> PairType;
std::vector<PairType> Results;
auto Enumerator = llvm::enumerate(std::vector<int>{1, 2, 3}); auto Enumerator = llvm::enumerate(std::vector<int>{1, 2, 3});
@ -97,16 +100,17 @@ TEST(STLExtrasTest, EnumerateRValueRef) {
} }
ASSERT_EQ(3u, Results.size()); ASSERT_EQ(3u, Results.size());
EXPECT_EQ(std::make_pair(0u, 1), Results[0]); EXPECT_EQ(PairType(0u, 1), Results[0]);
EXPECT_EQ(std::make_pair(1u, 2), Results[1]); EXPECT_EQ(PairType(1u, 2), Results[1]);
EXPECT_EQ(std::make_pair(2u, 3), Results[2]); EXPECT_EQ(PairType(2u, 3), Results[2]);
} }
TEST(STLExtrasTest, EnumerateModifyRValue) { TEST(STLExtrasTest, EnumerateModifyRValue) {
// Test that when enumerating an rvalue, modification still works (even if // Test that when enumerating an rvalue, modification still works (even if
// this isn't terribly useful, it at least shows that we haven't snuck an // this isn't terribly useful, it at least shows that we haven't snuck an
// extra const in there somewhere. // extra const in there somewhere.
std::vector<std::pair<std::size_t, char>> Results; typedef std::pair<std::size_t, char> PairType;
std::vector<PairType> Results;
for (auto X : llvm::enumerate(std::vector<char>{'1', '2', '3'})) { for (auto X : llvm::enumerate(std::vector<char>{'1', '2', '3'})) {
++X.Value; ++X.Value;
@ -114,9 +118,9 @@ TEST(STLExtrasTest, EnumerateModifyRValue) {
} }
ASSERT_EQ(3u, Results.size()); ASSERT_EQ(3u, Results.size());
EXPECT_EQ(std::make_pair(0u, '2'), Results[0]); EXPECT_EQ(PairType(0u, '2'), Results[0]);
EXPECT_EQ(std::make_pair(1u, '3'), Results[1]); EXPECT_EQ(PairType(1u, '3'), Results[1]);
EXPECT_EQ(std::make_pair(2u, '4'), Results[2]); EXPECT_EQ(PairType(2u, '4'), Results[2]);
} }
template <bool B> struct CanMove {}; template <bool B> struct CanMove {};