diff options
| author | Michael Beardsworth <beardsworth@google.com> | 2020-01-06 10:00:59 -0800 |
|---|---|---|
| committer | Wouter van Oortmerssen <aardappel@gmail.com> | 2020-01-06 10:00:59 -0800 |
| commit | 21b7061963233fddc726a3dfb9a4131a4ce6cb0d (patch) | |
| tree | 5a30cc578cdf31f429b6ab6471546e80e660fb89 /include/flatbuffers/idl.h | |
| parent | 35daaf83d334156749bb9f9b43ce96a1c86d529a (diff) | |
| download | flatbuffers-21b7061963233fddc726a3dfb9a4131a4ce6cb0d.tar.gz | |
(Optionally) add an additional suffix namespace to generated fbs files. (#5698)
This change allows for the generation of fbs files (from proto) that
don't contain name collisions with the protobuf generated C++ code,
allowing both the proto and fbs message types to be linked into the same binary.
Diffstat (limited to 'include/flatbuffers/idl.h')
| -rw-r--r-- | include/flatbuffers/idl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/flatbuffers/idl.h b/include/flatbuffers/idl.h index 792103c6..1f013a8b 100644 --- a/include/flatbuffers/idl.h +++ b/include/flatbuffers/idl.h @@ -557,6 +557,7 @@ struct IDLOptions { bool java_primitive_has_method; std::vector<std::string> cpp_includes; std::string cpp_std; + std::string proto_namespace_suffix; // Possible options for the more general generator below. enum Language { |