BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-02 20:15:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

The asserts replaced by FLATBUFFERS_ASSERT. (#4701)

Browse Source 
* The asserts replaced by FLATBUFFERS_ASSERT. Several asserts have converted to static_asserts.

* Regenerate header monster generate_code.sh
This commit is contained in:
Vladimir Glavnyy
2018-04-16 22:57:59 +07:00
committed by Wouter van Oortmerssen
parent 86153fd740
commit a66f9e769b
23 changed files with 157 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/idl_gen_cpp.cpp
View File

@@ -216,7 +216,7 @@ class CppGenerator : public BaseGenerator {
if (parser_.opts.include_dependence_headers) { GenIncludeDependencies(); }
assert(!cur_name_space_);
FLATBUFFERS_ASSERT(!cur_name_space_);
// Generate forward declarations for all structs/tables, since they may
// have circular references.
@@ -667,7 +667,7 @@ class CppGenerator : public BaseGenerator {
return actual_type ? (native_type ? "std::string" : "flatbuffers::String")
: Name(ev);
} else {
assert(false);
FLATBUFFERS_ASSERT(false);
return Name(ev);
}
}
@@ -897,7 +897,7 @@ class CppGenerator : public BaseGenerator {
}
if (parser_.opts.scoped_enums || parser_.opts.prefixed_enums) {
assert(minv && maxv);
FLATBUFFERS_ASSERT(minv && maxv);
code_.SetValue("SEP", ",\n");
if (enum_def.attributes.Lookup("bit_flags")) {
@@ -1118,7 +1118,7 @@ class CppGenerator : public BaseGenerator {
code_ += getptr;
code_ += " return verifier.Verify(ptr);";
} else {
assert(false);
FLATBUFFERS_ASSERT(false);
}
code_ += " }";
} else {
@@ -1169,7 +1169,7 @@ class CppGenerator : public BaseGenerator {
} else if (ev.union_type.base_type == BASE_TYPE_STRING) {
code_ += " return new std::string(ptr->c_str(), ptr->size());";
} else {
assert(false);
FLATBUFFERS_ASSERT(false);
}
code_ += " }";
}
@@ -1202,7 +1202,7 @@ class CppGenerator : public BaseGenerator {
} else if (ev.union_type.base_type == BASE_TYPE_STRING) {
code_ += " return _fbb.CreateString(*ptr).Union();";
} else {
assert(false);
FLATBUFFERS_ASSERT(false);
}
code_ += " }";
}
@@ -1244,7 +1244,7 @@ class CppGenerator : public BaseGenerator {
" value = new {{TYPE}}(*reinterpret_cast<{{TYPE}} *>"
"(u.value));";
} else {
code_ += " assert(false); // {{TYPE}} not copyable.";
code_ += " FLATBUFFERS_ASSERT(false); // {{TYPE}} not copyable.";
}
code_ += " break;";
code_ += " }";
@@ -1697,7 +1697,7 @@ class CppGenerator : public BaseGenerator {
nested->constant);
nested_root = parser_.LookupStruct(qualified_name);
}
assert(nested_root); // Guaranteed to exist by parser.
FLATBUFFERS_ASSERT(nested_root); // Guaranteed to exist by parser.
(void)nested_root;
code_.SetValue("CPP_NAME", TranslateNameSpace(qualified_name));
@@ -2092,7 +2092,7 @@ class CppGenerator : public BaseGenerator {
break;
}
case BASE_TYPE_UTYPE: {
assert(union_field->value.type.base_type == BASE_TYPE_UNION);
FLATBUFFERS_ASSERT(union_field->value.type.base_type == BASE_TYPE_UNION);
// Generate code that sets the union type, of the form:
// _o->field.type = _e;
code += "_o->" + union_field->name + ".type = _e;";
@@ -2403,7 +2403,7 @@ class CppGenerator : public BaseGenerator {
f((1 << i) * 8, code_ptr, id);
}
}
assert(!(field.padding & ~0xF));
FLATBUFFERS_ASSERT(!(field.padding & ~0xF));
}
}