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

[Fix #5112] flatc generates constructors with memset for non-trivial types (#5222)

Browse Source
This commit is contained in:
Laurent Stacul
2019-03-04 20:10:18 +01:00
committed by Wouter van Oortmerssen
parent 13c9c674fd
commit 2e865f4d4e
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/monster_generated.h
View File

@@ -166,7 +166,7 @@ FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) Vec3 FLATBUFFERS_FINAL_CLASS {
public: public:
Vec3() { Vec3() {
memset(this, 0, sizeof(Vec3)); memset(static_cast<void *>(this), 0, sizeof(Vec3));
} }
Vec3(float _x, float _y, float _z) Vec3(float _x, float _y, float _z)
: x_(flatbuffers::EndianScalar(_x)), : x_(flatbuffers::EndianScalar(_x)),

2
src/idl_gen_cpp.cpp
View File

@@ -2617,7 +2617,7 @@ class CppGenerator : public BaseGenerator {
// Generate a default constructor. // Generate a default constructor.
code_ += " {{STRUCT_NAME}}() {"; code_ += " {{STRUCT_NAME}}() {";
code_ += " memset(this, 0, sizeof({{STRUCT_NAME}}));"; code_ += " memset(static_cast<void *>(this), 0, sizeof({{STRUCT_NAME}}));";
code_ += " }"; code_ += " }";
// Generate a constructor that takes all fields as arguments. // Generate a constructor that takes all fields as arguments.

6
tests/monster_test_generated.h
View File

@@ -516,7 +516,7 @@ FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(2) Test FLATBUFFERS_FINAL_CLASS {
public: public:
Test() { Test() {
memset(this, 0, sizeof(Test)); memset(static_cast<void *>(this), 0, sizeof(Test));
} }
Test(int16_t _a, int8_t _b) Test(int16_t _a, int8_t _b)
: a_(flatbuffers::EndianScalar(_a)), : a_(flatbuffers::EndianScalar(_a)),
@@ -559,7 +559,7 @@ FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(8) Vec3 FLATBUFFERS_FINAL_CLASS {
public: public:
Vec3() { Vec3() {
memset(this, 0, sizeof(Vec3)); memset(static_cast<void *>(this), 0, sizeof(Vec3));
} }
Vec3(float _x, float _y, float _z, double _test1, Color _test2, const Test &_test3) Vec3(float _x, float _y, float _z, double _test1, Color _test2, const Test &_test3)
: x_(flatbuffers::EndianScalar(_x)), : x_(flatbuffers::EndianScalar(_x)),
@@ -631,7 +631,7 @@ FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) Ability FLATBUFFERS_FINAL_CLASS {
public: public:
Ability() { Ability() {
memset(this, 0, sizeof(Ability)); memset(static_cast<void *>(this), 0, sizeof(Ability));
} }
Ability(uint32_t _id, uint32_t _distance) Ability(uint32_t _id, uint32_t _distance)
: id_(flatbuffers::EndianScalar(_id)), : id_(flatbuffers::EndianScalar(_id)),

2
tests/namespace_test/namespace_test1_generated.h
View File

@@ -57,7 +57,7 @@ FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) StructInNestedNS FLATBUFFERS_FINAL_CLASS
public: public:
StructInNestedNS() { StructInNestedNS() {
memset(this, 0, sizeof(StructInNestedNS)); memset(static_cast<void *>(this), 0, sizeof(StructInNestedNS));
} }
StructInNestedNS(int32_t _a, int32_t _b) StructInNestedNS(int32_t _a, int32_t _b)
: a_(flatbuffers::EndianScalar(_a)), : a_(flatbuffers::EndianScalar(_a)),

4
tests/union_vector/union_vector_generated.h
View File

@@ -189,7 +189,7 @@ FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) Rapunzel FLATBUFFERS_FINAL_CLASS {
public: public:
Rapunzel() { Rapunzel() {
memset(this, 0, sizeof(Rapunzel)); memset(static_cast<void *>(this), 0, sizeof(Rapunzel));
} }
Rapunzel(int32_t _hair_length) Rapunzel(int32_t _hair_length)
: hair_length_(flatbuffers::EndianScalar(_hair_length)) { : hair_length_(flatbuffers::EndianScalar(_hair_length)) {
@@ -214,7 +214,7 @@ FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) BookReader FLATBUFFERS_FINAL_CLASS {
public: public:
BookReader() { BookReader() {
memset(this, 0, sizeof(BookReader)); memset(static_cast<void *>(this), 0, sizeof(BookReader));
} }
BookReader(int32_t _books_read) BookReader(int32_t _books_read)
: books_read_(flatbuffers::EndianScalar(_books_read)) { : books_read_(flatbuffers::EndianScalar(_books_read)) {