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

Fix a warning on compiling with clang (#5258)

Browse Source
This commit is contained in:
Nikolay Kuznetsov
2019-03-25 22:06:00 +03:00
committed by Wouter van Oortmerssen
parent 88abae649c
commit 4cbff97c43
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/flatbuffers/reflection_generated.h
View File

@@ -95,7 +95,7 @@ inline const char * const *EnumNamesBaseType() {
inline const char *EnumNameBaseType(BaseType e) { inline const char *EnumNameBaseType(BaseType e) {
if (e < None || e > Union) return ""; if (e < None || e > Union) return "";
const size_t index = static_cast<int>(e); const size_t index = static_cast<size_t>(e);
return EnumNamesBaseType()[index]; return EnumNamesBaseType()[index];
} }

4
samples/monster_generated.h
View File

@@ -59,7 +59,7 @@ inline const char * const *EnumNamesColor() {
inline const char *EnumNameColor(Color e) { inline const char *EnumNameColor(Color e) {
if (e < Color_Red || e > Color_Blue) return ""; if (e < Color_Red || e > Color_Blue) return "";
const size_t index = static_cast<int>(e); const size_t index = static_cast<size_t>(e);
return EnumNamesColor()[index]; return EnumNamesColor()[index];
} }
@@ -89,7 +89,7 @@ inline const char * const *EnumNamesEquipment() {
inline const char *EnumNameEquipment(Equipment e) { inline const char *EnumNameEquipment(Equipment e) {
if (e < Equipment_NONE || e > Equipment_Weapon) return ""; if (e < Equipment_NONE || e > Equipment_Weapon) return "";
const size_t index = static_cast<int>(e); const size_t index = static_cast<size_t>(e);
return EnumNamesEquipment()[index]; return EnumNamesEquipment()[index];
} }

4
src/idl_gen_cpp.cpp
View File

@@ -1017,10 +1017,10 @@ class CppGenerator : public BaseGenerator {
" || e > " + GetEnumValUse(enum_def, *enum_def.vals.vec.back()) + " || e > " + GetEnumValUse(enum_def, *enum_def.vals.vec.back()) +
") return \"\";"; ") return \"\";";
code_ += " const size_t index = static_cast<int>(e)\\"; code_ += " const size_t index = static_cast<size_t>(e)\\";
if (enum_def.vals.vec.front()->value) { if (enum_def.vals.vec.front()->value) {
auto vals = GetEnumValUse(enum_def, *enum_def.vals.vec.front()); auto vals = GetEnumValUse(enum_def, *enum_def.vals.vec.front());
code_ += " - static_cast<int>(" + vals + ")\\"; code_ += " - static_cast<size_t>(" + vals + ")\\";
} }
code_ += ";"; code_ += ";";

8
tests/monster_test_generated.h
View File

@@ -133,7 +133,7 @@ inline const char * const *EnumNamesColor() {
inline const char *EnumNameColor(Color e) { inline const char *EnumNameColor(Color e) {
if (e < Color_Red || e > Color_Blue) return ""; if (e < Color_Red || e > Color_Blue) return "";
const size_t index = static_cast<int>(e) - static_cast<int>(Color_Red); const size_t index = static_cast<size_t>(e) - static_cast<size_t>(Color_Red);
return EnumNamesColor()[index]; return EnumNamesColor()[index];
} }
@@ -169,7 +169,7 @@ inline const char * const *EnumNamesAny() {
inline const char *EnumNameAny(Any e) { inline const char *EnumNameAny(Any e) {
if (e < Any_NONE || e > Any_MyGame_Example2_Monster) return ""; if (e < Any_NONE || e > Any_MyGame_Example2_Monster) return "";
const size_t index = static_cast<int>(e); const size_t index = static_cast<size_t>(e);
return EnumNamesAny()[index]; return EnumNamesAny()[index];
} }
@@ -310,7 +310,7 @@ inline const char * const *EnumNamesAnyUniqueAliases() {
inline const char *EnumNameAnyUniqueAliases(AnyUniqueAliases e) { inline const char *EnumNameAnyUniqueAliases(AnyUniqueAliases e) {
if (e < AnyUniqueAliases_NONE || e > AnyUniqueAliases_M2) return ""; if (e < AnyUniqueAliases_NONE || e > AnyUniqueAliases_M2) return "";
const size_t index = static_cast<int>(e); const size_t index = static_cast<size_t>(e);
return EnumNamesAnyUniqueAliases()[index]; return EnumNamesAnyUniqueAliases()[index];
} }
@@ -451,7 +451,7 @@ inline const char * const *EnumNamesAnyAmbiguousAliases() {
inline const char *EnumNameAnyAmbiguousAliases(AnyAmbiguousAliases e) { inline const char *EnumNameAnyAmbiguousAliases(AnyAmbiguousAliases e) {
if (e < AnyAmbiguousAliases_NONE || e > AnyAmbiguousAliases_M3) return ""; if (e < AnyAmbiguousAliases_NONE || e > AnyAmbiguousAliases_M3) return "";
const size_t index = static_cast<int>(e); const size_t index = static_cast<size_t>(e);
return EnumNamesAnyAmbiguousAliases()[index]; return EnumNamesAnyAmbiguousAliases()[index];
} }

2
tests/namespace_test/namespace_test1_generated.h
View File

@@ -46,7 +46,7 @@ inline const char * const *EnumNamesEnumInNestedNS() {
inline const char *EnumNameEnumInNestedNS(EnumInNestedNS e) { inline const char *EnumNameEnumInNestedNS(EnumInNestedNS e) {
if (e < EnumInNestedNS_A || e > EnumInNestedNS_C) return ""; if (e < EnumInNestedNS_A || e > EnumInNestedNS_C) return "";
const size_t index = static_cast<int>(e); const size_t index = static_cast<size_t>(e);
return EnumNamesEnumInNestedNS()[index]; return EnumNamesEnumInNestedNS()[index];
} }

2
tests/union_vector/union_vector_generated.h
View File

@@ -74,7 +74,7 @@ inline const char * const *EnumNamesCharacter() {
inline const char *EnumNameCharacter(Character e) { inline const char *EnumNameCharacter(Character e) {
if (e < Character_NONE || e > Character_Unused) return ""; if (e < Character_NONE || e > Character_Unused) return "";
const size_t index = static_cast<int>(e); const size_t index = static_cast<size_t>(e);
return EnumNamesCharacter()[index]; return EnumNamesCharacter()[index];
} }