BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-24 04:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3897 from Lakedaemon/namespaceWork

Browse Source 
Namespace work
This commit is contained in:
Wouter van Oortmerssen
2016-06-13 15:16:28 -07:00
committed by GitHub
parent 78ecf45527 15863c34a0
commit 5a401aef57
3 changed files with 712 additions and 728 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1432
src/idl_gen_cpp.cpp
View File

File diff suppressed because it is too large Load Diff

4
tests/monster_test_generated.h
View File

@@ -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() {

4
tests/namespace_test/namespace_test2_generated.h
View File

@@ -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,