Merge changes Id7618e53,Ieddc3c5c into ub-games-master

* changes:
  non-generic version of CreateUninitializedVector for c ffi
  cast literal to csize to fix error
This commit is contained in:
Wouter van Oortmerssen
2015-01-07 19:25:58 +00:00
committed by Android (Google) Code Review
2 changed files with 9 additions and 5 deletions

View File

@@ -137,7 +137,7 @@ void AccessFlatBufferTest(const std::string &flatbuf) {
TEST_EQ(pos->test3().b(), 20);
auto inventory = monster->inventory();
TEST_EQ(VectorLength(inventory), 10); // Works even if inventory is null.
TEST_EQ(VectorLength(inventory), 10UL); // Works even if inventory is null.
TEST_NOTNULL(inventory);
unsigned char inv_data[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
for (auto it = inventory->begin(); it != inventory->end(); ++it)