projects
/
platform
/
upstream
/
flatbuffers.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f23009f
)
Fixed double generated file name postfix (#5046)
author
Kamil Rojewski
<krojew@users.noreply.github.com>
Fri, 16 Nov 2018 17:20:29 +0000
(18:20 +0100)
committer
Wouter van Oortmerssen
<aardappel@gmail.com>
Fri, 16 Nov 2018 17:20:29 +0000
(09:20 -0800)
* Fixed double generated file name postfix
* Fixed missing file postfix on imports without reexports
src/idl_gen_js.cpp
patch
|
blob
|
history
diff --git
a/src/idl_gen_js.cpp
b/src/idl_gen_js.cpp
index
8cb5fbe
..
9f8f2ce
100644
(file)
--- a/
src/idl_gen_js.cpp
+++ b/
src/idl_gen_js.cpp
@@
-148,10
+148,8
@@
class JsGenerator : public BaseGenerator {
const auto basename =
flatbuffers::StripPath(flatbuffers::StripExtension(file.first));
if (basename != file_name_) {
- const auto file_name = basename + kGeneratedFileNamePostfix;
-
if (imported_files.find(file.first) == imported_files.end()) {
- code += GenPrefixedImport(file.first,
file_
name);
+ code += GenPrefixedImport(file.first,
base
name);
imported_files.emplace(file.first);
}