Skip to content

F
flatbuffers
Commit 5a401aef authored by Wouter van Oortmerssen's avatar Wouter van Oortmerssen Committed by GitHub
Browse files
Options

Merge pull request #3897 from Lakedaemon/namespaceWork 

Namespace work
parents 78ecf455 15863c34
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 6 deletions
src/idl_gen_cpp.cpp
View file @ 5a401aef
This diff is collapsed.
tests/monster_test_generated.h
View file @ 5a401aef
...@@ -22,8 +22,8 @@ enum Color { ...@@ -22,8 +22,8 @@ enum Color {
Color_Red = 1, Color_Red = 1,
Color_Green = 2, Color_Green = 2,
Color_Blue = 8, Color_Blue = 8,
Color_MIN = Color_Red, Color_NONE = 0,
Color_MAX = Color_Blue Color_ANY = 11
}; };
inline const char **EnumNamesColor() { inline const char **EnumNamesColor() {
......
tests/namespace_test/namespace_test2_generated.h
View file @ 5a401aef
...@@ -23,10 +23,6 @@ namespace NamespaceA { ...@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment