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

Fix use of min and max when Windows.h is imported (#4411)

Browse Source
This commit is contained in:
Younguk Kim
2017-08-18 01:35:50 +09:00
committed by Wouter van Oortmerssen
parent 2f2e4cced4
commit 513958ea72
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/flatbuffers/flatbuffers.h
View File

@@ -1531,7 +1531,7 @@ class FlatBufferBuilder
auto stra = reinterpret_cast<const String *>(buf_->data_at(a.o)); auto stra = reinterpret_cast<const String *>(buf_->data_at(a.o));
auto strb = reinterpret_cast<const String *>(buf_->data_at(b.o)); auto strb = reinterpret_cast<const String *>(buf_->data_at(b.o));
return strncmp(stra->c_str(), strb->c_str(), return strncmp(stra->c_str(), strb->c_str(),
std::min(stra->size(), strb->size()) + 1) < 0; (std::min)(stra->size(), strb->size()) + 1) < 0;
} }
const vector_downward *buf_; const vector_downward *buf_;
}; };
@@ -1961,7 +1961,7 @@ inline const uint8_t *GetBufferStartFromRootPointer(const void *root) {
auto table = reinterpret_cast<const Table *>(root); auto table = reinterpret_cast<const Table *>(root);
auto vtable = table->GetVTable(); auto vtable = table->GetVTable();
// Either the vtable is before the root or after the root. // Either the vtable is before the root or after the root.
auto start = std::min(vtable, reinterpret_cast<const uint8_t *>(root)); auto start = (std::min)(vtable, reinterpret_cast<const uint8_t *>(root));
// Align to at least sizeof(uoffset_t). // Align to at least sizeof(uoffset_t).
start = reinterpret_cast<const uint8_t *>( start = reinterpret_cast<const uint8_t *>(
reinterpret_cast<uintptr_t>(start) & ~(sizeof(uoffset_t) - 1)); reinterpret_cast<uintptr_t>(start) & ~(sizeof(uoffset_t) - 1));

10
include/flatbuffers/flexbuffers.h
View File

@@ -1306,7 +1306,7 @@ class Builder FLATBUFFERS_FINAL_CLASS {
BitWidth StoredWidth(BitWidth parent_bit_width_ = BIT_WIDTH_8) const { BitWidth StoredWidth(BitWidth parent_bit_width_ = BIT_WIDTH_8) const {
if (IsInline(type_)) { if (IsInline(type_)) {
return std::max(min_bit_width_, parent_bit_width_); return (std::max)(min_bit_width_, parent_bit_width_);
} else { } else {
return min_bit_width_; return min_bit_width_;
} }
@@ -1365,19 +1365,19 @@ class Builder FLATBUFFERS_FINAL_CLASS {
Value CreateVector(size_t start, size_t vec_len, size_t step, bool typed, Value CreateVector(size_t start, size_t vec_len, size_t step, bool typed,
bool fixed, const Value *keys = nullptr) { bool fixed, const Value *keys = nullptr) {
// Figure out smallest bit width we can store this vector with. // Figure out smallest bit width we can store this vector with.
auto bit_width = std::max(force_min_bit_width_, WidthU(vec_len)); auto bit_width = (std::max)(force_min_bit_width_, WidthU(vec_len));
auto prefix_elems = 1; auto prefix_elems = 1;
if (keys) { if (keys) {
// If this vector is part of a map, we will pre-fix an offset to the keys // If this vector is part of a map, we will pre-fix an offset to the keys
// to this vector. // to this vector.
bit_width = std::max(bit_width, keys->ElemWidth(buf_.size(), 0)); bit_width = (std::max)(bit_width, keys->ElemWidth(buf_.size(), 0));
prefix_elems += 2; prefix_elems += 2;
} }
Type vector_type = TYPE_KEY; Type vector_type = TYPE_KEY;
// Check bit widths and types for all elements. // Check bit widths and types for all elements.
for (size_t i = start; i < stack_.size(); i += step) { for (size_t i = start; i < stack_.size(); i += step) {
auto elem_width = stack_[i].ElemWidth(buf_.size(), i + prefix_elems); auto elem_width = stack_[i].ElemWidth(buf_.size(), i + prefix_elems);
bit_width = std::max(bit_width, elem_width); bit_width = (std::max)(bit_width, elem_width);
if (typed) { if (typed) {
if (i == start) { if (i == start) {
vector_type = stack_[i].type_; vector_type = stack_[i].type_;
@@ -1450,7 +1450,7 @@ class Builder FLATBUFFERS_FINAL_CLASS {
a.first); a.first);
auto strb = reinterpret_cast<const char *>(flatbuffers::vector_data(*buf_) + auto strb = reinterpret_cast<const char *>(flatbuffers::vector_data(*buf_) +
b.first); b.first);
return strncmp(stra, strb, std::min(a.second, b.second) + 1) < 0; return strncmp(stra, strb, (std::min)(a.second, b.second) + 1) < 0;
} }
const std::vector<uint8_t> *buf_; const std::vector<uint8_t> *buf_;
}; };