Merge branch 'master' of https://github.com/google/flatbuffers

791c83aa · Wouter van Oortmerssen · 29d957ed · 8d8b7c19 · 791c83aa
Commit 791c83aa authored Apr 14, 2016 by Wouter van Oortmerssen
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

flatbuffers.h include/flatbuffers/flatbuffers.h +5 -2

No files found.
--- a/include/flatbuffers/flatbuffers.h
+++ b/include/flatbuffers/flatbuffers.h
@@ -1051,8 +1051,11 @@ FLATBUFFERS_FINAL_CLASS
                                      uint8_t **buf) {
    NotNested();
    StartVector(len, elemsize);
-    *buf = buf_.make_space(len * elemsize);
+    buf_.make_space(len * elemsize);
-    return EndVector(len);
+    auto vec_start = GetSize();
+    auto vec_end = EndVector(len);
+    *buf = buf_.data_at(vec_start);
+    return vec_end;
  }
  /// @brief Specialized version of `CreateVector` for non-copying use cases.