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

Fixed inconsistent use of namespace directory prefixing.

Browse Source 
Change-Id: I2cab7a1f68b8e643c1057e0a366572421a94ed41
Tested: on Linux.
This commit is contained in:
Wouter van Oortmerssen
2016-10-12 16:05:57 -07:00
parent c81239f6ea
commit 424fc0c3ac
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/idl_gen_general.cpp
View File

@@ -1392,8 +1392,7 @@ std::string GeneralMakeRule(const Parser &parser, const std::string &path,
auto &enum_def = **it; auto &enum_def = **it;
if (make_rule != "") make_rule += " "; if (make_rule != "") make_rule += " ";
std::string directory = std::string directory =
BaseGenerator::NamespaceDir(parser, path, *enum_def.defined_namespace) + BaseGenerator::NamespaceDir(parser, path, *enum_def.defined_namespace);
kPathSeparator;
make_rule += directory + enum_def.name + lang.file_extension; make_rule += directory + enum_def.name + lang.file_extension;
} }
@@ -1402,8 +1401,8 @@ std::string GeneralMakeRule(const Parser &parser, const std::string &path,
auto &struct_def = **it; auto &struct_def = **it;
if (make_rule != "") make_rule += " "; if (make_rule != "") make_rule += " ";
std::string directory = std::string directory =
BaseGenerator::NamespaceDir(parser, path, *struct_def.defined_namespace) + BaseGenerator::NamespaceDir(parser, path,
kPathSeparator; *struct_def.defined_namespace);
make_rule += directory + struct_def.name + lang.file_extension; make_rule += directory + struct_def.name + lang.file_extension;
} }

2
src/idl_gen_php.cpp
View File

@@ -89,7 +89,7 @@ namespace php {
code += classcode; code += classcode;
std::string filename = NamespaceDir(*def.defined_namespace) + std::string filename = NamespaceDir(*def.defined_namespace) +
kPathSeparator + def.name + ".php"; def.name + ".php";
return SaveFile(filename.c_str(), code, false); return SaveFile(filename.c_str(), code, false);
} }

2
src/idl_gen_python.cpp
View File

@@ -655,7 +655,7 @@ class PythonGenerator : public BaseGenerator {
BeginFile(LastNamespacePart(*def.defined_namespace), needs_imports, &code); BeginFile(LastNamespacePart(*def.defined_namespace), needs_imports, &code);
code += classcode; code += classcode;
std::string filename = NamespaceDir(*def.defined_namespace) + std::string filename = NamespaceDir(*def.defined_namespace) +
kPathSeparator + def.name + ".py"; def.name + ".py";
return SaveFile(filename.c_str(), code, false); return SaveFile(filename.c_str(), code, false);
} }
}; };