BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-02 04:04:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #602 from chrisstaite/master

Browse Source 
Fix flatbuffers::String to std::string and import of Windows.h
This commit is contained in:
Wouter van Oortmerssen
2015-11-30 12:21:41 -08:00
parent 07da3fc216 345e8ca804
commit 6db667b6b1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/flatbuffers/flatbuffers.h
View File

@@ -379,7 +379,7 @@ template<typename T> static inline size_t VectorLength(const Vector<T> *v) {
struct String : public Vector<char> {
const char *c_str() const { return reinterpret_cast<const char *>(Data()); }
std::string str() const { return c_str(); }
std::string str() const { return std::string(c_str(), Length()); }
bool operator <(const String &o) const {
return strcmp(c_str(), o.c_str()) < 0;
@@ -445,7 +445,7 @@ class vector_downward {
if (len > static_cast<size_t>(cur_ - buf_)) {
auto old_size = size();
auto largest_align = AlignOf<largest_scalar_t>();
reserved_ += std::max(len, growth_policy(reserved_));
reserved_ += (std::max)(len, growth_policy(reserved_));
// Round up to avoid undefined behavior from unaligned loads and stores.
reserved_ = (reserved_ + (largest_align - 1)) & ~(largest_align - 1);
auto new_buf = allocator_.allocate(reserved_);