Skip to content

C
capnproto
Commit a435d363 authored by Branislav Katreniak's avatar Branislav Katreniak
Browse files
Options

capnpc-c++: fix union in generic struct test

parent 682cc0c5
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
c++/src/capnp/compiler/capnpc-c++.c++
View file @ a435d363
...@@ -1121,39 +1121,39 @@ private: ...@@ -1121,39 +1121,39 @@ private:
return FieldText { return FieldText {
kj::strTree( kj::strTree(
kj::mv(unionDiscrim.readerIsDecl), kj::mv(unionDiscrim.readerIsDecl),
" inline ", titleCase, "::Reader get", titleCase, "() const;\n" " inline typename ", titleCase, "::Reader get", titleCase, "() const;\n"
"\n"), "\n"),
kj::strTree( kj::strTree(
kj::mv(unionDiscrim.builderIsDecl), kj::mv(unionDiscrim.builderIsDecl),
" inline ", titleCase, "::Builder get", titleCase, "();\n" " inline typename ", titleCase, "::Builder get", titleCase, "();\n"
" inline ", titleCase, "::Builder init", titleCase, "();\n" " inline typename ", titleCase, "::Builder init", titleCase, "();\n"
"\n"), "\n"),
hasDiscriminantValue(proto) ? kj::strTree() : hasDiscriminantValue(proto) ? kj::strTree() :
kj::strTree(" inline ", titleCase, "::Pipeline get", titleCase, "();\n"), kj::strTree(" inline typename ", titleCase, "::Pipeline get", titleCase, "();\n"),
kj::strTree( kj::strTree(
kj::mv(unionDiscrim.isDefs), kj::mv(unionDiscrim.isDefs),
templateContext.allDecls(), templateContext.allDecls(),
"inline ", scope, titleCase, "::Reader ", scope, "Reader::get", titleCase, "() const {\n", "inline typename ", scope, titleCase, "::Reader ", scope, "Reader::get", titleCase, "() const {\n",
unionDiscrim.check, unionDiscrim.check,
" return ", scope, titleCase, "::Reader(_reader);\n" " return ", scope, titleCase, "::Reader(_reader);\n"
"}\n", "}\n",
templateContext.allDecls(), templateContext.allDecls(),
"inline ", scope, titleCase, "::Builder ", scope, "Builder::get", titleCase, "() {\n", "inline typename ", scope, titleCase, "::Builder ", scope, "Builder::get", titleCase, "() {\n",
unionDiscrim.check, unionDiscrim.check,
" return ", scope, titleCase, "::Builder(_builder);\n" " return ", scope, titleCase, "::Builder(_builder);\n"
"}\n", "}\n",
hasDiscriminantValue(proto) ? kj::strTree() : kj::strTree( hasDiscriminantValue(proto) ? kj::strTree() : kj::strTree(
"#if !CAPNP_LITE\n", "#if !CAPNP_LITE\n",
templateContext.allDecls(), templateContext.allDecls(),
"inline ", scope, titleCase, "::Pipeline ", scope, "Pipeline::get", titleCase, "() {\n", "inline typename ", scope, titleCase, "::Pipeline ", scope, "Pipeline::get", titleCase, "() {\n",
" return ", scope, titleCase, "::Pipeline(_typeless.noop());\n" " return ", scope, titleCase, "::Pipeline(_typeless.noop());\n"
"}\n" "}\n"
"#endif // !CAPNP_LITE\n"), "#endif // !CAPNP_LITE\n"),
templateContext.allDecls(), templateContext.allDecls(),
"inline ", scope, titleCase, "::Builder ", scope, "Builder::init", titleCase, "() {\n", "inline typename ", scope, titleCase, "::Builder ", scope, "Builder::init", titleCase, "() {\n",
unionDiscrim.set, unionDiscrim.set,
KJ_MAP(slot, slots) { KJ_MAP(slot, slots) {
switch (sectionFor(slot.whichType)) { switch (sectionFor(slot.whichType)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment