BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-30 12:10:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed JS outputting helper for Int64Array.

Browse Source 
Change-Id: I7d23fa3416feb78ea18d2c451e7b4e1d9be11bfc
This commit is contained in:
Wouter van Oortmerssen
2016-12-14 10:35:26 -08:00
parent ccba2edb7c
commit d1e8899310
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/flatbuffers/idl.h
View File

@@ -102,6 +102,8 @@ inline bool IsInteger(BaseType t) { return t >= BASE_TYPE_UTYPE &&
t <= BASE_TYPE_ULONG; } t <= BASE_TYPE_ULONG; }
inline bool IsFloat (BaseType t) { return t == BASE_TYPE_FLOAT || inline bool IsFloat (BaseType t) { return t == BASE_TYPE_FLOAT ||
t == BASE_TYPE_DOUBLE; } t == BASE_TYPE_DOUBLE; }
inline bool IsLong (BaseType t) { return t == BASE_TYPE_LONG ||
t == BASE_TYPE_ULONG; }
extern const char *const kTypeNames[]; extern const char *const kTypeNames[];
extern const char kTypeSizes[]; extern const char kTypeSizes[];

2
src/idl_gen_js.cpp
View File

@@ -576,7 +576,7 @@ void GenStruct(const Parser &parser, StructDef &struct_def, std::string *code_pt
// For scalar types, emit a typed array helper // For scalar types, emit a typed array helper
auto vectorType = field.value.type.VectorType(); auto vectorType = field.value.type.VectorType();
if (IsScalar(vectorType.base_type)) { if (IsScalar(vectorType.base_type) && !IsLong(vectorType.base_type)) {
GenDocComment(code_ptr, "@returns {" + GenType(vectorType) + "Array}"); GenDocComment(code_ptr, "@returns {" + GenType(vectorType) + "Array}");
code += object_name + ".prototype." + MakeCamel(field.name, false); code += object_name + ".prototype." + MakeCamel(field.name, false);
code += "Array = function() {\n" + offset_prefix; code += "Array = function() {\n" + offset_prefix;