Skip to content

Commit 543ed52

Browse files
committed
Remove schemagen --merge-files option
1 parent 9a7bf58 commit 543ed52

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

src/SchemaGenerator.cpp

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1070,8 +1070,7 @@ void Generator::outputObjectDeclaration(
10701070

10711071
for (auto unionName : objectType.unions)
10721072
{
1073-
headerFile << R"cpp( friend )cpp" << _loader.getSafeCppName(unionName)
1074-
<< R"cpp(;
1073+
headerFile << R"cpp( friend )cpp" << _loader.getSafeCppName(unionName) << R"cpp(;
10751074
)cpp";
10761075
}
10771076

@@ -3094,7 +3093,6 @@ int main(int argc, char** argv)
30943093
bool buildCustom = false;
30953094
bool verbose = false;
30963095
bool stubs = false;
3097-
bool mergeFiles = false;
30983096
bool noIntrospection = false;
30993097
std::string schemaFileName;
31003098
std::string filenamePrefix;
@@ -3119,9 +3117,8 @@ int main(int argc, char** argv)
31193117
po::value(&headerDir),
31203118
"Target path for the <prefix>Schema.h header file")("stubs",
31213119
po::bool_switch(&stubs),
3122-
"Unimplemented fields throw runtime exceptions instead of compiler errors")("merge-files",
3123-
po::bool_switch(&mergeFiles),
3124-
"Generate a single header and source file for the entire schema")("no-introspection",
3120+
"Unimplemented fields throw runtime exceptions instead of compiler errors")(
3121+
"no-introspection",
31253122
po::bool_switch(&noIntrospection),
31263123
"Do not generate support for Introspection");
31273124
positional.add("schema", 1).add("prefix", 1).add("namespace", 1);
@@ -3208,7 +3205,7 @@ int main(int argc, char** argv)
32083205
std::move(sourceDir) },
32093206
verbose,
32103207
stubs,
3211-
mergeFiles,
3208+
false,
32123209
noIntrospection,
32133210
})
32143211
.Build();

0 commit comments

Comments
 (0)