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

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

View File

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

View File

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

View File

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