Merge pull request #3897 from Lakedaemon/namespaceWork

Namespace work
2026-06-01 19:58:15 +00:00 · 2016-06-13 15:16:28 -07:00
parent 78ecf45527 15863c34a0
commit 5a401aef57
3 changed files with 712 additions and 728 deletions
--- a/src/idl_gen_cpp.cpp
+++ b/src/idl_gen_cpp.cpp
--- a/tests/monster_test_generated.h
+++ b/tests/monster_test_generated.h
@@ -22,8 +22,8 @@ enum Color {
  Color_Red = 1,
  Color_Green = 2,
  Color_Blue = 8,
-  Color_MIN = Color_Red,
-  Color_MAX = Color_Blue
+  Color_NONE = 0,
+  Color_ANY = 11
 };

 inline const char **EnumNamesColor() {
--- a/tests/namespace_test/namespace_test2_generated.h
+++ b/tests/namespace_test/namespace_test2_generated.h
@@ -23,10 +23,6 @@ namespace NamespaceA {

 struct SecondTableInA;

-}  // namespace NamespaceA
-
-namespace NamespaceA {
-
 struct TableInFirstNS FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
  enum {
    VT_FOO_TABLE = 4,