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

Add move constructor to generated union class. (#4167)

Browse Source 
* Add move constructor to generated union class.

* Unused default

* Add generated code
This commit is contained in:
水樹素子
2017-02-11 03:32:34 +09:00
committed by Wouter van Oortmerssen
parent c7c4bbfce2
commit b7bfecb4ee
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/monster_generated.h
View File

@@ -74,6 +74,8 @@ struct EquipmentUnion {
flatbuffers::NativeTable *table; flatbuffers::NativeTable *table;
EquipmentUnion() : type(Equipment_NONE), table(nullptr) {} EquipmentUnion() : type(Equipment_NONE), table(nullptr) {}
EquipmentUnion(EquipmentUnion&& u):
type(std::move(u.type)), table(std::move(u.table)) {}
EquipmentUnion(const EquipmentUnion &); EquipmentUnion(const EquipmentUnion &);
EquipmentUnion &operator=(const EquipmentUnion &); EquipmentUnion &operator=(const EquipmentUnion &);
~EquipmentUnion() { Reset(); } ~EquipmentUnion() { Reset(); }

2
src/idl_gen_cpp.cpp
View File

@@ -650,6 +650,8 @@ class CppGenerator : public BaseGenerator {
code_ += " flatbuffers::NativeTable *table;"; code_ += " flatbuffers::NativeTable *table;";
code_ += ""; code_ += "";
code_ += " {{NAME}}Union() : type({{NONE}}), table(nullptr) {}"; code_ += " {{NAME}}Union() : type({{NONE}}), table(nullptr) {}";
code_ += " {{NAME}}Union({{NAME}}Union&& u):";
code_ += " type(std::move(u.type)), table(std::move(u.table)) {}";
code_ += " {{NAME}}Union(const {{NAME}}Union &);"; code_ += " {{NAME}}Union(const {{NAME}}Union &);";
code_ += " {{NAME}}Union &operator=(const {{NAME}}Union &);"; code_ += " {{NAME}}Union &operator=(const {{NAME}}Union &);";
code_ += " ~{{NAME}}Union() { Reset(); }"; code_ += " ~{{NAME}}Union() { Reset(); }";

2
tests/monster_test_generated.h
View File

@@ -103,6 +103,8 @@ struct AnyUnion {
flatbuffers::NativeTable *table; flatbuffers::NativeTable *table;
AnyUnion() : type(Any_NONE), table(nullptr) {} AnyUnion() : type(Any_NONE), table(nullptr) {}
AnyUnion(AnyUnion&& u):
type(std::move(u.type)), table(std::move(u.table)) {}
AnyUnion(const AnyUnion &); AnyUnion(const AnyUnion &);
AnyUnion &operator=(const AnyUnion &); AnyUnion &operator=(const AnyUnion &);
~AnyUnion() { Reset(); } ~AnyUnion() { Reset(); }