Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[C++] Allow using FLATBUFFERS_MIN_BUFFER_SIZE in other namespaces #8229

Merged
merged 2 commits into from
May 29, 2024
Merged

[C++] Allow using FLATBUFFERS_MIN_BUFFER_SIZE in other namespaces #8229

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a34a73
[C++] Allow using FLATBUFFERS_MIN_BUFFER_SIZE in other namespaces
dominiklohmann Feb 3, 2024
d8b657c
Merge branch 'master' into master
dbaileychess May 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/flatbuffers/base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,8 +346,8 @@ typedef uintmax_t largest_scalar_t;
// Includes the offset to the root table (uoffset_t), the offset to the vtable
// of the root table (soffset_t), the size of the vtable (uint16_t), and the
// size of the referring table (uint16_t).
#define FLATBUFFERS_MIN_BUFFER_SIZE sizeof(uoffset_t) + sizeof(soffset_t) + \
sizeof(uint16_t) + sizeof(uint16_t)
#define FLATBUFFERS_MIN_BUFFER_SIZE sizeof(::flatbuffers::uoffset_t) + \
sizeof(::flatbuffers::soffset_t) + sizeof(uint16_t) + sizeof(uint16_t)

// We support aligning the contents of buffers up to this size.
#ifndef FLATBUFFERS_MAX_ALIGNMENT
Expand Down
Loading