From c953898b983d70658e0decf19f48fff3ac462cf7 Mon Sep 17 00:00:00 2001 From: Adam Lesinski Date: Mon, 3 Nov 2014 20:58:35 -0800 Subject: [PATCH] Fix issues that occurred due to building with clang Change-Id: I4fb3eb1c8d2a02312deaeebf4a0627153bf8700a --- tools/split-select/RuleGenerator_test.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/split-select/RuleGenerator_test.cpp b/tools/split-select/RuleGenerator_test.cpp index ee387be628444..8d511187ff836 100644 --- a/tools/split-select/RuleGenerator_test.cpp +++ b/tools/split-select/RuleGenerator_test.cpp @@ -47,10 +47,10 @@ TEST(RuleGeneratorTest, testDensityRules) { densities.add(ConfigDescription::DENSITY_XXHIGH); densities.add(ConfigDescription::DENSITY_ANY); - ASSERT_LT(263, ConfigDescription::DENSITY_XHIGH); - ASSERT_GT(262, ConfigDescription::DENSITY_HIGH); - ASSERT_LT(363, ConfigDescription::DENSITY_XXHIGH); - ASSERT_GT(362, ConfigDescription::DENSITY_XHIGH); + ASSERT_LT(263, (int) ConfigDescription::DENSITY_XHIGH); + ASSERT_GT(262, (int) ConfigDescription::DENSITY_HIGH); + ASSERT_LT(363, (int) ConfigDescription::DENSITY_XXHIGH); + ASSERT_GT(362, (int) ConfigDescription::DENSITY_XHIGH); expectDensityRule(densities, ConfigDescription::DENSITY_HIGH, 0, 263); expectDensityRule(densities, ConfigDescription::DENSITY_XHIGH, 262, 363); @@ -87,7 +87,7 @@ static void expectDensityRule(const Vector& densities, int density, int gre EXPECT_EQ(isAnyDpi == false, anyDpiRule->negate) << "for " << density << "dpi ANY DPI rule"; if (anyDpiRule->longArgs.size() == 1) { - EXPECT_EQ(ConfigDescription::DENSITY_ANY, anyDpiRule->longArgs[0]) + EXPECT_EQ((long) ConfigDescription::DENSITY_ANY, anyDpiRule->longArgs[0]) << "for " << density << "dpi ANY DPI rule"; } else { EXPECT_EQ(1u, anyDpiRule->longArgs.size())