BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-07-03 15:44:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix unused field warning in clang.

Browse Source 
Change-Id: I71d590a1e5b2709f0e2dcf97faaebda5cb918fc7
Tested: on Linux.
This commit is contained in:
Wouter van Oortmerssen
2017-01-13 18:30:57 -08:00
parent 7b94eab2b1
commit 19101826a8
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/idl_gen_cpp.cpp
View File

@@ -1621,6 +1621,11 @@ class CppGenerator : public BaseGenerator {
NumToString((*id)++) + "__;"; NumToString((*id)++) + "__;";
} }
static void PaddingDeclaration(int bits, std::string *code_ptr, int *id) {
(void)bits;
*code_ptr += "(void)padding" + NumToString((*id)++) + "__;";
}
static void PaddingInitializer(int bits, std::string *code_ptr, int *id) { static void PaddingInitializer(int bits, std::string *code_ptr, int *id) {
(void)bits; (void)bits;
*code_ptr += ",\n padding" + NumToString((*id)++) + "__(0)"; *code_ptr += ",\n padding" + NumToString((*id)++) + "__(0)";
@@ -1702,10 +1707,20 @@ class CppGenerator : public BaseGenerator {
} }
} }
padding_id = 0;
std::string padding_list;
for (auto it = struct_def.fields.vec.begin();
it != struct_def.fields.vec.end(); ++it) {
auto field = *it;
GenPadding(*field, &padding_list, &padding_id, PaddingDeclaration);
}
code_.SetValue("ARG_LIST", arg_list); code_.SetValue("ARG_LIST", arg_list);
code_.SetValue("INIT_LIST", init_list); code_.SetValue("INIT_LIST", init_list);
code_.SetValue("PADDING_LIST", padding_list);
code_ += " {{STRUCT_NAME}}({{ARG_LIST}})"; code_ += " {{STRUCT_NAME}}({{ARG_LIST}})";
code_ += " : {{INIT_LIST}} {"; code_ += " : {{INIT_LIST}} {";
if (padding_list.length()) code_ += " {{PADDING_LIST}}";
code_ += " }"; code_ += " }";
// Generate accessor methods of the form: // Generate accessor methods of the form:

2
tests/monster_test_generated.h
View File

@@ -154,6 +154,7 @@ MANUALLY_ALIGNED_STRUCT(2) Test FLATBUFFERS_FINAL_CLASS {
: a_(flatbuffers::EndianScalar(_a)), : a_(flatbuffers::EndianScalar(_a)),
b_(flatbuffers::EndianScalar(_b)), b_(flatbuffers::EndianScalar(_b)),
padding0__(0) { padding0__(0) {
(void)padding0__;
} }
int16_t a() const { int16_t a() const {
return flatbuffers::EndianScalar(a_); return flatbuffers::EndianScalar(a_);
@@ -199,6 +200,7 @@ MANUALLY_ALIGNED_STRUCT(16) Vec3 FLATBUFFERS_FINAL_CLASS {
padding1__(0), padding1__(0),
test3_(_test3), test3_(_test3),
padding2__(0) { padding2__(0) {
(void)padding0__;(void)padding1__;(void)padding2__;
} }
float x() const { float x() const {
return flatbuffers::EndianScalar(x_); return flatbuffers::EndianScalar(x_);