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

Fixed VS x64 warnings in flexbuffers.h

Browse Source
This commit is contained in:
Wouter van Oortmerssen
2017-02-15 17:40:24 -08:00
parent 3a2d3a232f
commit a6d98fb067
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/flatbuffers/flexbuffers.h
View File

@@ -85,7 +85,7 @@ inline bool IsFixedTypedVector(Type t) {
return t >= TYPE_VECTOR_INT2 && t <= TYPE_VECTOR_FLOAT4; return t >= TYPE_VECTOR_INT2 && t <= TYPE_VECTOR_FLOAT4;
} }
inline Type ToTypedVector(Type t, int fixed_len = 0) { inline Type ToTypedVector(Type t, size_t fixed_len = 0) {
assert(IsTypedVectorElementType(t)); assert(IsTypedVectorElementType(t));
switch (fixed_len) { switch (fixed_len) {
case 0: return static_cast<Type>(t - TYPE_INT + TYPE_VECTOR_INT); case 0: return static_cast<Type>(t - TYPE_INT + TYPE_VECTOR_INT);
@@ -601,7 +601,7 @@ class Reference {
template<typename T> bool Mutate(const uint8_t *dest, T t, size_t byte_width, template<typename T> bool Mutate(const uint8_t *dest, T t, size_t byte_width,
BitWidth value_width) { BitWidth value_width) {
auto fits = (1U << value_width) <= byte_width; auto fits = static_cast<size_t>(1U << value_width) <= byte_width;
if (fits) { if (fits) {
t = flatbuffers::EndianScalar(t); t = flatbuffers::EndianScalar(t);
memcpy(const_cast<uint8_t *>(dest), &t, byte_width); memcpy(const_cast<uint8_t *>(dest), &t, byte_width);
@@ -1082,7 +1082,7 @@ class Builder FLATBUFFERS_FINAL_CLASS {
} }
// For values T >= byte_width // For values T >= byte_width
template<typename T> void Write(T val, uint8_t byte_width) { template<typename T> void Write(T val, size_t byte_width) {
val = flatbuffers::EndianScalar(val); val = flatbuffers::EndianScalar(val);
WriteBytes(&val, byte_width); WriteBytes(&val, byte_width);
} }
@@ -1176,7 +1176,8 @@ class Builder FLATBUFFERS_FINAL_CLASS {
auto offset = offset_loc - u_; auto offset = offset_loc - u_;
// Does it fit? // Does it fit?
auto bit_width = WidthU(offset); auto bit_width = WidthU(offset);
if (1U << bit_width == byte_width) return bit_width; if (static_cast<size_t>(1U << bit_width) == byte_width)
return bit_width;
} }
assert(false); // Must match one of the sizes above. assert(false); // Must match one of the sizes above.
return BIT_WIDTH_64; return BIT_WIDTH_64;