Merge branch 'master' of https://github.com/google/flatbuffers

Fixed conflicts and added missing generated files.

Change-Id: I4321c798543292d814c2c9e8b238c203b7526c7b

diff --cc include/flatbuffers/idl.h
index d4fcccb,134c46f..d052d6f
--- 1/include/flatbuffers/idl.h
--- 2/include/flatbuffers/idl.h
+++ b/include/flatbuffers/idl.h
@@@ -470,22 -468,23 +472,25 @@@ private
    StructDef *LookupCreateStruct(const std::string &name,
                                  bool create_if_new = true,
                                  bool definition = false);
 -  CHECKED_ERROR ParseEnum(bool is_union, EnumDef **dest);
 -  CHECKED_ERROR ParseNamespace();
 -  CHECKED_ERROR StartStruct(const std::string &name, StructDef **dest);
 -  CHECKED_ERROR ParseDecl();
 -  CHECKED_ERROR ParseProtoFields(StructDef *struct_def, bool isextend,
 -                                 bool inside_oneof);
 -  CHECKED_ERROR ParseProtoOption();
 -  CHECKED_ERROR ParseProtoKey();
 -  CHECKED_ERROR ParseProtoDecl();
 -  CHECKED_ERROR ParseProtoCurliesOrIdent();
 -  CHECKED_ERROR ParseTypeFromProtoType(Type *type);
 -  CHECKED_ERROR SkipAnyJsonValue();
 -  CHECKED_ERROR SkipJsonObject();
 -  CHECKED_ERROR SkipJsonArray();
 -  CHECKED_ERROR SkipJsonString();
 -  CHECKED_ERROR DoParse(const char *_source, const char **include_paths,
 -                        const char *source_filename);
 +  FLATBUFFERS_CHECKED_ERROR ParseEnum(bool is_union, EnumDef **dest);
 +  FLATBUFFERS_CHECKED_ERROR ParseNamespace();
 +  FLATBUFFERS_CHECKED_ERROR StartStruct(const std::string &name,
 +                                        StructDef **dest);
 +  FLATBUFFERS_CHECKED_ERROR ParseDecl();
 +  FLATBUFFERS_CHECKED_ERROR ParseProtoFields(StructDef *struct_def,
 +                                             bool isextend, bool inside_oneof);
 +  FLATBUFFERS_CHECKED_ERROR ParseProtoOption();
 +  FLATBUFFERS_CHECKED_ERROR ParseProtoKey();
 +  FLATBUFFERS_CHECKED_ERROR ParseProtoDecl();
 +  FLATBUFFERS_CHECKED_ERROR ParseProtoCurliesOrIdent();
 +  FLATBUFFERS_CHECKED_ERROR ParseTypeFromProtoType(Type *type);
- 
++  FLATBUFFERS_CHECKED_ERROR SkipAnyJsonValue();
++  FLATBUFFERS_CHECKED_ERROR SkipJsonObject();
++  FLATBUFFERS_CHECKED_ERROR SkipJsonArray();
++  FLATBUFFERS_CHECKED_ERROR SkipJsonString();
 +  FLATBUFFERS_CHECKED_ERROR DoParse(const char *_source,
 +                                    const char **include_paths,
 +                                    const char *source_filename);
  
   public:
    SymbolTable<StructDef> structs_;

diff --cc src/idl_parser.cpp
Simple merge