diff options
| author | Wouter van Oortmerssen <wvo@google.com> | 2016-06-13 15:16:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-13 15:16:28 -0700 |
| commit | 5a401aef57460a8a6c5b4e77dacea61a0085bbb5 (patch) | |
| tree | 7735ec224fd87cab94e05907feb52b19d6625194 /tests | |
| parent | 78ecf45527adf8bf38de25a7a5277e9acd81e422 (diff) | |
| parent | 15863c34a0733929069da177aab2861ddb719e80 (diff) | |
| download | flatbuffers-5a401aef57460a8a6c5b4e77dacea61a0085bbb5.tar.gz flatbuffers-5a401aef57460a8a6c5b4e77dacea61a0085bbb5.tar.bz2 flatbuffers-5a401aef57460a8a6c5b4e77dacea61a0085bbb5.zip | |
Merge pull request #3897 from Lakedaemon/namespaceWork
Namespace work
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/monster_test_generated.h | 4 | ||||
| -rw-r--r-- | tests/namespace_test/namespace_test2_generated.h | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/tests/monster_test_generated.h b/tests/monster_test_generated.h index 594c6f7c..3da41fae 100644 --- 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() { diff --git a/tests/namespace_test/namespace_test2_generated.h b/tests/namespace_test/namespace_test2_generated.h index d0cc5fab..8e6b3ada 100644 --- 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, |