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

Fixes for VS 2015 build.

Browse Source 
Change-Id: I23280e611163a89b8eba7b9b0016c297fea2396e
This commit is contained in:
Wouter van Oortmerssen
2017-04-24 10:29:25 -07:00
parent 0c80b3a7cc
commit e93a5652d0
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@@ -146,7 +146,8 @@ elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
elseif(MSVC) elseif(MSVC)
# Visual Studio pedantic build settings # Visual Studio pedantic build settings
# warning C4512: assignment operator could not be generated # 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() endif()
if(FLATBUFFERS_CODE_COVERAGE) if(FLATBUFFERS_CODE_COVERAGE)

2
include/flatbuffers/flexbuffers.h
View File

@@ -1281,7 +1281,7 @@ class Builder FLATBUFFERS_FINAL_CLASS {
// Write vector. First the keys width/offset if available, and size. // Write vector. First the keys width/offset if available, and size.
if (keys) { if (keys) {
WriteOffset(keys->u_, byte_width); 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); if (!fixed) Write<uint64_t>(vec_len, byte_width);
// Then the actual data. // Then the actual data.