BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-07-02 08:38:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

rebase

Browse Source
This commit is contained in:
Maor Itzkovitch
2015-08-19 21:32:08 +03:00
parent fb7f27a7c9 d97f628703
commit a0f3fb44e7
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/idl_gen_general.cpp
View File

@@ -252,7 +252,9 @@ static Type DestinationType(const LanguageParameters &lang, const Type &type,
bool vectorelem) { bool vectorelem) {
if (lang.language != GeneratorOptions::kJava) return type; if (lang.language != GeneratorOptions::kJava) return type;
switch (type.base_type) { switch (type.base_type) {
case BASE_TYPE_UCHAR: return Type(BASE_TYPE_INT); //intentionally returns int to avoid unnecessary casting in Java // We use int for both uchar/ushort, since that generally means less casting
// than using short for uchar.
case BASE_TYPE_UCHAR: return Type(BASE_TYPE_INT);
case BASE_TYPE_USHORT: return Type(BASE_TYPE_INT); case BASE_TYPE_USHORT: return Type(BASE_TYPE_INT);
case BASE_TYPE_UINT: return Type(BASE_TYPE_LONG); case BASE_TYPE_UINT: return Type(BASE_TYPE_LONG);
case BASE_TYPE_VECTOR: case BASE_TYPE_VECTOR:
@@ -1024,8 +1026,8 @@ static bool SaveClass(const LanguageParameters &lang, const Parser &parser,
std::string code = "// automatically generated, do not modify\n\n"; std::string code = "// automatically generated, do not modify\n\n";
if (!namespace_general.empty()) { if (!namespace_general.empty()) {
code += lang.namespace_ident + namespace_general + lang.namespace_begin; code += lang.namespace_ident + namespace_general + lang.namespace_begin;
code += "\n\n"; code += "\n\n";
} }
if (needs_includes) code += lang.includes; if (needs_includes) code += lang.includes;
code += classcode; code += classcode;