From d1e8899310d8e8758d9900628de448a3a43bd050 Mon Sep 17 00:00:00 2001 From: Wouter van Oortmerssen Date: Wed, 14 Dec 2016 10:35:26 -0800 Subject: [PATCH] Fixed JS outputting helper for Int64Array. Change-Id: I7d23fa3416feb78ea18d2c451e7b4e1d9be11bfc --- include/flatbuffers/idl.h | 2 ++ src/idl_gen_js.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/flatbuffers/idl.h b/include/flatbuffers/idl.h index 6ae8dd281..7fe3379b0 100644 --- a/include/flatbuffers/idl.h +++ b/include/flatbuffers/idl.h @@ -102,6 +102,8 @@ inline bool IsInteger(BaseType t) { return t >= BASE_TYPE_UTYPE && t <= BASE_TYPE_ULONG; } inline bool IsFloat (BaseType t) { return t == BASE_TYPE_FLOAT || 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 kTypeSizes[]; diff --git a/src/idl_gen_js.cpp b/src/idl_gen_js.cpp index 32c660c90..dd04bec45 100644 --- a/src/idl_gen_js.cpp +++ b/src/idl_gen_js.cpp @@ -576,7 +576,7 @@ void GenStruct(const Parser &parser, StructDef &struct_def, std::string *code_pt // For scalar types, emit a typed array helper 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}"); code += object_name + ".prototype." + MakeCamel(field.name, false); code += "Array = function() {\n" + offset_prefix;