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

removed static from wrapInNamespace method

Browse Source
This commit is contained in:
lakedaemon
2016-06-14 21:47:03 +02:00
parent 2f52618c4e
commit 43fedfa8ba
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/idl_gen_js.cpp
View File

@@ -121,7 +121,7 @@ class JsGenerator : public BaseGenerator {
// Ensure that a type is prefixed with its namespace whenever it is used // Ensure that a type is prefixed with its namespace whenever it is used
// outside of its namespace. // outside of its namespace.
static std::string WrapInNameSpace(const Namespace *ns, std::string WrapInNameSpace(const Namespace *ns,
const std::string &name) { const std::string &name) {
std::string qualified_name; std::string qualified_name;
for (auto it = ns->components.begin(); for (auto it = ns->components.begin();
@@ -131,7 +131,7 @@ static std::string WrapInNameSpace(const Namespace *ns,
return qualified_name + name; return qualified_name + name;
} }
static std::string WrapInNameSpace(const Definition &def) { std::string WrapInNameSpace(const Definition &def) {
return WrapInNameSpace(def.defined_namespace, def.name); return WrapInNameSpace(def.defined_namespace, def.name);
} }
@@ -180,7 +180,7 @@ static void GenDocComment(std::string *code_ptr,
} }
// Generate an enum declaration and an enum string lookup table. // Generate an enum declaration and an enum string lookup table.
static void GenEnum(EnumDef &enum_def, std::string *code_ptr, void GenEnum(EnumDef &enum_def, std::string *code_ptr,
std::string *exports_ptr) { std::string *exports_ptr) {
if (enum_def.generated) return; if (enum_def.generated) return;
std::string &code = *code_ptr; std::string &code = *code_ptr;
@@ -227,7 +227,7 @@ static std::string GenType(const Type &type) {
} }
} }
static std::string GenGetter(const Type &type, const std::string &arguments) { std::string GenGetter(const Type &type, const std::string &arguments) {
switch (type.base_type) { switch (type.base_type) {
case BASE_TYPE_STRING: return "this.bb.__string" + arguments; case BASE_TYPE_STRING: return "this.bb.__string" + arguments;
case BASE_TYPE_STRUCT: return "this.bb.__struct" + arguments; case BASE_TYPE_STRUCT: return "this.bb.__struct" + arguments;
@@ -247,7 +247,7 @@ static std::string GenGetter(const Type &type, const std::string &arguments) {
} }
} }
static std::string GenDefaultValue(const Value &value, const std::string &context) { std::string GenDefaultValue(const Value &value, const std::string &context) {
if (value.type.enum_def) { if (value.type.enum_def) {
if (auto val = value.type.enum_def->ReverseLookup( if (auto val = value.type.enum_def->ReverseLookup(
atoi(value.constant.c_str()), false)) { atoi(value.constant.c_str()), false)) {
@@ -274,7 +274,7 @@ static std::string GenDefaultValue(const Value &value, const std::string &contex
} }
} }
static std::string GenTypeName(const Type &type, bool input) { std::string GenTypeName(const Type &type, bool input) {
if (!input) { if (!input) {
if (type.base_type == BASE_TYPE_STRING) { if (type.base_type == BASE_TYPE_STRING) {
return "string|Uint8Array"; return "string|Uint8Array";
@@ -326,7 +326,7 @@ static std::string MaybeScale(T value) {
return value != 1 ? " * " + NumToString(value) : ""; return value != 1 ? " * " + NumToString(value) : "";
} }
static void GenStructArgs(const StructDef &struct_def, void GenStructArgs(const StructDef &struct_def,
std::string *annotations, std::string *annotations,
std::string *arguments, std::string *arguments,
const std::string &nameprefix) { const std::string &nameprefix) {