GitHub/flatbuffers
1
0
Fork 0
mirror of https://github.com/google/flatbuffers.git synced 2025-04-08 09:12:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

don't emit flatbuffers include in bfbs generated output (#7968)

Browse Source
This commit is contained in:
Derek Bailey 2023-05-17 21:13:16 -07:00 committed by GitHub
parent ae6753684e
commit b67f1ad6d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/idl_gen_cpp.cpp
View File

@ -377,10 +377,8 @@ class CppGenerator : public BaseGenerator {
code_ += "#pragma clang system_header\n\n"; code_ += "#pragma clang system_header\n\n";
} }
code_ += "#include \"flatbuffers/flatbuffers.h\""; code_ += "#include <cstddef>";
code_ += ""; code_ += "#include <cstdint>";
GenFlatbuffersVersionCheck();
code_ += "";
SetNameSpace(struct_def.defined_namespace); SetNameSpace(struct_def.defined_namespace);
auto name = Name(struct_def); auto name = Name(struct_def);

11
tests/64bit/test_64bit_bfbs_generated.h
View File

@ -4,15 +4,8 @@
#ifndef FLATBUFFERS_GENERATED_TEST64BIT_BFBS_H_ #ifndef FLATBUFFERS_GENERATED_TEST64BIT_BFBS_H_
#define FLATBUFFERS_GENERATED_TEST64BIT_BFBS_H_ #define FLATBUFFERS_GENERATED_TEST64BIT_BFBS_H_
#include "flatbuffers/flatbuffers.h" #include <cstddef>
#include <cstdint>
// Ensure the included flatbuffers.h is the same version as when this file was
// generated, otherwise it may not be compatible.
static_assert(FLATBUFFERS_VERSION_MAJOR == 23 &&
FLATBUFFERS_VERSION_MINOR == 5 &&
FLATBUFFERS_VERSION_REVISION == 9,
"Non-compatible flatbuffers version included");
struct RootTableBinarySchema { struct RootTableBinarySchema {
static const uint8_t *data() { static const uint8_t *data() {
// Buffer containing the binary schema. // Buffer containing the binary schema.

11
tests/monster_test_bfbs_generated.h
View File

@ -4,15 +4,8 @@
#ifndef FLATBUFFERS_GENERATED_MONSTERTEST_MYGAME_EXAMPLE_BFBS_H_ #ifndef FLATBUFFERS_GENERATED_MONSTERTEST_MYGAME_EXAMPLE_BFBS_H_
#define FLATBUFFERS_GENERATED_MONSTERTEST_MYGAME_EXAMPLE_BFBS_H_ #define FLATBUFFERS_GENERATED_MONSTERTEST_MYGAME_EXAMPLE_BFBS_H_
#include "flatbuffers/flatbuffers.h" #include <cstddef>
#include <cstdint>
// Ensure the included flatbuffers.h is the same version as when this file was
// generated, otherwise it may not be compatible.
static_assert(FLATBUFFERS_VERSION_MAJOR == 23 &&
FLATBUFFERS_VERSION_MINOR == 5 &&
FLATBUFFERS_VERSION_REVISION == 9,
"Non-compatible flatbuffers version included");
namespace MyGame { namespace MyGame {
namespace Example { namespace Example {