Merge pull request #3897 from Lakedaemon/namespaceWork

Namespace work

Merge pull request #3897 from Lakedaemon/namespaceWork
Namespace work
5a401aef · Wouter van Oortmerssen · GitHub · 78ecf455 · 15863c34 · 5a401aef
Commit 5a401aef authored Jun 13, 2016 by Wouter van Oortmerssen Committed by GitHub Jun 13, 2016
Showing with 2 additions and 6 deletions

idl_gen_cpp.cpp src/idl_gen_cpp.cpp +0 -0

monster_test_generated.h tests/monster_test_generated.h +2 -2

namespace_test2_generated.h tests/namespace_test/namespace_test2_generated.h +0 -4

No files found.
--- 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,