Fixed spaces. Removed redundant == nullptr. Vectors pointers made const.

src/idl_gen_cpp.cpp

@@ -746,7 +746,7 @@ class CppGenerator : public BaseGenerator {
             code += field.name + " = nullptr";
           }
           else if (field.value.type.base_type == BASE_TYPE_VECTOR) {
-            code += ",\n   std::vector<";
+            code += ",\n    const std::vector<";
             code += GenTypeWire(field.value.type.VectorType(), "", false);
             code += "> *" + field.name + " = nullptr";
           } else {
@@ -755,7 +755,6 @@ class CppGenerator : public BaseGenerator {
         }
       }
       code += ") {\n  ";
-
       code += "return Create";
       code += struct_def.name;
       code += "(_fbb";
@@ -764,18 +763,16 @@ class CppGenerator : public BaseGenerator {
         auto &field = **it;
         if (!field.deprecated) {
           if (field.value.type.base_type == BASE_TYPE_STRING) {
-            code += ", " + field.name + " == nullptr ? 0 : ";
+            code += ", " + field.name + " ? 0 : ";
             code += "_fbb.CreateString(" + field.name + ")";
           } else if (field.value.type.base_type == BASE_TYPE_VECTOR) {
-            code += ", " + field.name + " == nullptr ? 0 : ";
+            code += ", " + field.name + " ? 0 : ";
             code += "_fbb.CreateVector<";
             code += GenTypeWire(field.value.type.VectorType(), "", false);
             code += ">(*" + field.name + ")";
           } else code += ", " + field.name;
         }
       }
-        
-        
       code += ");\n}\n\n";
     }
   }

tests/monster_test_generated.h

@@ -219,7 +219,7 @@ inline flatbuffers::Offset<Stat> CreateStat(flatbuffers::FlatBufferBuilder &_fbb
     const char *id = nullptr,
     int64_t val = 0,
     uint16_t count = 0) {
-  return CreateStat(_fbb, id == nullptr ? 0 : _fbb.CreateString(id), val, count);
+  return CreateStat(_fbb, id ? 0 : _fbb.CreateString(id), val, count);
 }
 
 /// an example documentation comment: monster object
@@ -469,15 +469,15 @@ inline flatbuffers::Offset<Monster> CreateMonster(flatbuffers::FlatBufferBuilder
     int16_t mana = 150,
     int16_t hp = 100,
     const char *name = nullptr,
-   std::vector<uint8_t> *inventory = nullptr,
+    const std::vector<uint8_t> *inventory = nullptr,
     Color color = Color_Blue,
     Any test_type = Any_NONE,
     flatbuffers::Offset<void> test = 0,
-   std::vector<const Test *> *test4 = nullptr,
-   std::vector<flatbuffers::Offset<flatbuffers::String>> *testarrayofstring = nullptr,
-   std::vector<flatbuffers::Offset<Monster>> *testarrayoftables = nullptr,
+    const std::vector<const Test *> *test4 = nullptr,
+    const std::vector<flatbuffers::Offset<flatbuffers::String>> *testarrayofstring = nullptr,
+    const std::vector<flatbuffers::Offset<Monster>> *testarrayoftables = nullptr,
     flatbuffers::Offset<Monster> enemy = 0,
-   std::vector<uint8_t> *testnestedflatbuffer = nullptr,
+    const std::vector<uint8_t> *testnestedflatbuffer = nullptr,
     flatbuffers::Offset<Stat> testempty = 0,
     bool testbool = false,
     int32_t testhashs32_fnv1 = 0,
@@ -488,12 +488,12 @@ inline flatbuffers::Offset<Monster> CreateMonster(flatbuffers::FlatBufferBuilder
     uint32_t testhashu32_fnv1a = 0,
     int64_t testhashs64_fnv1a = 0,
     uint64_t testhashu64_fnv1a = 0,
-   std::vector<uint8_t> *testarrayofbools = nullptr,
+    const std::vector<uint8_t> *testarrayofbools = nullptr,
     float testf = 3.14159f,
     float testf2 = 3.0f,
     float testf3 = 0.0f,
-   std::vector<flatbuffers::Offset<flatbuffers::String>> *testarrayofstring2 = nullptr) {
-  return CreateMonster(_fbb, pos, mana, hp, name == nullptr ? 0 : _fbb.CreateString(name), inventory == nullptr ? 0 : _fbb.CreateVector<uint8_t>(*inventory), color, test_type, test, test4 == nullptr ? 0 : _fbb.CreateVector<const Test *>(*test4), testarrayofstring == nullptr ? 0 : _fbb.CreateVector<flatbuffers::Offset<flatbuffers::String>>(*testarrayofstring), testarrayoftables == nullptr ? 0 : _fbb.CreateVector<flatbuffers::Offset<Monster>>(*testarrayoftables), enemy, testnestedflatbuffer == nullptr ? 0 : _fbb.CreateVector<uint8_t>(*testnestedflatbuffer), testempty, testbool, testhashs32_fnv1, testhashu32_fnv1, testhashs64_fnv1, testhashu64_fnv1, testhashs32_fnv1a, testhashu32_fnv1a, testhashs64_fnv1a, testhashu64_fnv1a, testarrayofbools == nullptr ? 0 : _fbb.CreateVector<uint8_t>(*testarrayofbools), testf, testf2, testf3, testarrayofstring2 == nullptr ? 0 : _fbb.CreateVector<flatbuffers::Offset<flatbuffers::String>>(*testarrayofstring2));
+    const std::vector<flatbuffers::Offset<flatbuffers::String>> *testarrayofstring2 = nullptr) {
+  return CreateMonster(_fbb, pos, mana, hp, name ? 0 : _fbb.CreateString(name), inventory ? 0 : _fbb.CreateVector<uint8_t>(*inventory), color, test_type, test, test4 ? 0 : _fbb.CreateVector<const Test *>(*test4), testarrayofstring ? 0 : _fbb.CreateVector<flatbuffers::Offset<flatbuffers::String>>(*testarrayofstring), testarrayoftables ? 0 : _fbb.CreateVector<flatbuffers::Offset<Monster>>(*testarrayoftables), enemy, testnestedflatbuffer ? 0 : _fbb.CreateVector<uint8_t>(*testnestedflatbuffer), testempty, testbool, testhashs32_fnv1, testhashu32_fnv1, testhashs64_fnv1, testhashu64_fnv1, testhashs32_fnv1a, testhashu32_fnv1a, testhashs64_fnv1a, testhashu64_fnv1a, testarrayofbools ? 0 : _fbb.CreateVector<uint8_t>(*testarrayofbools), testf, testf2, testf3, testarrayofstring2 ? 0 : _fbb.CreateVector<flatbuffers::Offset<flatbuffers::String>>(*testarrayofstring2));
 }
 
 inline bool VerifyAny(flatbuffers::Verifier &verifier, const void *union_obj, Any type) {