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

fix code formatting and bug with losing enums when using --gen-onefile

Browse Source
This commit is contained in:
Amol Deshpande
2015-06-13 08:55:24 -07:00
parent 2f76141813
commit 40fffc8fff
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/source/Compiler.md
View File

@@ -57,6 +57,8 @@ be generated for each file processed:
- `--gen-mutable` : Generate additional non-const accessors for mutating - `--gen-mutable` : Generate additional non-const accessors for mutating
FlatBuffers in-place. FlatBuffers in-place.
- `--gen-onefile` : Generate single output file (useful for C#)
- `--raw-binary` : Allow binaries without a file_indentifier to be read. - `--raw-binary` : Allow binaries without a file_indentifier to be read.
This may crash flatc given a mismatched schema. This may crash flatc given a mismatched schema.

4
src/flatc.cpp
View File

@@ -141,9 +141,9 @@ int main(int argc, const char *argv[]) {
opts.mutable_buffer = true; opts.mutable_buffer = true;
} else if(arg == "--gen-includes") { } else if(arg == "--gen-includes") {
opts.include_dependence_headers = true; opts.include_dependence_headers = true;
}else if (arg == "--gen-onefile") { } else if (arg == "--gen-onefile") {
opts.one_file = true; opts.one_file = true;
}else if (arg == "--raw-binary") { } else if (arg == "--raw-binary") {
raw_binary = true; raw_binary = true;
} else if(arg == "--") { // Separator between text and binary inputs. } else if(arg == "--") { // Separator between text and binary inputs.
binary_files_from = filenames.size(); binary_files_from = filenames.size();

2
src/idl_gen_general.cpp
View File

@@ -901,7 +901,7 @@ bool GenerateGeneral(const Parser &parser,
std::string enumcode; std::string enumcode;
GenEnum(lang, **it, &enumcode); GenEnum(lang, **it, &enumcode);
if (opts.one_file) { if (opts.one_file) {
one_file_code = enumcode; one_file_code += enumcode;
} }
else { else {
if (!SaveClass(lang, parser, (**it).name, enumcode, path, false, false)) if (!SaveClass(lang, parser, (**it).name, enumcode, path, false, false))