@@ -1070,8 +1070,7 @@ void Generator::outputObjectDeclaration(
1070
1070
1071
1071
for (auto unionName : objectType.unions )
1072
1072
{
1073
- headerFile << R"cpp( friend )cpp" << _loader.getSafeCppName (unionName)
1074
- << R"cpp( ;
1073
+ headerFile << R"cpp( friend )cpp" << _loader.getSafeCppName (unionName) << R"cpp( ;
1075
1074
)cpp" ;
1076
1075
}
1077
1076
@@ -3094,7 +3093,6 @@ int main(int argc, char** argv)
3094
3093
bool buildCustom = false ;
3095
3094
bool verbose = false ;
3096
3095
bool stubs = false ;
3097
- bool mergeFiles = false ;
3098
3096
bool noIntrospection = false ;
3099
3097
std::string schemaFileName;
3100
3098
std::string filenamePrefix;
@@ -3119,9 +3117,8 @@ int main(int argc, char** argv)
3119
3117
po::value (&headerDir),
3120
3118
" Target path for the <prefix>Schema.h header file" )(" stubs" ,
3121
3119
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" ,
3125
3122
po::bool_switch (&noIntrospection),
3126
3123
" Do not generate support for Introspection" );
3127
3124
positional.add (" schema" , 1 ).add (" prefix" , 1 ).add (" namespace" , 1 );
@@ -3208,7 +3205,7 @@ int main(int argc, char** argv)
3208
3205
std::move (sourceDir) },
3209
3206
verbose,
3210
3207
stubs,
3211
- mergeFiles ,
3208
+ false ,
3212
3209
noIntrospection,
3213
3210
})
3214
3211
.Build ();
0 commit comments