From 1b1f1b14eef5f73a82c1bb7cefd63ded5a9f6ebb Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Tue, 22 Dec 2015 13:01:05 -0800 Subject: AAPT2: Fix compiler error in 32-bit host test We now default host native tests to build both 32-bit and 64-bit versions. The 32-bit version of libaapt2_test was broken because it was comparing an unsigned int to the result from std::count(std::vector), which is a signed int. The 64-bit version compiled fine, since std::count(std::vector) returns a long. Change-Id: I786fcd8a54d9f78b76b19ef82ab8dda6f5c42197 --- tools/aapt2/compile/XmlIdCollector_test.cpp | 6 +++--- 1 file 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 })); } -- cgit v1.2.3-59-g8ed1b