From 7798be3bb61ab10bfa6ac90f733c73aa3bab06cd Mon Sep 17 00:00:00 2001 From: sssooonnnggg Date: Tue, 9 Aug 2022 12:32:13 +0800 Subject: [PATCH] avoid zero-as-null-pointer warning (#7423) Co-authored-by: Derek Bailey --- include/flatbuffers/idl.h | 2 +- samples/monster_generated.h | 2 +- src/idl_gen_cpp.cpp | 2 +- tests/arrays_test_generated.h | 2 +- tests/cpp17/generated_cpp17/monster_test_generated.h | 2 +- tests/monster_test_generated.h | 2 +- tests/monster_test_suffix/ext_only/monster_test_generated.hpp | 2 +- .../monster_test_suffix/filesuffix_only/monster_test_suffix.h | 2 +- tests/monster_test_suffix/monster_test_suffix.hpp | 2 +- tests/namespace_test/namespace_test2_generated.h | 2 +- tests/test.cpp | 2 +- tests/test_assert.cpp | 4 ++-- tests/test_assert.h | 4 ++-- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/flatbuffers/idl.h b/include/flatbuffers/idl.h index baf4ae39d..03de2a692 100644 --- a/include/flatbuffers/idl.h +++ b/include/flatbuffers/idl.h @@ -295,7 +295,7 @@ struct FieldDef : public Definition { native_inline(false), flexbuffer(false), presence(kDefault), - nested_flatbuffer(NULL), + nested_flatbuffer(nullptr), padding(0) {} Offset Serialize(FlatBufferBuilder *builder, uint16_t id, diff --git a/samples/monster_generated.h b/samples/monster_generated.h index 612b40586..6030a8313 100644 --- a/samples/monster_generated.h +++ b/samples/monster_generated.h @@ -621,7 +621,7 @@ inline flatbuffers::Offset CreateMonster(flatbuffers::FlatBufferBuilder (void)_rehasher; (void)_o; 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 _hp = _o->hp; auto _name = _o->name.empty() ? 0 : _fbb.CreateString(_o->name); diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp index 2fa6409e6..64e9cddc8 100644 --- a/src/idl_gen_cpp.cpp +++ b/src/idl_gen_cpp.cpp @@ -3321,7 +3321,7 @@ class CppGenerator : public BaseGenerator { } else if (field.native_inline) { code += "&" + value; } else { - code += value + " ? " + value + GenPtrGet(field) + " : 0"; + code += value + " ? " + value + GenPtrGet(field) + " : nullptr"; } } else { // _o->field ? CreateT(_fbb, _o->field.get(), _rehasher); diff --git a/tests/arrays_test_generated.h b/tests/arrays_test_generated.h index b0f6f488b..a7204c95c 100644 --- a/tests/arrays_test_generated.h +++ b/tests/arrays_test_generated.h @@ -371,7 +371,7 @@ inline flatbuffers::Offset CreateArrayTable(flatbuffers::FlatBufferB (void)_rehasher; (void)_o; 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( _fbb, _a); diff --git a/tests/cpp17/generated_cpp17/monster_test_generated.h b/tests/cpp17/generated_cpp17/monster_test_generated.h index 494e72a3e..8109b054f 100644 --- a/tests/cpp17/generated_cpp17/monster_test_generated.h +++ b/tests/cpp17/generated_cpp17/monster_test_generated.h @@ -3027,7 +3027,7 @@ inline flatbuffers::Offset CreateMonster(flatbuffers::FlatBufferBuilder (void)_rehasher; (void)_o; 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 _hp = _o->hp; auto _name = _fbb.CreateString(_o->name); diff --git a/tests/monster_test_generated.h b/tests/monster_test_generated.h index 899567fa5..3890d2349 100644 --- a/tests/monster_test_generated.h +++ b/tests/monster_test_generated.h @@ -2966,7 +2966,7 @@ inline flatbuffers::Offset CreateMonster(flatbuffers::FlatBufferBuilder (void)_rehasher; (void)_o; 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 _hp = _o->hp; auto _name = _fbb.CreateString(_o->name); diff --git a/tests/monster_test_suffix/ext_only/monster_test_generated.hpp b/tests/monster_test_suffix/ext_only/monster_test_generated.hpp index 899567fa5..3890d2349 100644 --- a/tests/monster_test_suffix/ext_only/monster_test_generated.hpp +++ b/tests/monster_test_suffix/ext_only/monster_test_generated.hpp @@ -2966,7 +2966,7 @@ inline flatbuffers::Offset CreateMonster(flatbuffers::FlatBufferBuilder (void)_rehasher; (void)_o; 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 _hp = _o->hp; auto _name = _fbb.CreateString(_o->name); diff --git a/tests/monster_test_suffix/filesuffix_only/monster_test_suffix.h b/tests/monster_test_suffix/filesuffix_only/monster_test_suffix.h index 899567fa5..3890d2349 100644 --- a/tests/monster_test_suffix/filesuffix_only/monster_test_suffix.h +++ b/tests/monster_test_suffix/filesuffix_only/monster_test_suffix.h @@ -2966,7 +2966,7 @@ inline flatbuffers::Offset CreateMonster(flatbuffers::FlatBufferBuilder (void)_rehasher; (void)_o; 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 _hp = _o->hp; auto _name = _fbb.CreateString(_o->name); diff --git a/tests/monster_test_suffix/monster_test_suffix.hpp b/tests/monster_test_suffix/monster_test_suffix.hpp index 899567fa5..3890d2349 100644 --- a/tests/monster_test_suffix/monster_test_suffix.hpp +++ b/tests/monster_test_suffix/monster_test_suffix.hpp @@ -2966,7 +2966,7 @@ inline flatbuffers::Offset CreateMonster(flatbuffers::FlatBufferBuilder (void)_rehasher; (void)_o; 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 _hp = _o->hp; auto _name = _fbb.CreateString(_o->name); diff --git a/tests/namespace_test/namespace_test2_generated.h b/tests/namespace_test/namespace_test2_generated.h index 5d76cecfe..00c9bc59f 100644 --- a/tests/namespace_test/namespace_test2_generated.h +++ b/tests/namespace_test/namespace_test2_generated.h @@ -412,7 +412,7 @@ inline flatbuffers::Offset CreateTableInFirstNS(flatbuffers::Fla auto _foo_enum = _o->foo_enum; auto _foo_union_type = _o->foo_union.type; 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( _fbb, _foo_table, diff --git a/tests/test.cpp b/tests/test.cpp index 53eb7839e..f7ea002f6 100644 --- a/tests/test.cpp +++ b/tests/test.cpp @@ -625,7 +625,7 @@ void SizePrefixedTest() { // Create size prefixed buffer. flatbuffers::FlatBufferBuilder fbb; FinishSizePrefixedMonsterBuffer( - fbb, CreateMonster(fbb, 0, 200, 300, fbb.CreateString("bob"))); + fbb, CreateMonster(fbb, nullptr, 200, 300, fbb.CreateString("bob"))); // Verify it. flatbuffers::Verifier verifier(fbb.GetBufferPointer(), fbb.GetSize()); diff --git a/tests/test_assert.cpp b/tests/test_assert.cpp index e2b43a76b..596923294 100644 --- a/tests/test_assert.cpp +++ b/tests/test_assert.cpp @@ -40,8 +40,8 @@ void InitTestEngine(TestFailEventListener listener) { testing_fails = 0; // Disable stdout buffering to prevent information lost on assertion or core // dump. - setvbuf(stdout, NULL, _IONBF, 0); - setvbuf(stderr, NULL, _IONBF, 0); + setvbuf(stdout, nullptr, _IONBF, 0); + setvbuf(stderr, nullptr, _IONBF, 0); flatbuffers::SetupDefaultCRTReportMode(); diff --git a/tests/test_assert.h b/tests/test_assert.h index e6140cc9a..9d5f7801f 100644 --- a/tests/test_assert.h +++ b/tests/test_assert.h @@ -51,10 +51,10 @@ int CloseTestEngine(bool force_report = false); // Write captured state to a log and terminate test run. 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, - const char *file, int line, const char *func = 0); + const char *file, int line, const char *func = nullptr); // Workaround for `enum class` printing. // There is an issue with the printing of enums with a fixed underlying type.