diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-11-03 20:58:35 -0800 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2014-11-03 20:58:35 -0800 |
| commit | c953898b983d70658e0decf19f48fff3ac462cf7 (patch) | |
| tree | 3e4473119a01042ed069581f15de939696c70675 /tools/split-select/RuleGenerator_test.cpp | |
| parent | 8a5bb15efaa55ff57a92e36d2b9e33d1f34c9608 (diff) | |
Fix issues that occurred due to building with clang
Change-Id: I4fb3eb1c8d2a02312deaeebf4a0627153bf8700a
Diffstat (limited to 'tools/split-select/RuleGenerator_test.cpp')
| -rw-r--r-- | tools/split-select/RuleGenerator_test.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/split-select/RuleGenerator_test.cpp b/tools/split-select/RuleGenerator_test.cpp index ee387be62844..8d511187ff83 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<int>& 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()) |