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
4cbff97c
Commit
4cbff97c
authored
Mar 25, 2019
by
Nikolay Kuznetsov
Committed by
Wouter van Oortmerssen
Mar 25, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix a warning on compiling with clang (#5258)
parent
88abae64
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
11 deletions
+11
-11
reflection_generated.h
include/flatbuffers/reflection_generated.h
+1
-1
monster_generated.h
samples/monster_generated.h
+2
-2
idl_gen_cpp.cpp
src/idl_gen_cpp.cpp
+2
-2
monster_test_generated.h
tests/monster_test_generated.h
+4
-4
namespace_test1_generated.h
tests/namespace_test/namespace_test1_generated.h
+1
-1
union_vector_generated.h
tests/union_vector/union_vector_generated.h
+1
-1
No files found.
include/flatbuffers/reflection_generated.h
View file @
4cbff97c
...
@@ -95,7 +95,7 @@ inline const char * const *EnumNamesBaseType() {
...
@@ -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
<
in
t
>
(
e
);
const
size_t
index
=
static_cast
<
size_
t
>
(
e
);
return
EnumNamesBaseType
()[
index
];
return
EnumNamesBaseType
()[
index
];
}
}
...
...
samples/monster_generated.h
View file @
4cbff97c
...
@@ -59,7 +59,7 @@ inline const char * const *EnumNamesColor() {
...
@@ -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
<
in
t
>
(
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() {
...
@@ -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
<
in
t
>
(
e
);
const
size_t
index
=
static_cast
<
size_
t
>
(
e
);
return
EnumNamesEquipment
()[
index
];
return
EnumNamesEquipment
()[
index
];
}
}
...
...
src/idl_gen_cpp.cpp
View file @
4cbff97c
...
@@ -1017,10 +1017,10 @@ class CppGenerator : public BaseGenerator {
...
@@ -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<
in
t>(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<
in
t>("
+
vals
+
")
\\
"
;
code_
+=
" - static_cast<
size_
t>("
+
vals
+
")
\\
"
;
}
}
code_
+=
";"
;
code_
+=
";"
;
...
...
tests/monster_test_generated.h
View file @
4cbff97c
...
@@ -133,7 +133,7 @@ inline const char * const *EnumNamesColor() {
...
@@ -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
<
in
t
>
(
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() {
...
@@ -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
<
in
t
>
(
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() {
...
@@ -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
<
in
t
>
(
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() {
...
@@ -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
<
in
t
>
(
e
);
const
size_t
index
=
static_cast
<
size_
t
>
(
e
);
return
EnumNamesAnyAmbiguousAliases
()[
index
];
return
EnumNamesAnyAmbiguousAliases
()[
index
];
}
}
...
...
tests/namespace_test/namespace_test1_generated.h
View file @
4cbff97c
...
@@ -46,7 +46,7 @@ inline const char * const *EnumNamesEnumInNestedNS() {
...
@@ -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
<
in
t
>
(
e
);
const
size_t
index
=
static_cast
<
size_
t
>
(
e
);
return
EnumNamesEnumInNestedNS
()[
index
];
return
EnumNamesEnumInNestedNS
()[
index
];
}
}
...
...
tests/union_vector/union_vector_generated.h
View file @
4cbff97c
...
@@ -74,7 +74,7 @@ inline const char * const *EnumNamesCharacter() {
...
@@ -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
<
in
t
>
(
e
);
const
size_t
index
=
static_cast
<
size_
t
>
(
e
);
return
EnumNamesCharacter
()[
index
];
return
EnumNamesCharacter
()[
index
];
}
}
...
...
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