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

Commit b2d31274 authored by Dan Albert's avatar Dan Albert Committed by android-build-merger
Browse files

Merge "Fix a couple sign-comparison warnings." 

am: 422359aa

* commit '422359aa':
  Fix a couple sign-comparison warnings.
parents 64686bcd 422359aa

adb/sysdeps_win32_test.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -66,7 +66,7 @@ TEST(sysdeps_win32, adb_getenv) { 
    const char* path_val = adb_getenv("PATH");

    const char* path_val = adb_getenv("PATH");

    EXPECT_NE(nullptr, path_val);

    EXPECT_NE(nullptr, path_val);

    if (path_val != nullptr) {

    if (path_val != nullptr) {

        EXPECT_GT(strlen(path_val), 0);

        EXPECT_GT(strlen(path_val), 0U);

    }

    }

}

}

base/utf8_test.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -44,7 +44,7 @@ TEST(UTFStringConversionsTest, ConvertInvalidUTF8) { 
  // specific replacement character that UTF8ToWide() may replace the invalid

  // specific replacement character that UTF8ToWide() may replace the invalid

  // UTF-8 characters with because we want to allow that to change if the

  // UTF-8 characters with because we want to allow that to change if the

  // implementation changes.

  // implementation changes.

  EXPECT_EQ(0, wide.find(L"before"));

  EXPECT_EQ(0U, wide.find(L"before"));

  const wchar_t after_wide[] = L"after";

  const wchar_t after_wide[] = L"after";

  EXPECT_EQ(wide.length() - (arraysize(after_wide) - 1), wide.find(after_wide));

  EXPECT_EQ(wide.length() - (arraysize(after_wide) - 1), wide.find(after_wide));

}

}