Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
flatbuffers
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
flatbuffers
Commits
1d457a02
Commit
1d457a02
authored
Nov 27, 2015
by
Chris
Committed by
Wouter van Oortmerssen
Dec 02, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix use of std::max when Windows.h is imported.
parent
671c9495
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
flatbuffers.h
include/flatbuffers/flatbuffers.h
+1
-1
No files found.
include/flatbuffers/flatbuffers.h
View file @
1d457a02
...
...
@@ -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_
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment