Rooba
/
flatbuffers
mirror of https://github.com/google/flatbuffers.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #311 from chobie/dont-hide-function-parameter-vs2015 

Don't hide function parameter
This commit is contained in:
Wouter van Oortmerssen 2015-11-09 09:22:30 -08:00
parent 3f79e05585 721d21923e
commit b0b39543de
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/idl_parser.cpp
View File

@ -625,19 +625,19 @@ uoffset_t Parser::ParseTable(const StructDef &struct_def, std::string *value) {
// Go through elements in reverse, since we're building the data backwards. // Go through elements in reverse, since we're building the data backwards.
for (auto it = field_stack_.rbegin(); for (auto it = field_stack_.rbegin();
it != field_stack_.rbegin() + fieldn; ++it) { it != field_stack_.rbegin() + fieldn; ++it) {
auto &value = it->first; auto &field_value = it->first;
auto field = it->second; auto field = it->second;
if (!struct_def.sortbysize || size == SizeOf(value.type.base_type)) { if (!struct_def.sortbysize || size == SizeOf(field_value.type.base_type)) {
switch (value.type.base_type) { switch (field_value.type.base_type) {
#define FLATBUFFERS_TD(ENUM, IDLTYPE, CTYPE, JTYPE, GTYPE, NTYPE, \ #define FLATBUFFERS_TD(ENUM, IDLTYPE, CTYPE, JTYPE, GTYPE, NTYPE, \
PTYPE) \ PTYPE) \
case BASE_TYPE_ ## ENUM: \ case BASE_TYPE_ ## ENUM: \
builder_.Pad(field->padding); \ builder_.Pad(field->padding); \
if (struct_def.fixed) { \ if (struct_def.fixed) { \
builder_.PushElement(atot<CTYPE>(value.constant.c_str())); \ builder_.PushElement(atot<CTYPE>(field_value.constant.c_str())); \
} else { \ } else { \
builder_.AddElement(value.offset, \ builder_.AddElement(field_value.offset, \
atot<CTYPE>( value.constant.c_str()), \ atot<CTYPE>( field_value.constant.c_str()), \
atot<CTYPE>(field->value.constant.c_str())); \ atot<CTYPE>(field->value.constant.c_str())); \
} \ } \
break; break;
@ -648,10 +648,10 @@ uoffset_t Parser::ParseTable(const StructDef &struct_def, std::string *value) {
case BASE_TYPE_ ## ENUM: \ case BASE_TYPE_ ## ENUM: \
builder_.Pad(field->padding); \ builder_.Pad(field->padding); \
if (IsStruct(field->value.type)) { \ if (IsStruct(field->value.type)) { \
SerializeStruct(*field->value.type.struct_def, value); \ SerializeStruct(*field->value.type.struct_def, field_value); \
} else { \ } else { \
builder_.AddOffset(value.offset, \ builder_.AddOffset(field_value.offset, \
atot<CTYPE>(value.constant.c_str())); \ atot<CTYPE>(field_value.constant.c_str())); \
} \ } \
break; break;
FLATBUFFERS_GEN_TYPES_POINTER(FLATBUFFERS_TD); FLATBUFFERS_GEN_TYPES_POINTER(FLATBUFFERS_TD);