Skip to content

F
flatbuffers
Commit e93a5652 authored by Wouter van Oortmerssen's avatar Wouter van Oortmerssen
Browse files
Options

Fixes for VS 2015 build. 

Change-Id: I23280e611163a89b8eba7b9b0016c297fea2396e
parent 0c80b3a7
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
CMakeLists.txt
View file @ e93a5652
......@@ -146,7 +146,8 @@ elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
elseif(MSVC)
# Visual Studio pedantic build settings
# warning C4512: assignment operator could not be generated
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /WX /wd4512")
# warning C4316: object allocated on the heap may not be aligned
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /WX /wd4512 /wd4316")
endif()
if(FLATBUFFERS_CODE_COVERAGE)
......
include/flatbuffers/flexbuffers.h
View file @ e93a5652
......@@ -1281,7 +1281,7 @@ class Builder FLATBUFFERS_FINAL_CLASS {
// Write vector. First the keys width/offset if available, and size.
if (keys) {
WriteOffset(keys->u_, byte_width);
Write<uint64_t>(1U << keys->min_bit_width_, byte_width);
Write<uint64_t>(1ULL << keys->min_bit_width_, byte_width);
}
if (!fixed) Write<uint64_t>(vec_len, byte_width);
// Then the actual data.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment