mirror of
https://github.com/google/flatbuffers.git
synced 2026-06-28 19:00:03 +00:00
avoid zero-as-null-pointer warning (#7423)
Co-authored-by: Derek Bailey <derekbailey@google.com>
This commit is contained in:
@@ -295,7 +295,7 @@ struct FieldDef : public Definition {
|
|||||||
native_inline(false),
|
native_inline(false),
|
||||||
flexbuffer(false),
|
flexbuffer(false),
|
||||||
presence(kDefault),
|
presence(kDefault),
|
||||||
nested_flatbuffer(NULL),
|
nested_flatbuffer(nullptr),
|
||||||
padding(0) {}
|
padding(0) {}
|
||||||
|
|
||||||
Offset<reflection::Field> Serialize(FlatBufferBuilder *builder, uint16_t id,
|
Offset<reflection::Field> Serialize(FlatBufferBuilder *builder, uint16_t id,
|
||||||
|
|||||||
@@ -621,7 +621,7 @@ inline flatbuffers::Offset<Monster> CreateMonster(flatbuffers::FlatBufferBuilder
|
|||||||
(void)_rehasher;
|
(void)_rehasher;
|
||||||
(void)_o;
|
(void)_o;
|
||||||
struct _VectorArgs { flatbuffers::FlatBufferBuilder *__fbb; const MonsterT* __o; const flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va;
|
struct _VectorArgs { flatbuffers::FlatBufferBuilder *__fbb; const MonsterT* __o; const flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va;
|
||||||
auto _pos = _o->pos ? _o->pos.get() : 0;
|
auto _pos = _o->pos ? _o->pos.get() : nullptr;
|
||||||
auto _mana = _o->mana;
|
auto _mana = _o->mana;
|
||||||
auto _hp = _o->hp;
|
auto _hp = _o->hp;
|
||||||
auto _name = _o->name.empty() ? 0 : _fbb.CreateString(_o->name);
|
auto _name = _o->name.empty() ? 0 : _fbb.CreateString(_o->name);
|
||||||
|
|||||||
@@ -3321,7 +3321,7 @@ class CppGenerator : public BaseGenerator {
|
|||||||
} else if (field.native_inline) {
|
} else if (field.native_inline) {
|
||||||
code += "&" + value;
|
code += "&" + value;
|
||||||
} else {
|
} else {
|
||||||
code += value + " ? " + value + GenPtrGet(field) + " : 0";
|
code += value + " ? " + value + GenPtrGet(field) + " : nullptr";
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// _o->field ? CreateT(_fbb, _o->field.get(), _rehasher);
|
// _o->field ? CreateT(_fbb, _o->field.get(), _rehasher);
|
||||||
|
|||||||
@@ -371,7 +371,7 @@ inline flatbuffers::Offset<ArrayTable> CreateArrayTable(flatbuffers::FlatBufferB
|
|||||||
(void)_rehasher;
|
(void)_rehasher;
|
||||||
(void)_o;
|
(void)_o;
|
||||||
struct _VectorArgs { flatbuffers::FlatBufferBuilder *__fbb; const ArrayTableT* __o; const flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va;
|
struct _VectorArgs { flatbuffers::FlatBufferBuilder *__fbb; const ArrayTableT* __o; const flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va;
|
||||||
auto _a = _o->a ? _o->a.get() : 0;
|
auto _a = _o->a ? _o->a.get() : nullptr;
|
||||||
return MyGame::Example::CreateArrayTable(
|
return MyGame::Example::CreateArrayTable(
|
||||||
_fbb,
|
_fbb,
|
||||||
_a);
|
_a);
|
||||||
|
|||||||
@@ -3027,7 +3027,7 @@ inline flatbuffers::Offset<Monster> CreateMonster(flatbuffers::FlatBufferBuilder
|
|||||||
(void)_rehasher;
|
(void)_rehasher;
|
||||||
(void)_o;
|
(void)_o;
|
||||||
struct _VectorArgs { flatbuffers::FlatBufferBuilder *__fbb; const MonsterT* __o; const flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va;
|
struct _VectorArgs { flatbuffers::FlatBufferBuilder *__fbb; const MonsterT* __o; const flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va;
|
||||||
auto _pos = _o->pos ? _o->pos.get() : 0;
|
auto _pos = _o->pos ? _o->pos.get() : nullptr;
|
||||||
auto _mana = _o->mana;
|
auto _mana = _o->mana;
|
||||||
auto _hp = _o->hp;
|
auto _hp = _o->hp;
|
||||||
auto _name = _fbb.CreateString(_o->name);
|
auto _name = _fbb.CreateString(_o->name);
|
||||||
|
|||||||
@@ -2966,7 +2966,7 @@ inline flatbuffers::Offset<Monster> CreateMonster(flatbuffers::FlatBufferBuilder
|
|||||||
(void)_rehasher;
|
(void)_rehasher;
|
||||||
(void)_o;
|
(void)_o;
|
||||||
struct _VectorArgs { flatbuffers::FlatBufferBuilder *__fbb; const MonsterT* __o; const flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va;
|
struct _VectorArgs { flatbuffers::FlatBufferBuilder *__fbb; const MonsterT* __o; const flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va;
|
||||||
auto _pos = _o->pos ? _o->pos.get() : 0;
|
auto _pos = _o->pos ? _o->pos.get() : nullptr;
|
||||||
auto _mana = _o->mana;
|
auto _mana = _o->mana;
|
||||||
auto _hp = _o->hp;
|
auto _hp = _o->hp;
|
||||||
auto _name = _fbb.CreateString(_o->name);
|
auto _name = _fbb.CreateString(_o->name);
|
||||||
|
|||||||
@@ -2966,7 +2966,7 @@ inline flatbuffers::Offset<Monster> CreateMonster(flatbuffers::FlatBufferBuilder
|
|||||||
(void)_rehasher;
|
(void)_rehasher;
|
||||||
(void)_o;
|
(void)_o;
|
||||||
struct _VectorArgs { flatbuffers::FlatBufferBuilder *__fbb; const MonsterT* __o; const flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va;
|
struct _VectorArgs { flatbuffers::FlatBufferBuilder *__fbb; const MonsterT* __o; const flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va;
|
||||||
auto _pos = _o->pos ? _o->pos.get() : 0;
|
auto _pos = _o->pos ? _o->pos.get() : nullptr;
|
||||||
auto _mana = _o->mana;
|
auto _mana = _o->mana;
|
||||||
auto _hp = _o->hp;
|
auto _hp = _o->hp;
|
||||||
auto _name = _fbb.CreateString(_o->name);
|
auto _name = _fbb.CreateString(_o->name);
|
||||||
|
|||||||
@@ -2966,7 +2966,7 @@ inline flatbuffers::Offset<Monster> CreateMonster(flatbuffers::FlatBufferBuilder
|
|||||||
(void)_rehasher;
|
(void)_rehasher;
|
||||||
(void)_o;
|
(void)_o;
|
||||||
struct _VectorArgs { flatbuffers::FlatBufferBuilder *__fbb; const MonsterT* __o; const flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va;
|
struct _VectorArgs { flatbuffers::FlatBufferBuilder *__fbb; const MonsterT* __o; const flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va;
|
||||||
auto _pos = _o->pos ? _o->pos.get() : 0;
|
auto _pos = _o->pos ? _o->pos.get() : nullptr;
|
||||||
auto _mana = _o->mana;
|
auto _mana = _o->mana;
|
||||||
auto _hp = _o->hp;
|
auto _hp = _o->hp;
|
||||||
auto _name = _fbb.CreateString(_o->name);
|
auto _name = _fbb.CreateString(_o->name);
|
||||||
|
|||||||
@@ -2966,7 +2966,7 @@ inline flatbuffers::Offset<Monster> CreateMonster(flatbuffers::FlatBufferBuilder
|
|||||||
(void)_rehasher;
|
(void)_rehasher;
|
||||||
(void)_o;
|
(void)_o;
|
||||||
struct _VectorArgs { flatbuffers::FlatBufferBuilder *__fbb; const MonsterT* __o; const flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va;
|
struct _VectorArgs { flatbuffers::FlatBufferBuilder *__fbb; const MonsterT* __o; const flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va;
|
||||||
auto _pos = _o->pos ? _o->pos.get() : 0;
|
auto _pos = _o->pos ? _o->pos.get() : nullptr;
|
||||||
auto _mana = _o->mana;
|
auto _mana = _o->mana;
|
||||||
auto _hp = _o->hp;
|
auto _hp = _o->hp;
|
||||||
auto _name = _fbb.CreateString(_o->name);
|
auto _name = _fbb.CreateString(_o->name);
|
||||||
|
|||||||
@@ -412,7 +412,7 @@ inline flatbuffers::Offset<TableInFirstNS> CreateTableInFirstNS(flatbuffers::Fla
|
|||||||
auto _foo_enum = _o->foo_enum;
|
auto _foo_enum = _o->foo_enum;
|
||||||
auto _foo_union_type = _o->foo_union.type;
|
auto _foo_union_type = _o->foo_union.type;
|
||||||
auto _foo_union = _o->foo_union.Pack(_fbb);
|
auto _foo_union = _o->foo_union.Pack(_fbb);
|
||||||
auto _foo_struct = _o->foo_struct ? _o->foo_struct.get() : 0;
|
auto _foo_struct = _o->foo_struct ? _o->foo_struct.get() : nullptr;
|
||||||
return NamespaceA::CreateTableInFirstNS(
|
return NamespaceA::CreateTableInFirstNS(
|
||||||
_fbb,
|
_fbb,
|
||||||
_foo_table,
|
_foo_table,
|
||||||
|
|||||||
@@ -625,7 +625,7 @@ void SizePrefixedTest() {
|
|||||||
// Create size prefixed buffer.
|
// Create size prefixed buffer.
|
||||||
flatbuffers::FlatBufferBuilder fbb;
|
flatbuffers::FlatBufferBuilder fbb;
|
||||||
FinishSizePrefixedMonsterBuffer(
|
FinishSizePrefixedMonsterBuffer(
|
||||||
fbb, CreateMonster(fbb, 0, 200, 300, fbb.CreateString("bob")));
|
fbb, CreateMonster(fbb, nullptr, 200, 300, fbb.CreateString("bob")));
|
||||||
|
|
||||||
// Verify it.
|
// Verify it.
|
||||||
flatbuffers::Verifier verifier(fbb.GetBufferPointer(), fbb.GetSize());
|
flatbuffers::Verifier verifier(fbb.GetBufferPointer(), fbb.GetSize());
|
||||||
|
|||||||
@@ -40,8 +40,8 @@ void InitTestEngine(TestFailEventListener listener) {
|
|||||||
testing_fails = 0;
|
testing_fails = 0;
|
||||||
// Disable stdout buffering to prevent information lost on assertion or core
|
// Disable stdout buffering to prevent information lost on assertion or core
|
||||||
// dump.
|
// dump.
|
||||||
setvbuf(stdout, NULL, _IONBF, 0);
|
setvbuf(stdout, nullptr, _IONBF, 0);
|
||||||
setvbuf(stderr, NULL, _IONBF, 0);
|
setvbuf(stderr, nullptr, _IONBF, 0);
|
||||||
|
|
||||||
flatbuffers::SetupDefaultCRTReportMode();
|
flatbuffers::SetupDefaultCRTReportMode();
|
||||||
|
|
||||||
|
|||||||
@@ -51,10 +51,10 @@ int CloseTestEngine(bool force_report = false);
|
|||||||
|
|
||||||
// Write captured state to a log and terminate test run.
|
// Write captured state to a log and terminate test run.
|
||||||
void TestFail(const char *expval, const char *val, const char *exp,
|
void TestFail(const char *expval, const char *val, const char *exp,
|
||||||
const char *file, int line, const char *func = 0);
|
const char *file, int line, const char *func = nullptr);
|
||||||
|
|
||||||
void TestEqStr(const char *expval, const char *val, const char *exp,
|
void TestEqStr(const char *expval, const char *val, const char *exp,
|
||||||
const char *file, int line, const char *func = 0);
|
const char *file, int line, const char *func = nullptr);
|
||||||
|
|
||||||
// Workaround for `enum class` printing.
|
// Workaround for `enum class` printing.
|
||||||
// There is an issue with the printing of enums with a fixed underlying type.
|
// There is an issue with the printing of enums with a fixed underlying type.
|
||||||
|
|||||||
Reference in New Issue
Block a user