Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a86d26ac authored by Adam Lesinski's avatar Adam Lesinski Committed by Android Git Automerger
Browse files

am c953898b: Fix issues that occurred due to building with clang 

* commit 'c953898b':
  Fix issues that occurred due to building with clang
parents 7913cf9d c953898b

tools/split-select/RuleGenerator_test.cpp

+5 −5
Original line number Diff line number Diff line
@@ -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())