diff options
| author | 2015-12-22 21:55:36 +0000 | |
|---|---|---|
| committer | 2015-12-22 21:55:36 +0000 | |
| commit | 6ea25250a8ec014e5fbd3ce442c0669a85f631a5 (patch) | |
| tree | d05f6b6623bd7cfed19710fb0e0ae100c0f76551 | |
| parent | 4f71bcec22717b7e5e060e70b3138402d5d4867e (diff) | |
| parent | 1b1f1b14eef5f73a82c1bb7cefd63ded5a9f6ebb (diff) | |
Merge "AAPT2: Fix compiler error in 32-bit host test"
| -rw-r--r-- | tools/aapt2/compile/XmlIdCollector_test.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/aapt2/compile/XmlIdCollector_test.cpp b/tools/aapt2/compile/XmlIdCollector_test.cpp index 45b7af240abe..a37ea86c317f 100644 --- a/tools/aapt2/compile/XmlIdCollector_test.cpp +++ b/tools/aapt2/compile/XmlIdCollector_test.cpp @@ -37,13 +37,13 @@ TEST(XmlIdCollectorTest, CollectsIds) { XmlIdCollector collector; ASSERT_TRUE(collector.consume(context.get(), doc.get())); - EXPECT_EQ(1u, std::count(doc->file.exportedSymbols.begin(), doc->file.exportedSymbols.end(), + EXPECT_EQ(1, std::count(doc->file.exportedSymbols.begin(), doc->file.exportedSymbols.end(), SourcedResourceName{ test::parseNameOrDie(u"@id/foo"), 3u })); - EXPECT_EQ(1u, std::count(doc->file.exportedSymbols.begin(), doc->file.exportedSymbols.end(), + EXPECT_EQ(1, std::count(doc->file.exportedSymbols.begin(), doc->file.exportedSymbols.end(), SourcedResourceName{ test::parseNameOrDie(u"@id/bar"), 3u })); - EXPECT_EQ(1u, std::count(doc->file.exportedSymbols.begin(), doc->file.exportedSymbols.end(), + EXPECT_EQ(1, std::count(doc->file.exportedSymbols.begin(), doc->file.exportedSymbols.end(), SourcedResourceName{ test::parseNameOrDie(u"@id/car"), 6u })); } |