From df3e8bf4a7b6aaee9bdb9bb1d340f36b8fdc9c0f Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <aardappel@gmail.com>
Date: Thu, 17 Oct 2019 15:16:00 -0700
Subject: [PATCH] Fixed warnings generated by recent JSON sorting feature.

Change-Id: I6fd6283b616c7a39bb878b1610e4ddf6e208fa0a
---
 src/idl_parser.cpp |   7 ++++---
 tests/javatest.bin | Bin 512 -> 512 bytes
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
index 93bdf6c72..37692f981 100644
--- a/src/idl_parser.cpp
+++ b/src/idl_parser.cpp
@@ -1257,7 +1257,7 @@ CheckedError Parser::ParseVectorDelimiters(uoffset_t &count, F body) {
   return NoError();
 }
 
-static int CompareType(const uint8_t *a, const uint8_t *b, BaseType ftype) {
+static bool CompareType(const uint8_t *a, const uint8_t *b, BaseType ftype) {
   switch (ftype) {
     #define FLATBUFFERS_TD(ENUM, IDLTYPE, CTYPE, JTYPE, GTYPE, NTYPE, \
                            PTYPE, RTYPE, KTYPE) \
@@ -1394,8 +1394,9 @@ CheckedError Parser::ParseVector(const Type &type, uoffset_t *ovalue,
         // stored in memory, so compute the distance between these pointers:
         ptrdiff_t diff = (b - a) * sizeof(Offset<Table>);
         assert(diff >= 0);  // Guaranteed by SimpleQsort.
-        a->o = EndianScalar(ReadScalar<uoffset_t>(a) - diff);
-        b->o = EndianScalar(ReadScalar<uoffset_t>(b) + diff);
+        auto udiff = static_cast<uoffset_t>(diff);
+        a->o = EndianScalar(ReadScalar<uoffset_t>(a) - udiff);
+        b->o = EndianScalar(ReadScalar<uoffset_t>(b) + udiff);
         std::swap(*a, *b);
       });
     }
diff --git a/tests/javatest.bin b/tests/javatest.bin
index 43b3766ac6a537e8e80a21609b99dbaad29b1f8f..804dbba6fdb940bd69667e6d0c00a5b493f1fc8e 100644
GIT binary patch
delta 85
zcmZo*X<*@4!2kvg6FCkzm;jl+{(iwA5e)_(1|1-+#h?Nt6@XZtL4rYqL4bh;$OZv^
RAm#w7V_<-pF`0w$2LRIY39A4A

delta 78
zcmZo*X<*@C0D>hzJeh;>goOc+;p^`g3=&jf@L<pY(rOF}KvD*Xr5QvR1Q>W2Sb%I0
L;0CIJYyJTMZh;7D