BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-25 13:38:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/google/flatbuffers

Browse Source
This commit is contained in:
Wouter van Oortmerssen
2016-06-17 17:44:00 -07:00
parent d3ac0bc149 5a401aef57
commit 6e177bf03f
3 changed files with 718 additions and 727 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CMake/BuildFlatBuffers.cmake
View File

@@ -63,6 +63,13 @@ function(build_flatbuffers flatbuffers_schemas
set(FLATC_TARGET flatc) set(FLATC_TARGET flatc)
set(FLATC flatc) set(FLATC flatc)
endif() endif()
set(FLATC_SCHEMA_ARGS --gen-mutable)
if(FLATBUFFERS_FLATC_SCHEMA_EXTRA_ARGS)
set(FLATC_SCHEMA_ARGS
${FLATBUFFERS_FLATC_SCHEMA_EXTRA_ARGS}
${FLATC_SCHEMA_ARGS}
)
endif()
set(schema_glob "*.fbs") set(schema_glob "*.fbs")
# Generate the include files parameters. # Generate the include files parameters.
@@ -86,7 +93,7 @@ function(build_flatbuffers flatbuffers_schemas
set(generated_include ${generated_includes_dir}/${filename}_generated.h) set(generated_include ${generated_includes_dir}/${filename}_generated.h)
add_custom_command( add_custom_command(
OUTPUT ${generated_include} OUTPUT ${generated_include}
COMMAND ${FLATC} --gen-mutable COMMAND ${FLATC} ${FLATC_SCHEMA_ARGS}
-o ${generated_includes_dir} -o ${generated_includes_dir}
${include_params} ${include_params}
-c ${schema} -c ${schema}

1432
src/idl_gen_cpp.cpp
View File

File diff suppressed because it is too large Load Diff

4
tests/namespace_test/namespace_test2_generated.h
View File

@@ -23,10 +23,6 @@ namespace NamespaceA {
struct SecondTableInA; struct SecondTableInA;
} // namespace NamespaceA
namespace NamespaceA {
struct TableInFirstNS FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct TableInFirstNS FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
enum { enum {
VT_FOO_TABLE = 4, VT_FOO_TABLE = 4,