diff options
| author | Jordan Bayles <jophba@chromium.org> | 2019-07-10 16:59:00 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-07-11 02:19:04 +0000 |
| commit | d0b8fa3805bc4ddf7e269304148735f9f590d9cc (patch) | |
| tree | f4287e2a3d8b7dcf55d1e676054eb5c05720e17d /util/json | |
| parent | d3cd86ab10087914f8a666021e379cc6f4778ace (diff) | |
| download | openscreen-d0b8fa3805bc4ddf7e269304148735f9f590d9cc.tar.gz | |
Fix issues causing Chromium build breaks
Currently, Open Screen HEAD doesn't compile in Chromium, mostly due to
them having additional build flags (sign-compare, extra-semi) that we
don't use. This patch changes our build config, and fixes all of the
warnings found building in Chromium
Change-Id: I7c55f3b5edd4596516a4630110fe7106945b8b43
Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/1696647
Commit-Queue: Jordan Bayles <jophba@chromium.org>
Reviewed-by: Peter Thatcher <pthatcher@google.com>
Reviewed-by: mark a. foltz <mfoltz@chromium.org>
Diffstat (limited to 'util/json')
| -rw-r--r-- | util/json/json_reader_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util/json/json_reader_unittest.cc b/util/json/json_reader_unittest.cc index b94cca13..a18cf201 100644 --- a/util/json/json_reader_unittest.cc +++ b/util/json/json_reader_unittest.cc @@ -35,7 +35,7 @@ TEST(JsonReaderTest, ValidEmptyDocumentParsedCorrectly) { const auto actual = reader.Read("{}"); EXPECT_TRUE(actual.is_value()); - EXPECT_EQ(actual.value().getMemberNames().size(), 0); + EXPECT_EQ(actual.value().getMemberNames().size(), 0u); } // Jsoncpp has its own suite of tests ensure that things are parsed correctly, @@ -47,7 +47,7 @@ TEST(JsonReaderTest, ValidDocumentParsedCorrectly) { const auto actual = reader.Read(R"({"foo": "bar", "baz": 1337})"); EXPECT_TRUE(actual.is_value()); - EXPECT_EQ(actual.value().getMemberNames().size(), 2); + EXPECT_EQ(actual.value().getMemberNames().size(), 2u); } } // namespace openscreen |