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

[C++] Use nullptr instead of 0 in generated headers (#6762)

Browse Source
This commit is contained in:
mogemimi
2021-08-03 05:41:15 +09:00
committed by GitHub
parent 775c6567d1
commit c39fc9dd9c
8 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/monster_generated.h
View File

@@ -390,7 +390,7 @@ struct MonsterBuilder {
inline flatbuffers::Offset<Monster> CreateMonster( inline flatbuffers::Offset<Monster> CreateMonster(
flatbuffers::FlatBufferBuilder &_fbb, flatbuffers::FlatBufferBuilder &_fbb,
const MyGame::Sample::Vec3 *pos = 0, const MyGame::Sample::Vec3 *pos = nullptr,
int16_t mana = 150, int16_t mana = 150,
int16_t hp = 100, int16_t hp = 100,
flatbuffers::Offset<flatbuffers::String> name = 0, flatbuffers::Offset<flatbuffers::String> name = 0,
@@ -416,7 +416,7 @@ inline flatbuffers::Offset<Monster> CreateMonster(
inline flatbuffers::Offset<Monster> CreateMonsterDirect( inline flatbuffers::Offset<Monster> CreateMonsterDirect(
flatbuffers::FlatBufferBuilder &_fbb, flatbuffers::FlatBufferBuilder &_fbb,
const MyGame::Sample::Vec3 *pos = 0, const MyGame::Sample::Vec3 *pos = nullptr,
int16_t mana = 150, int16_t mana = 150,
int16_t hp = 100, int16_t hp = 100,
const char *name = nullptr, const char *name = nullptr,

2
src/idl_gen_cpp.cpp
View File

@@ -1683,6 +1683,8 @@ class CppGenerator : public BaseGenerator {
} else { } else {
return "0"; return "0";
} }
} else if (IsStruct(type) && (field.value.constant == "0")) {
return "nullptr";
} else { } else {
return GenDefaultConstant(field); return GenDefaultConstant(field);
} }

2
tests/arrays_test_generated.h
View File

@@ -312,7 +312,7 @@ struct ArrayTableBuilder {
inline flatbuffers::Offset<ArrayTable> CreateArrayTable( inline flatbuffers::Offset<ArrayTable> CreateArrayTable(
flatbuffers::FlatBufferBuilder &_fbb, flatbuffers::FlatBufferBuilder &_fbb,
const MyGame::Example::ArrayStruct *a = 0) { const MyGame::Example::ArrayStruct *a = nullptr) {
ArrayTableBuilder builder_(_fbb); ArrayTableBuilder builder_(_fbb);
builder_.add_a(a); builder_.add_a(a);
return builder_.Finish(); return builder_.Finish();

4
tests/cpp17/generated_cpp17/monster_test_generated.h
View File

@@ -1947,7 +1947,7 @@ struct MonsterBuilder {
inline flatbuffers::Offset<Monster> CreateMonster( inline flatbuffers::Offset<Monster> CreateMonster(
flatbuffers::FlatBufferBuilder &_fbb, flatbuffers::FlatBufferBuilder &_fbb,
const MyGame::Example::Vec3 *pos = 0, const MyGame::Example::Vec3 *pos = nullptr,
int16_t mana = 150, int16_t mana = 150,
int16_t hp = 100, int16_t hp = 100,
flatbuffers::Offset<flatbuffers::String> name = 0, flatbuffers::Offset<flatbuffers::String> name = 0,
@@ -2115,7 +2115,7 @@ struct Monster::Traits {
inline flatbuffers::Offset<Monster> CreateMonsterDirect( inline flatbuffers::Offset<Monster> CreateMonsterDirect(
flatbuffers::FlatBufferBuilder &_fbb, flatbuffers::FlatBufferBuilder &_fbb,
const MyGame::Example::Vec3 *pos = 0, const MyGame::Example::Vec3 *pos = nullptr,
int16_t mana = 150, int16_t mana = 150,
int16_t hp = 100, int16_t hp = 100,
const char *name = nullptr, const char *name = nullptr,

4
tests/evolution_test/evolution_v1_generated.h
View File

@@ -394,7 +394,7 @@ inline flatbuffers::Offset<Root> CreateRoot(
flatbuffers::Offset<void> c = 0, flatbuffers::Offset<void> c = 0,
Evolution::V1::Enum d = Evolution::V1::Enum::King, Evolution::V1::Enum d = Evolution::V1::Enum::King,
flatbuffers::Offset<Evolution::V1::TableA> e = 0, flatbuffers::Offset<Evolution::V1::TableA> e = 0,
const Evolution::V1::Struct *f = 0, const Evolution::V1::Struct *f = nullptr,
flatbuffers::Offset<flatbuffers::Vector<int32_t>> g = 0, flatbuffers::Offset<flatbuffers::Vector<int32_t>> g = 0,
flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<Evolution::V1::TableB>>> h = 0, flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<Evolution::V1::TableB>>> h = 0,
int32_t i = 1234, int32_t i = 1234,
@@ -424,7 +424,7 @@ inline flatbuffers::Offset<Root> CreateRootDirect(
flatbuffers::Offset<void> c = 0, flatbuffers::Offset<void> c = 0,
Evolution::V1::Enum d = Evolution::V1::Enum::King, Evolution::V1::Enum d = Evolution::V1::Enum::King,
flatbuffers::Offset<Evolution::V1::TableA> e = 0, flatbuffers::Offset<Evolution::V1::TableA> e = 0,
const Evolution::V1::Struct *f = 0, const Evolution::V1::Struct *f = nullptr,
const std::vector<int32_t> *g = nullptr, const std::vector<int32_t> *g = nullptr,
const std::vector<flatbuffers::Offset<Evolution::V1::TableB>> *h = nullptr, const std::vector<flatbuffers::Offset<Evolution::V1::TableB>> *h = nullptr,
int32_t i = 1234, int32_t i = 1234,

4
tests/evolution_test/evolution_v2_generated.h
View File

@@ -480,7 +480,7 @@ inline flatbuffers::Offset<Root> CreateRoot(
flatbuffers::Offset<void> c = 0, flatbuffers::Offset<void> c = 0,
Evolution::V2::Enum d = Evolution::V2::Enum::King, Evolution::V2::Enum d = Evolution::V2::Enum::King,
flatbuffers::Offset<Evolution::V2::TableA> e = 0, flatbuffers::Offset<Evolution::V2::TableA> e = 0,
const Evolution::V2::Struct *ff = 0, const Evolution::V2::Struct *ff = nullptr,
flatbuffers::Offset<flatbuffers::Vector<int32_t>> g = 0, flatbuffers::Offset<flatbuffers::Vector<int32_t>> g = 0,
flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<Evolution::V2::TableB>>> h = 0, flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<Evolution::V2::TableB>>> h = 0,
uint32_t i = 1234, uint32_t i = 1234,
@@ -508,7 +508,7 @@ inline flatbuffers::Offset<Root> CreateRootDirect(
flatbuffers::Offset<void> c = 0, flatbuffers::Offset<void> c = 0,
Evolution::V2::Enum d = Evolution::V2::Enum::King, Evolution::V2::Enum d = Evolution::V2::Enum::King,
flatbuffers::Offset<Evolution::V2::TableA> e = 0, flatbuffers::Offset<Evolution::V2::TableA> e = 0,
const Evolution::V2::Struct *ff = 0, const Evolution::V2::Struct *ff = nullptr,
const std::vector<int32_t> *g = nullptr, const std::vector<int32_t> *g = nullptr,
const std::vector<flatbuffers::Offset<Evolution::V2::TableB>> *h = nullptr, const std::vector<flatbuffers::Offset<Evolution::V2::TableB>> *h = nullptr,
uint32_t i = 1234, uint32_t i = 1234,

4
tests/monster_test_generated.h
View File

@@ -1887,7 +1887,7 @@ struct MonsterBuilder {
inline flatbuffers::Offset<Monster> CreateMonster( inline flatbuffers::Offset<Monster> CreateMonster(
flatbuffers::FlatBufferBuilder &_fbb, flatbuffers::FlatBufferBuilder &_fbb,
const MyGame::Example::Vec3 *pos = 0, const MyGame::Example::Vec3 *pos = nullptr,
int16_t mana = 150, int16_t mana = 150,
int16_t hp = 100, int16_t hp = 100,
flatbuffers::Offset<flatbuffers::String> name = 0, flatbuffers::Offset<flatbuffers::String> name = 0,
@@ -1993,7 +1993,7 @@ inline flatbuffers::Offset<Monster> CreateMonster(
inline flatbuffers::Offset<Monster> CreateMonsterDirect( inline flatbuffers::Offset<Monster> CreateMonsterDirect(
flatbuffers::FlatBufferBuilder &_fbb, flatbuffers::FlatBufferBuilder &_fbb,
const MyGame::Example::Vec3 *pos = 0, const MyGame::Example::Vec3 *pos = nullptr,
int16_t mana = 150, int16_t mana = 150,
int16_t hp = 100, int16_t hp = 100,
const char *name = nullptr, const char *name = nullptr,

2
tests/namespace_test/namespace_test2_generated.h
View File

@@ -171,7 +171,7 @@ inline flatbuffers::Offset<TableInFirstNS> CreateTableInFirstNS(
NamespaceA::NamespaceB::EnumInNestedNS foo_enum = NamespaceA::NamespaceB::EnumInNestedNS_A, NamespaceA::NamespaceB::EnumInNestedNS foo_enum = NamespaceA::NamespaceB::EnumInNestedNS_A,
NamespaceA::NamespaceB::UnionInNestedNS foo_union_type = NamespaceA::NamespaceB::UnionInNestedNS_NONE, NamespaceA::NamespaceB::UnionInNestedNS foo_union_type = NamespaceA::NamespaceB::UnionInNestedNS_NONE,
flatbuffers::Offset<void> foo_union = 0, flatbuffers::Offset<void> foo_union = 0,
const NamespaceA::NamespaceB::StructInNestedNS *foo_struct = 0) { const NamespaceA::NamespaceB::StructInNestedNS *foo_struct = nullptr) {
TableInFirstNSBuilder builder_(_fbb); TableInFirstNSBuilder builder_(_fbb);
builder_.add_foo_struct(foo_struct); builder_.add_foo_struct(foo_struct);
builder_.add_foo_union(foo_union); builder_.add_foo_union(foo_union);