BigfootDev/flatbuffers-bigfoot
1
0
Fork 0
forked from BigfootDev/flatbuffers
Code Pull Requests Activity

Fixed .proto translation making scalars into required fields.

Browse Source 
Change-Id: If414d156b4e9bc7fead5f131823b2c419cdc4e2c
Tested: on Linux.
This commit is contained in:
Wouter van Oortmerssen
2015-09-25 09:21:31 -07:00
parent 811a5c3389
commit feb4816610
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/monster_generated.h
View File

@@ -23,7 +23,7 @@ inline const char **EnumNamesColor() {
return names;
}
inline const char *EnumNameColor(Color e) { return EnumNamesColor()[e]; }
inline const char *EnumNameColor(Color e) { return EnumNamesColor()[static_cast<int>(e)]; }
enum Any {
Any_NONE = 0,
@@ -35,7 +35,7 @@ inline const char **EnumNamesAny() {
return names;
}
inline const char *EnumNameAny(Any e) { return EnumNamesAny()[e]; }
inline const char *EnumNameAny(Any e) { return EnumNamesAny()[static_cast<int>(e)]; }
inline bool VerifyAny(flatbuffers::Verifier &verifier, const void *union_obj, Any type);

2
src/idl_parser.cpp
View File

@@ -1080,7 +1080,7 @@ void Parser::ParseProtoDecl() {
Expect(kTokenIntegerConstant);
auto &field = AddField(struct_def, name, type);
field.doc_comment = field_comment;
field.required = required;
if (!IsScalar(type.base_type)) field.required = required;
// See if there's a default specified.
if (IsNext('[')) {
if (attribute_ != "default") Error("\'default\' expected");

4
tests/monster_test_generated.h
View File

@@ -31,7 +31,7 @@ inline const char **EnumNamesColor() {
return names;
}
inline const char *EnumNameColor(Color e) { return EnumNamesColor()[e - Color_Red]; }
inline const char *EnumNameColor(Color e) { return EnumNamesColor()[static_cast<int>(e) - static_cast<int>(Color_Red)]; }
enum Any {
Any_NONE = 0,
@@ -44,7 +44,7 @@ inline const char **EnumNamesAny() {
return names;
}
inline const char *EnumNameAny(Any e) { return EnumNamesAny()[e]; }
inline const char *EnumNameAny(Any e) { return EnumNamesAny()[static_cast<int>(e)]; }
inline bool VerifyAny(flatbuffers::Verifier &verifier, const void *union_obj, Any type);