From: Alex Ames <amablue@google.com>
Date: Tue, 17 Feb 2015 22:58:04 +0000 (+0000)
Subject: Merge "Added the hash attribute to ints and longs." into ub-games-master
X-Git-Tag: v1.1.0~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c243aa4e15ec2b49ba42d7d01cd41efa728fe880;p=platform%2Fupstream%2Fflatbuffers.git

Merge "Added the hash attribute to ints and longs." into ub-games-master
---

c243aa4e15ec2b49ba42d7d01cd41efa728fe880
diff --cc tests/monster_test_generated.h
index 74bd0d8,6ac579b..2364c01
--- a/tests/monster_test_generated.h
+++ b/tests/monster_test_generated.h
@@@ -138,9 -138,13 +138,13 @@@ struct Monster FLATBUFFERS_FINAL_CLASS 
    const flatbuffers::Vector<flatbuffers::Offset<Monster>> *testarrayoftables() const { return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<Monster>> *>(26); }
    const Monster *enemy() const { return GetPointer<const Monster *>(28); }
    const flatbuffers::Vector<uint8_t> *testnestedflatbuffer() const { return GetPointer<const flatbuffers::Vector<uint8_t> *>(30); }
 -  const Monster *testnestedflatbuffer_nested_root() { return flatbuffers::GetRoot<Monster>(testnestedflatbuffer()->Data()); }
 +  const Monster *testnestedflatbuffer_nested_root() const { return flatbuffers::GetRoot<Monster>(testnestedflatbuffer()->Data()); }
    const Stat *testempty() const { return GetPointer<const Stat *>(32); }
    uint8_t testbool() const { return GetField<uint8_t>(34, 0); }
+   int32_t testhashs32_fnv1() const { return GetField<int32_t>(36, 0); }
+   uint32_t testhashu32_fnv1() const { return GetField<uint32_t>(38, 0); }
+   int64_t testhashs64_fnv1() const { return GetField<int64_t>(40, 0); }
+   uint64_t testhashu64_fnv1() const { return GetField<uint64_t>(42, 0); }
    bool Verify(flatbuffers::Verifier &verifier) const {
      return VerifyTableStart(verifier) &&
             VerifyField<Vec3>(verifier, 4 /* pos */) &&