From c3344e8a6d7402326204d1232a4c5ffa382f70a9 Mon Sep 17 00:00:00 2001 From: Adam Lesinski Date: Mon, 10 Nov 2014 17:32:27 -0800 Subject: split-select: fix OSX build Clang is a bit stricter about what template definition it chooses for mixed types that are normally possible to cast between. Operations like std::find(int iterator, int iterator, enum) will fail, as Clang won't implicitly cast an enum to an int here. Change-Id: Ib2276c382ebf2b877e1045d32b1a9d0a1fa4d4a4 --- tools/split-select/RuleGenerator.cpp | 2 +- tools/split-select/RuleGenerator_test.cpp | 8 ++++---- tools/split-select/TestRules.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'tools/split-select') diff --git a/tools/split-select/RuleGenerator.cpp b/tools/split-select/RuleGenerator.cpp index 72bb0c7..83c9795 100644 --- a/tools/split-select/RuleGenerator.cpp +++ b/tools/split-select/RuleGenerator.cpp @@ -38,7 +38,7 @@ sp RuleGenerator::generateDensity(const Vector& allDensities, size_t densityRule->op = Rule::AND_SUBRULES; const bool hasAnyDensity = std::find(allDensities.begin(), - allDensities.end(), ResTable_config::DENSITY_ANY) != allDensities.end(); + allDensities.end(), (int) ResTable_config::DENSITY_ANY) != allDensities.end(); if (hasAnyDensity) { sp version = new Rule(); diff --git a/tools/split-select/RuleGenerator_test.cpp b/tools/split-select/RuleGenerator_test.cpp index 778d604..470cadc 100644 --- a/tools/split-select/RuleGenerator_test.cpp +++ b/tools/split-select/RuleGenerator_test.cpp @@ -47,10 +47,10 @@ TEST(RuleGeneratorTest, testAbiRules) { } TEST(RuleGeneratorTest, densityConstantsAreSane) { - EXPECT_LT(263, ConfigDescription::DENSITY_XHIGH); - EXPECT_GT(262, ConfigDescription::DENSITY_HIGH); - EXPECT_LT(363, ConfigDescription::DENSITY_XXHIGH); - EXPECT_GT(362, ConfigDescription::DENSITY_XHIGH); + EXPECT_LT(263, (int) ConfigDescription::DENSITY_XHIGH); + EXPECT_GT(262, (int) ConfigDescription::DENSITY_HIGH); + EXPECT_LT(363, (int) ConfigDescription::DENSITY_XXHIGH); + EXPECT_GT(362, (int) ConfigDescription::DENSITY_XHIGH); } TEST(RuleGeneratorTest, testDensityRules) { diff --git a/tools/split-select/TestRules.cpp b/tools/split-select/TestRules.cpp index f980dc4..86ccd6a 100644 --- a/tools/split-select/TestRules.cpp +++ b/tools/split-select/TestRules.cpp @@ -75,7 +75,7 @@ const Rule AlwaysTrue() { const char*, const char*, const sp& actual, const Rule& expected) { const String8 expectedStr(expected.toJson()); - const String8 actualStr(actual != NULL ? actual->toJson() : ""); + const String8 actualStr(actual != NULL ? actual->toJson() : String8()); if (expectedStr != actualStr) { return ::testing::AssertionFailure() -- cgit v1.1