Merge branch 'brandDeps' of github.com:pqu/capnproto into pqu-brandDeps

Conflicts:
	c++/src/capnp/rpc-twoparty.capnp.c++
	c++/src/capnp/rpc-twoparty.capnp.h
	c++/src/capnp/rpc.capnp.c++
	c++/src/capnp/rpc.capnp.h

c++/src/capnp/CMakeLists.txt

@@ -222,6 +222,10 @@ if(BUILD_TESTING)
       ${test_capnp_h_files}
     )
     target_link_libraries(capnp-heavy-tests ${test_libraries})
+    set_target_properties(capnp-heavy-tests
+      PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations"
+    )
+
     add_dependencies(check capnp-heavy-tests)
     add_test(NAME capnp-heavy-tests-run COMMAND capnp-heavy-tests)
 

c++/src/capnp/c++.capnp.c++

@@ -30,11 +30,9 @@ static const ::capnp::_::AlignedData<21> b_b9c6f99ebf805f2c = {
 };
 ::capnp::word const* const bp_b9c6f99ebf805f2c = b_b9c6f99ebf805f2c.words;
 #if !CAPNP_LITE
-const ::capnp::_::RawBrandedSchema::Dependency bd_b9c6f99ebf805f2c[] = {
-};
 const ::capnp::_::RawSchema s_b9c6f99ebf805f2c = {
   0xb9c6f99ebf805f2c, b_b9c6f99ebf805f2c.words, 21, nullptr, nullptr,
-  0, 0, nullptr, nullptr, nullptr, { &s_b9c6f99ebf805f2c, nullptr, bd_b9c6f99ebf805f2c, 0, sizeof(bd_b9c6f99ebf805f2c) / sizeof(bd_b9c6f99ebf805f2c[0]), nullptr }
+  0, 0, nullptr, nullptr, nullptr, { &s_b9c6f99ebf805f2c, nullptr, nullptr, 0, 0, nullptr }
 };
 #endif  // !CAPNP_LITE
 static const ::capnp::_::AlignedData<20> b_f264a779fef191ce = {
@@ -61,11 +59,9 @@ static const ::capnp::_::AlignedData<20> b_f264a779fef191ce = {
 };
 ::capnp::word const* const bp_f264a779fef191ce = b_f264a779fef191ce.words;
 #if !CAPNP_LITE
-const ::capnp::_::RawBrandedSchema::Dependency bd_f264a779fef191ce[] = {
-};
 const ::capnp::_::RawSchema s_f264a779fef191ce = {
   0xf264a779fef191ce, b_f264a779fef191ce.words, 20, nullptr, nullptr,
-  0, 0, nullptr, nullptr, nullptr, { &s_f264a779fef191ce, nullptr, bd_f264a779fef191ce, 0, sizeof(bd_f264a779fef191ce) / sizeof(bd_f264a779fef191ce[0]), nullptr }
+  0, 0, nullptr, nullptr, nullptr, { &s_f264a779fef191ce, nullptr, nullptr, 0, 0, nullptr }
 };
 #endif  // !CAPNP_LITE
 }  // namespace schemas

c++/src/capnp/compiler/compiler.c++

@@ -836,7 +836,7 @@ Compiler::Node::resolve(kj::StringPtr name) {
     return p->resolve(name);
   } else KJ_IF_MAYBE(b, module->getCompiler().lookupBuiltin(name)) {
     ResolveResult result;
-    result.init<ResolvedDecl>(ResolvedDecl { b->id, b->genericParamCount, 0, b->kind, b });
+    result.init<ResolvedDecl>(ResolvedDecl { b->id, b->genericParamCount, 0, b->kind, b, nullptr });
     return result;
   } else {
     return nullptr;
@@ -854,7 +854,7 @@ Compiler::Node::resolveMember(kj::StringPtr name) {
         Node* node = iter->second;
         ResolveResult result;
         result.init<ResolvedDecl>(ResolvedDecl {
-            node->id, node->genericParamCount, id, node->kind, node });
+            node->id, node->genericParamCount, id, node->kind, node, nullptr });
         return result;
       }
     }
@@ -870,25 +870,25 @@ Compiler::Node::resolveMember(kj::StringPtr name) {
 
 NodeTranslator::Resolver::ResolvedDecl Compiler::Node::resolveBuiltin(Declaration::Which which) {
   auto& b = module->getCompiler().getBuiltin(which);
-  return { b.id, b.genericParamCount, 0, b.kind, &b };
+  return { b.id, b.genericParamCount, 0, b.kind, &b, nullptr };
 }
 
 NodeTranslator::Resolver::ResolvedDecl Compiler::Node::resolveId(uint64_t id) {
   auto& n = KJ_ASSERT_NONNULL(module->getCompiler().findNode(id));
   uint64_t parentId = n.parent.map([](Node& n) { return n.id; }).orDefault(0);
-  return { n.id, n.genericParamCount, parentId, n.kind, &n };
+  return { n.id, n.genericParamCount, parentId, n.kind, &n, nullptr };
 }
 
 kj::Maybe<NodeTranslator::Resolver::ResolvedDecl> Compiler::Node::getParent() {
   return parent.map([](Node& parent) {
     uint64_t scopeId = parent.parent.map([](Node& gp) { return gp.id; }).orDefault(0);
-    return ResolvedDecl { parent.id, parent.genericParamCount, scopeId, parent.kind, &parent };
+    return ResolvedDecl { parent.id, parent.genericParamCount, scopeId, parent.kind, &parent, nullptr };
   });
 }
 
 NodeTranslator::Resolver::ResolvedDecl Compiler::Node::getTopScope() {
   Node& node = module->getRootNode();
-  return ResolvedDecl { node.id, 0, 0, node.kind, &node };
+  return ResolvedDecl { node.id, 0, 0, node.kind, &node, nullptr };
 }
 
 kj::Maybe<Schema> Compiler::Node::resolveBootstrapSchema(
@@ -918,7 +918,7 @@ kj::Maybe<NodeTranslator::Resolver::ResolvedDecl>
 Compiler::Node::resolveImport(kj::StringPtr name) {
   KJ_IF_MAYBE(m, module->importRelative(name)) {
     Node& root = m->getRootNode();
-    return ResolvedDecl { root.id, 0, 0, root.kind, &root };
+    return ResolvedDecl { root.id, 0, 0, root.kind, &root, nullptr };
   } else {
     return nullptr;
   }

c++/src/capnp/compiler/grammar.capnp.h

@@ -53,7 +53,12 @@ struct LocatedText {
   class Builder;
   class Pipeline;
 
-  CAPNP_DECLARE_STRUCT(e75816b56529d464, 1, 1);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(e75816b56529d464, 1, 1)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct LocatedInteger {
@@ -63,7 +68,12 @@ struct LocatedInteger {
   class Builder;
   class Pipeline;
 
-  CAPNP_DECLARE_STRUCT(991c7a3693d62cf2, 2, 0);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(991c7a3693d62cf2, 2, 0)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct LocatedFloat {
@@ -73,7 +83,12 @@ struct LocatedFloat {
   class Builder;
   class Pipeline;
 
-  CAPNP_DECLARE_STRUCT(90f2a60678fd2367, 2, 0);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(90f2a60678fd2367, 2, 0)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct Expression {
@@ -101,7 +116,12 @@ struct Expression {
   struct Application;
   struct Member;
 
-  CAPNP_DECLARE_STRUCT(8e207d4dfe54d0de, 3, 2);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(8e207d4dfe54d0de, 3, 2)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct Expression::Param {
@@ -115,7 +135,12 @@ struct Expression::Param {
     NAMED,
   };
 
-  CAPNP_DECLARE_STRUCT(c90246b71adedbaa, 1, 2);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(c90246b71adedbaa, 1, 2)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct Expression::Application {
@@ -125,7 +150,12 @@ struct Expression::Application {
   class Builder;
   class Pipeline;
 
-  CAPNP_DECLARE_STRUCT(aee8397040b0df7a, 3, 2);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(aee8397040b0df7a, 3, 2)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct Expression::Member {
@@ -135,7 +165,12 @@ struct Expression::Member {
   class Builder;
   class Pipeline;
 
-  CAPNP_DECLARE_STRUCT(aa28e1400d793359, 3, 2);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(aa28e1400d793359, 3, 2)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct Declaration {
@@ -189,7 +224,12 @@ struct Declaration {
   struct Method;
   struct Annotation;
 
-  CAPNP_DECLARE_STRUCT(96efe787c17e83bb, 2, 8);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(96efe787c17e83bb, 2, 8)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct Declaration::BrandParameter {
@@ -199,7 +239,12 @@ struct Declaration::BrandParameter {
   class Builder;
   class Pipeline;
 
-  CAPNP_DECLARE_STRUCT(d5e71144af1ce175, 1, 1);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(d5e71144af1ce175, 1, 1)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct Declaration::AnnotationApplication {
@@ -210,7 +255,12 @@ struct Declaration::AnnotationApplication {
   class Pipeline;
   struct Value;
 
-  CAPNP_DECLARE_STRUCT(d00489d473826290, 1, 2);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(d00489d473826290, 1, 2)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct Declaration::AnnotationApplication::Value {
@@ -224,7 +274,12 @@ struct Declaration::AnnotationApplication::Value {
     EXPRESSION,
   };
 
-  CAPNP_DECLARE_STRUCT(fb5aeed95cdf6af9, 1, 2);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(fb5aeed95cdf6af9, 1, 2)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct Declaration::ParamList {
@@ -238,7 +293,12 @@ struct Declaration::ParamList {
     TYPE,
   };
 
-  CAPNP_DECLARE_STRUCT(b3f66e7a79d81bcd, 2, 1);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(b3f66e7a79d81bcd, 2, 1)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct Declaration::Param {
@@ -249,7 +309,12 @@ struct Declaration::Param {
   class Pipeline;
   struct DefaultValue;
 
-  CAPNP_DECLARE_STRUCT(fffe08a9a697d2a5, 2, 4);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(fffe08a9a697d2a5, 2, 4)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct Declaration::Param::DefaultValue {
@@ -263,7 +328,12 @@ struct Declaration::Param::DefaultValue {
     VALUE,
   };
 
-  CAPNP_DECLARE_STRUCT(e5104515fd88ea47, 2, 4);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(e5104515fd88ea47, 2, 4)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct Declaration::Id {
@@ -278,7 +348,12 @@ struct Declaration::Id {
     ORDINAL,
   };
 
-  CAPNP_DECLARE_STRUCT(89f0c973c103ae96, 2, 8);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(89f0c973c103ae96, 2, 8)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct Declaration::Using {
@@ -288,7 +363,12 @@ struct Declaration::Using {
   class Builder;
   class Pipeline;
 
-  CAPNP_DECLARE_STRUCT(e93164a80bfe2ccf, 2, 8);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(e93164a80bfe2ccf, 2, 8)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct Declaration::Const {
@@ -298,7 +378,12 @@ struct Declaration::Const {
   class Builder;
   class Pipeline;
 
-  CAPNP_DECLARE_STRUCT(b348322a8dcf0d0c, 2, 8);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(b348322a8dcf0d0c, 2, 8)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct Declaration::Field {
@@ -309,7 +394,12 @@ struct Declaration::Field {
   class Pipeline;
   struct DefaultValue;
 
-  CAPNP_DECLARE_STRUCT(8f2622208fb358c8, 2, 8);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(8f2622208fb358c8, 2, 8)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct Declaration::Field::DefaultValue {
@@ -323,7 +413,12 @@ struct Declaration::Field::DefaultValue {
     VALUE,
   };
 
-  CAPNP_DECLARE_STRUCT(d0d1a21de617951f, 2, 8);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(d0d1a21de617951f, 2, 8)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct Declaration::Interface {
@@ -333,7 +428,12 @@ struct Declaration::Interface {
   class Builder;
   class Pipeline;
 
-  CAPNP_DECLARE_STRUCT(992a90eaf30235d3, 2, 8);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(992a90eaf30235d3, 2, 8)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct Declaration::Method {
@@ -344,7 +444,12 @@ struct Declaration::Method {
   class Pipeline;
   struct Results;
 
-  CAPNP_DECLARE_STRUCT(eb971847d617c0b9, 2, 8);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(eb971847d617c0b9, 2, 8)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct Declaration::Method::Results {
@@ -358,7 +463,12 @@ struct Declaration::Method::Results {
     EXPLICIT,
   };
 
-  CAPNP_DECLARE_STRUCT(c6238c7d62d65173, 2, 8);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(c6238c7d62d65173, 2, 8)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct Declaration::Annotation {
@@ -368,7 +478,12 @@ struct Declaration::Annotation {
   class Builder;
   class Pipeline;
 
-  CAPNP_DECLARE_STRUCT(9cb9e86e3198037f, 2, 8);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(9cb9e86e3198037f, 2, 8)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct ParsedFile {
@@ -378,7 +493,12 @@ struct ParsedFile {
   class Builder;
   class Pipeline;
 
-  CAPNP_DECLARE_STRUCT(84e4f3f5a807605c, 0, 1);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(84e4f3f5a807605c, 0, 1)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 // =======================================================================================

c++/src/capnp/compiler/lexer.capnp.c++

@@ -209,11 +209,9 @@ static const ::capnp::_::RawSchema* const d_91cc55cd57de5419[] = {
 };
 static const uint16_t m_91cc55cd57de5419[] = {9, 6, 8, 3, 0, 2, 4, 5, 7, 1};
 static const uint16_t i_91cc55cd57de5419[] = {0, 1, 2, 3, 4, 5, 6, 9, 7, 8};
-const ::capnp::_::RawBrandedSchema::Dependency bd_91cc55cd57de5419[] = {
-};
 const ::capnp::_::RawSchema s_91cc55cd57de5419 = {
   0x91cc55cd57de5419, b_91cc55cd57de5419.words, 195, d_91cc55cd57de5419, m_91cc55cd57de5419,
-  1, 10, i_91cc55cd57de5419, nullptr, nullptr, { &s_91cc55cd57de5419, nullptr, bd_91cc55cd57de5419, 0, sizeof(bd_91cc55cd57de5419) / sizeof(bd_91cc55cd57de5419[0]), nullptr }
+  1, 10, i_91cc55cd57de5419, nullptr, nullptr, { &s_91cc55cd57de5419, nullptr, nullptr, 0, 0, nullptr }
 };
 #endif  // !CAPNP_LITE
 static const ::capnp::_::AlignedData<119> b_c6725e678d60fa37 = {
@@ -345,11 +343,9 @@ static const ::capnp::_::RawSchema* const d_c6725e678d60fa37[] = {
 };
 static const uint16_t m_c6725e678d60fa37[] = {2, 3, 5, 1, 4, 0};
 static const uint16_t i_c6725e678d60fa37[] = {1, 2, 0, 3, 4, 5};
-const ::capnp::_::RawBrandedSchema::Dependency bd_c6725e678d60fa37[] = {
-};
 const ::capnp::_::RawSchema s_c6725e678d60fa37 = {
   0xc6725e678d60fa37, b_c6725e678d60fa37.words, 119, d_c6725e678d60fa37, m_c6725e678d60fa37,
-  2, 6, i_c6725e678d60fa37, nullptr, nullptr, { &s_c6725e678d60fa37, nullptr, bd_c6725e678d60fa37, 0, sizeof(bd_c6725e678d60fa37) / sizeof(bd_c6725e678d60fa37[0]), nullptr }
+  2, 6, i_c6725e678d60fa37, nullptr, nullptr, { &s_c6725e678d60fa37, nullptr, nullptr, 0, 0, nullptr }
 };
 #endif  // !CAPNP_LITE
 static const ::capnp::_::AlignedData<38> b_9e69a92512b19d18 = {
@@ -399,11 +395,9 @@ static const ::capnp::_::RawSchema* const d_9e69a92512b19d18[] = {
 };
 static const uint16_t m_9e69a92512b19d18[] = {0};
 static const uint16_t i_9e69a92512b19d18[] = {0};
-const ::capnp::_::RawBrandedSchema::Dependency bd_9e69a92512b19d18[] = {
-};
 const ::capnp::_::RawSchema s_9e69a92512b19d18 = {
   0x9e69a92512b19d18, b_9e69a92512b19d18.words, 38, d_9e69a92512b19d18, m_9e69a92512b19d18,
-  1, 1, i_9e69a92512b19d18, nullptr, nullptr, { &s_9e69a92512b19d18, nullptr, bd_9e69a92512b19d18, 0, sizeof(bd_9e69a92512b19d18) / sizeof(bd_9e69a92512b19d18[0]), nullptr }
+  1, 1, i_9e69a92512b19d18, nullptr, nullptr, { &s_9e69a92512b19d18, nullptr, nullptr, 0, 0, nullptr }
 };
 #endif  // !CAPNP_LITE
 static const ::capnp::_::AlignedData<40> b_a11f97b9d6c73dd4 = {
@@ -455,11 +449,9 @@ static const ::capnp::_::RawSchema* const d_a11f97b9d6c73dd4[] = {
 };
 static const uint16_t m_a11f97b9d6c73dd4[] = {0};
 static const uint16_t i_a11f97b9d6c73dd4[] = {0};
-const ::capnp::_::RawBrandedSchema::Dependency bd_a11f97b9d6c73dd4[] = {
-};
 const ::capnp::_::RawSchema s_a11f97b9d6c73dd4 = {
   0xa11f97b9d6c73dd4, b_a11f97b9d6c73dd4.words, 40, d_a11f97b9d6c73dd4, m_a11f97b9d6c73dd4,
-  1, 1, i_a11f97b9d6c73dd4, nullptr, nullptr, { &s_a11f97b9d6c73dd4, nullptr, bd_a11f97b9d6c73dd4, 0, sizeof(bd_a11f97b9d6c73dd4) / sizeof(bd_a11f97b9d6c73dd4[0]), nullptr }
+  1, 1, i_a11f97b9d6c73dd4, nullptr, nullptr, { &s_a11f97b9d6c73dd4, nullptr, nullptr, 0, 0, nullptr }
 };
 #endif  // !CAPNP_LITE
 }  // namespace schemas
@@ -470,10 +462,38 @@ const ::capnp::_::RawSchema s_a11f97b9d6c73dd4 = {
 namespace capnp {
 namespace compiler {
 
-CAPNP_DEFINE_STRUCT(Token, , 91cc55cd57de5419);
-CAPNP_DEFINE_STRUCT(Statement, , c6725e678d60fa37);
-CAPNP_DEFINE_STRUCT(LexedTokens, , 9e69a92512b19d18);
-CAPNP_DEFINE_STRUCT(LexedStatements, , a11f97b9d6c73dd4);
+// Token
+constexpr ::capnp::_::StructSize Token::_capnpPrivate::structSize;
+#if !CAPNP_LITE
+constexpr ::capnp::Kind Token::_capnpPrivate::kind;
+constexpr ::capnp::_::RawSchema const* Token::_capnpPrivate::schema;
+constexpr ::capnp::_::RawBrandedSchema const* Token::_capnpPrivate::brand;
+#endif  // !CAPNP_LITE
+
+// Statement
+constexpr ::capnp::_::StructSize Statement::_capnpPrivate::structSize;
+#if !CAPNP_LITE
+constexpr ::capnp::Kind Statement::_capnpPrivate::kind;
+constexpr ::capnp::_::RawSchema const* Statement::_capnpPrivate::schema;
+constexpr ::capnp::_::RawBrandedSchema const* Statement::_capnpPrivate::brand;
+#endif  // !CAPNP_LITE
+
+// LexedTokens
+constexpr ::capnp::_::StructSize LexedTokens::_capnpPrivate::structSize;
+#if !CAPNP_LITE
+constexpr ::capnp::Kind LexedTokens::_capnpPrivate::kind;
+constexpr ::capnp::_::RawSchema const* LexedTokens::_capnpPrivate::schema;
+constexpr ::capnp::_::RawBrandedSchema const* LexedTokens::_capnpPrivate::brand;
+#endif  // !CAPNP_LITE
+
+// LexedStatements
+constexpr ::capnp::_::StructSize LexedStatements::_capnpPrivate::structSize;
+#if !CAPNP_LITE
+constexpr ::capnp::Kind LexedStatements::_capnpPrivate::kind;
+constexpr ::capnp::_::RawSchema const* LexedStatements::_capnpPrivate::schema;
+constexpr ::capnp::_::RawBrandedSchema const* LexedStatements::_capnpPrivate::brand;
+#endif  // !CAPNP_LITE
+
 
 }  // namespace
 }  // namespace

c++/src/capnp/compiler/lexer.capnp.h

@@ -42,7 +42,12 @@ struct Token {
     BINARY_LITERAL,
   };
 
-  CAPNP_DECLARE_STRUCT(91cc55cd57de5419, 3, 1);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(91cc55cd57de5419, 3, 1)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct Statement {
@@ -56,7 +61,12 @@ struct Statement {
     BLOCK,
   };
 
-  CAPNP_DECLARE_STRUCT(c6725e678d60fa37, 2, 3);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(c6725e678d60fa37, 2, 3)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct LexedTokens {
@@ -66,7 +76,12 @@ struct LexedTokens {
   class Builder;
   class Pipeline;
 
-  CAPNP_DECLARE_STRUCT(9e69a92512b19d18, 0, 1);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(9e69a92512b19d18, 0, 1)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct LexedStatements {
@@ -76,7 +91,12 @@ struct LexedStatements {
   class Builder;
   class Pipeline;
 
-  CAPNP_DECLARE_STRUCT(a11f97b9d6c73dd4, 0, 1);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(a11f97b9d6c73dd4, 0, 1)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 // =======================================================================================

c++/src/capnp/generated-header-support.h

@@ -454,11 +454,6 @@ inline constexpr uint sizeInWords() {
 
 }  // namespace capnp
 
-#define CAPNP_COMMA ,
-// Unfortunately needed if the `type` parameter to the macros below contains template parameters --
-// all commas must be replaced with CAPNP_COMMA otherwise they will be interpreted as macro
-// parameter separators! Ugh.
-
 #if CAPNP_LITE
 
 #define CAPNP_DECLARE_SCHEMA(id) \
@@ -474,33 +469,11 @@ inline constexpr uint sizeInWords() {
     constexpr uint64_t EnumInfo<type>::typeId
 
 #define CAPNP_DECLARE_STRUCT_HEADER(id, dataWordSize, pointerCount) \
-    struct _capnpPrivate { \
       struct IsStruct; \
       static constexpr uint64_t typeId = 0x##id; \
       static constexpr ::capnp::_::StructSize structSize = ::capnp::_::StructSize( \
           dataWordSize * ::capnp::WORDS, pointerCount * ::capnp::POINTERS); \
       static inline ::capnp::word const* encodedSchema() { return ::capnp::schemas::bp_##id; }
-#define CAPNP_DECLARE_STRUCT(id, dataWordSize, pointerCount) \
-    CAPNP_DECLARE_STRUCT_HEADER(id, dataWordSize, pointerCount) \
-    }
-#define CAPNP_DECLARE_TEMPLATE_STRUCT(id, dataWordSize, pointerCount, \
-                                      ...) \
-    CAPNP_DECLARE_STRUCT_HEADER(id, dataWordSize, pointerCount) \
-    }
-#define CAPNP_DEFINE_STRUCT(type, templates, id) \
-    templates constexpr uint64_t type::_capnpPrivate::typeId; \
-    templates constexpr ::capnp::_::StructSize type::_capnpPrivate::structSize
-#define CAPNP_DEFINE_TEMPLATE_STRUCT(type, templates, id, brandScopesInitializer, \
-                                     brandBindingsInitializer, brandDependenciesInitializer) \
-    templates constexpr uint64_t type::_capnpPrivate::typeId; \
-    templates constexpr ::capnp::_::StructSize type::_capnpPrivate::structSize
-
-#define CAPNP_DECLARE_INTERFACE(id) static_assert(true, "")
-#define CAPNP_DECLARE_TEMPLATE_INTERFACE(id, ...) static_assert(true, "")
-#define CAPNP_DEFINE_INTERFACE(type, templates, id) static_assert(true, "")
-#define CAPNP_DEFINE_TEMPLATE_INTERFACE(type, templates, id, brandScopesInitializer, \
-                                        brandBindingsInitializer, brandDependenciesInitializer) \
-    static_assert(true, "")
 
 #else  // CAPNP_LITE
 
@@ -520,7 +493,6 @@ inline constexpr uint sizeInWords() {
     constexpr ::capnp::_::RawSchema const* EnumInfo<type>::schema
 
 #define CAPNP_DECLARE_STRUCT_HEADER(id, dataWordSize, pointerCount) \
-    struct _capnpPrivate { \
       struct IsStruct; \
       static constexpr uint64_t typeId = 0x##id; \
       static constexpr ::capnp::Kind kind = ::capnp::Kind::STRUCT; \
@@ -528,88 +500,13 @@ inline constexpr uint sizeInWords() {
           dataWordSize * ::capnp::WORDS, pointerCount * ::capnp::POINTERS); \
       static inline ::capnp::word const* encodedSchema() { return ::capnp::schemas::bp_##id; } \
       static constexpr ::capnp::_::RawSchema const* schema = &::capnp::schemas::s_##id;
-#define CAPNP_DECLARE_STRUCT(id, dataWordSize, pointerCount) \
-    CAPNP_DECLARE_STRUCT_HEADER(id, dataWordSize, pointerCount) \
-      static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand; \
-    }
-#define CAPNP_DECLARE_TEMPLATE_STRUCT(id, dataWordSize, pointerCount, ...) \
-    CAPNP_DECLARE_STRUCT_HEADER(id, dataWordSize, pointerCount) \
-      static const ::capnp::_::RawBrandedSchema::Scope brandScopes[]; \
-      static const ::capnp::_::RawBrandedSchema::Binding brandBindings[]; \
-      static const ::capnp::_::RawBrandedSchema::Dependency brandDependencies[]; \
-      static const ::capnp::_::RawBrandedSchema specificBrand; \
-      static constexpr ::capnp::_::RawBrandedSchema const* brand = \
-          ::capnp::_::ChooseBrand<_capnpPrivate, __VA_ARGS__>::brand; \
-    }
-#define CAPNP_DEFINE_STRUCT(type, templates, id) \
-    templates constexpr uint64_t type::_capnpPrivate::typeId; \
-    templates constexpr ::capnp::Kind type::_capnpPrivate::kind; \
-    templates constexpr ::capnp::_::StructSize type::_capnpPrivate::structSize; \
-    templates constexpr ::capnp::_::RawSchema const* type::_capnpPrivate::schema; \
-    templates constexpr ::capnp::_::RawBrandedSchema const* type::_capnpPrivate::brand
-#define CAPNP_DEFINE_TEMPLATE_STRUCT(type, templates, id, brandScopesInitializer, \
-                                     brandBindingsInitializer, brandDependenciesInitializer) \
-    templates constexpr uint64_t type::_capnpPrivate::typeId; \
-    templates constexpr ::capnp::Kind type::_capnpPrivate::kind; \
-    templates constexpr ::capnp::_::StructSize type::_capnpPrivate::structSize; \
-    templates constexpr ::capnp::_::RawSchema const* type::_capnpPrivate::schema; \
-    templates constexpr ::capnp::_::RawBrandedSchema const* type::_capnpPrivate::brand; \
-    templates const ::capnp::_::RawBrandedSchema::Scope type::_capnpPrivate::brandScopes[] = \
-        brandScopesInitializer; \
-    templates const ::capnp::_::RawBrandedSchema::Binding type::_capnpPrivate::brandBindings[] = \
-        brandBindingsInitializer; \
-    templates const ::capnp::_::RawBrandedSchema::Dependency type::_capnpPrivate::brandDependencies[] = \
-        brandDependenciesInitializer; \
-    templates const ::capnp::_::RawBrandedSchema type::_capnpPrivate::specificBrand = { \
-      &::capnp::schemas::s_##id, brandScopes, brandDependencies, \
-      sizeof(brandScopes) / sizeof(brandScopes[0]), \
-      sizeof(brandDependencies) / sizeof(brandDependencies[0]), \
-      nullptr \
-    }
 
 #define CAPNP_DECLARE_INTERFACE_HEADER(id) \
-    struct _capnpPrivate { \
       struct IsInterface; \
       static constexpr uint64_t typeId = 0x##id; \
       static constexpr ::capnp::Kind kind = ::capnp::Kind::INTERFACE; \
       static inline ::capnp::word const* encodedSchema() { return ::capnp::schemas::bp_##id; } \
       static constexpr ::capnp::_::RawSchema const* schema = &::capnp::schemas::s_##id;
-#define CAPNP_DECLARE_INTERFACE(id) \
-    CAPNP_DECLARE_INTERFACE_HEADER(id) \
-      static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand; \
-    }
-#define CAPNP_DECLARE_TEMPLATE_INTERFACE(id, ...) \
-    CAPNP_DECLARE_INTERFACE_HEADER(id) \
-      static const ::capnp::_::RawBrandedSchema::Scope brandScopes[]; \
-      static const ::capnp::_::RawBrandedSchema::Binding brandBindings[]; \
-      static const ::capnp::_::RawBrandedSchema::Dependency brandDependencies[]; \
-      static const ::capnp::_::RawBrandedSchema specificBrand; \
-      static constexpr ::capnp::_::RawBrandedSchema const* brand = \
-          ::capnp::_::ChooseBrand<_capnpPrivate, __VA_ARGS__>::brand; \
-    }
-#define CAPNP_DEFINE_INTERFACE(type, templates, id) \
-    templates constexpr uint64_t type::_capnpPrivate::typeId; \
-    templates constexpr ::capnp::Kind type::_capnpPrivate::kind; \
-    templates constexpr ::capnp::_::RawSchema const* type::_capnpPrivate::schema; \
-    templates constexpr ::capnp::_::RawBrandedSchema const* type::_capnpPrivate::brand
-#define CAPNP_DEFINE_TEMPLATE_INTERFACE(type, templates, id, brandScopesInitializer, \
-                                        brandBindingsInitializer, brandDependenciesInitializer) \
-    templates constexpr uint64_t type::_capnpPrivate::typeId; \
-    templates constexpr ::capnp::Kind type::_capnpPrivate::kind; \
-    templates constexpr ::capnp::_::RawSchema const* type::_capnpPrivate::schema; \
-    templates constexpr ::capnp::_::RawBrandedSchema const* type::_capnpPrivate::brand; \
-    templates const ::capnp::_::RawBrandedSchema::Scope type::_capnpPrivate::brandScopes[] = \
-        brandScopesInitializer; \
-    templates const ::capnp::_::RawBrandedSchema::Binding type::_capnpPrivate::brandBindings[] = \
-        brandBindingsInitializer; \
-    templates const ::capnp::_::RawBrandedSchema::Dependency type::_capnpPrivate::brandDependencies[] = \
-        brandDependenciesInitializer; \
-    templates const ::capnp::_::RawBrandedSchema type::_capnpPrivate::specificBrand = { \
-      &::capnp::schemas::s_##id, brandScopes, brandDependencies, \
-      sizeof(brandScopes) / sizeof(brandScopes[0]), \
-      sizeof(brandDependencies) / sizeof(brandDependencies[0]), \
-      nullptr \
-    }
 
 #endif  // CAPNP_LITE, else
 

c++/src/capnp/persistent.capnp.c++

@@ -98,11 +98,9 @@ static const ::capnp::_::AlignedData<19> b_f76fba59183073a5 = {
 };
 ::capnp::word const* const bp_f76fba59183073a5 = b_f76fba59183073a5.words;
 #if !CAPNP_LITE
-const ::capnp::_::RawBrandedSchema::Dependency bd_f76fba59183073a5[] = {
-};
 const ::capnp::_::RawSchema s_f76fba59183073a5 = {
   0xf76fba59183073a5, b_f76fba59183073a5.words, 19, nullptr, nullptr,
-  0, 0, nullptr, nullptr, nullptr, { &s_f76fba59183073a5, nullptr, bd_f76fba59183073a5, 0, sizeof(bd_f76fba59183073a5) / sizeof(bd_f76fba59183073a5[0]), nullptr }
+  0, 0, nullptr, nullptr, nullptr, { &s_f76fba59183073a5, nullptr, nullptr, 0, 0, nullptr }
 };
 #endif  // !CAPNP_LITE
 static const ::capnp::_::AlignedData<36> b_b76848c18c40efbf = {
@@ -147,11 +145,9 @@ static const ::capnp::_::AlignedData<36> b_b76848c18c40efbf = {
 #if !CAPNP_LITE
 static const uint16_t m_b76848c18c40efbf[] = {0};
 static const uint16_t i_b76848c18c40efbf[] = {0};
-const ::capnp::_::RawBrandedSchema::Dependency bd_b76848c18c40efbf[] = {
-};
 const ::capnp::_::RawSchema s_b76848c18c40efbf = {
   0xb76848c18c40efbf, b_b76848c18c40efbf.words, 36, nullptr, m_b76848c18c40efbf,
-  0, 1, i_b76848c18c40efbf, nullptr, nullptr, { &s_b76848c18c40efbf, nullptr, bd_b76848c18c40efbf, 0, sizeof(bd_b76848c18c40efbf) / sizeof(bd_b76848c18c40efbf[0]), nullptr }
+  0, 1, i_b76848c18c40efbf, nullptr, nullptr, { &s_b76848c18c40efbf, nullptr, nullptr, 0, 0, nullptr }
 };
 #endif  // !CAPNP_LITE
 static const ::capnp::_::AlignedData<81> b_84ff286cd00a3ed4 = {

c++/src/capnp/rpc-twoparty.capnp.c++

@@ -36,11 +36,9 @@ static const ::capnp::_::AlignedData<26> b_9fd69ebc87b9719c = {
 ::capnp::word const* const bp_9fd69ebc87b9719c = b_9fd69ebc87b9719c.words;
 #if !CAPNP_LITE
 static const uint16_t m_9fd69ebc87b9719c[] = {1, 0};
-const ::capnp::_::RawBrandedSchema::Dependency bd_9fd69ebc87b9719c[] = {
-};
 const ::capnp::_::RawSchema s_9fd69ebc87b9719c = {
   0x9fd69ebc87b9719c, b_9fd69ebc87b9719c.words, 26, nullptr, m_9fd69ebc87b9719c,
-  0, 2, nullptr, nullptr, nullptr, { &s_9fd69ebc87b9719c, nullptr, bd_9fd69ebc87b9719c, 0, sizeof(bd_9fd69ebc87b9719c) / sizeof(bd_9fd69ebc87b9719c[0]), nullptr }
+  0, 2, nullptr, nullptr, nullptr, { &s_9fd69ebc87b9719c, nullptr, nullptr, 0, 0, nullptr }
 };
 #endif  // !CAPNP_LITE
 CAPNP_DEFINE_ENUM(Side_9fd69ebc87b9719c, 9fd69ebc87b9719c);
@@ -86,11 +84,9 @@ static const ::capnp::_::RawSchema* const d_d20b909fee733a8e[] = {
 };
 static const uint16_t m_d20b909fee733a8e[] = {0};
 static const uint16_t i_d20b909fee733a8e[] = {0};
-const ::capnp::_::RawBrandedSchema::Dependency bd_d20b909fee733a8e[] = {
-};
 const ::capnp::_::RawSchema s_d20b909fee733a8e = {
   0xd20b909fee733a8e, b_d20b909fee733a8e.words, 33, d_d20b909fee733a8e, m_d20b909fee733a8e,
-  1, 1, i_d20b909fee733a8e, nullptr, nullptr, { &s_d20b909fee733a8e, nullptr, bd_d20b909fee733a8e, 0, sizeof(bd_d20b909fee733a8e) / sizeof(bd_d20b909fee733a8e[0]), nullptr }
+  1, 1, i_d20b909fee733a8e, nullptr, nullptr, { &s_d20b909fee733a8e, nullptr, nullptr, 0, 0, nullptr }
 };
 #endif  // !CAPNP_LITE
 static const ::capnp::_::AlignedData<34> b_b88d09a9c5f39817 = {
@@ -133,11 +129,9 @@ static const ::capnp::_::AlignedData<34> b_b88d09a9c5f39817 = {
 #if !CAPNP_LITE
 static const uint16_t m_b88d09a9c5f39817[] = {0};
 static const uint16_t i_b88d09a9c5f39817[] = {0};
-const ::capnp::_::RawBrandedSchema::Dependency bd_b88d09a9c5f39817[] = {
-};
 const ::capnp::_::RawSchema s_b88d09a9c5f39817 = {
   0xb88d09a9c5f39817, b_b88d09a9c5f39817.words, 34, nullptr, m_b88d09a9c5f39817,
-  0, 1, i_b88d09a9c5f39817, nullptr, nullptr, { &s_b88d09a9c5f39817, nullptr, bd_b88d09a9c5f39817, 0, sizeof(bd_b88d09a9c5f39817) / sizeof(bd_b88d09a9c5f39817[0]), nullptr }
+  0, 1, i_b88d09a9c5f39817, nullptr, nullptr, { &s_b88d09a9c5f39817, nullptr, nullptr, 0, 0, nullptr }
 };
 #endif  // !CAPNP_LITE
 static const ::capnp::_::AlignedData<18> b_89f389b6fd4082c1 = {
@@ -162,11 +156,9 @@ static const ::capnp::_::AlignedData<18> b_89f389b6fd4082c1 = {
 };
 ::capnp::word const* const bp_89f389b6fd4082c1 = b_89f389b6fd4082c1.words;
 #if !CAPNP_LITE
-const ::capnp::_::RawBrandedSchema::Dependency bd_89f389b6fd4082c1[] = {
-};
 const ::capnp::_::RawSchema s_89f389b6fd4082c1 = {
   0x89f389b6fd4082c1, b_89f389b6fd4082c1.words, 18, nullptr, nullptr,
-  0, 0, nullptr, nullptr, nullptr, { &s_89f389b6fd4082c1, nullptr, bd_89f389b6fd4082c1, 0, sizeof(bd_89f389b6fd4082c1) / sizeof(bd_89f389b6fd4082c1[0]), nullptr }
+  0, 0, nullptr, nullptr, nullptr, { &s_89f389b6fd4082c1, nullptr, nullptr, 0, 0, nullptr }
 };
 #endif  // !CAPNP_LITE
 static const ::capnp::_::AlignedData<19> b_b47f4979672cb59d = {
@@ -192,11 +184,9 @@ static const ::capnp::_::AlignedData<19> b_b47f4979672cb59d = {
 };
 ::capnp::word const* const bp_b47f4979672cb59d = b_b47f4979672cb59d.words;
 #if !CAPNP_LITE
-const ::capnp::_::RawBrandedSchema::Dependency bd_b47f4979672cb59d[] = {
-};
 const ::capnp::_::RawSchema s_b47f4979672cb59d = {
   0xb47f4979672cb59d, b_b47f4979672cb59d.words, 19, nullptr, nullptr,
-  0, 0, nullptr, nullptr, nullptr, { &s_b47f4979672cb59d, nullptr, bd_b47f4979672cb59d, 0, sizeof(bd_b47f4979672cb59d) / sizeof(bd_b47f4979672cb59d[0]), nullptr }
+  0, 0, nullptr, nullptr, nullptr, { &s_b47f4979672cb59d, nullptr, nullptr, 0, 0, nullptr }
 };
 #endif  // !CAPNP_LITE
 static const ::capnp::_::AlignedData<65> b_95b29059097fca83 = {
@@ -270,11 +260,9 @@ static const ::capnp::_::AlignedData<65> b_95b29059097fca83 = {
 #if !CAPNP_LITE
 static const uint16_t m_95b29059097fca83[] = {0, 1, 2};
 static const uint16_t i_95b29059097fca83[] = {0, 1, 2};
-const ::capnp::_::RawBrandedSchema::Dependency bd_95b29059097fca83[] = {
-};
 const ::capnp::_::RawSchema s_95b29059097fca83 = {
   0x95b29059097fca83, b_95b29059097fca83.words, 65, nullptr, m_95b29059097fca83,
-  0, 3, i_95b29059097fca83, nullptr, nullptr, { &s_95b29059097fca83, nullptr, bd_95b29059097fca83, 0, sizeof(bd_95b29059097fca83) / sizeof(bd_95b29059097fca83[0]), nullptr }
+  0, 3, i_95b29059097fca83, nullptr, nullptr, { &s_95b29059097fca83, nullptr, nullptr, 0, 0, nullptr }
 };
 #endif  // !CAPNP_LITE
 static const ::capnp::_::AlignedData<65> b_9d263a3630b7ebee = {
@@ -348,11 +336,9 @@ static const ::capnp::_::AlignedData<65> b_9d263a3630b7ebee = {
 #if !CAPNP_LITE
 static const uint16_t m_9d263a3630b7ebee[] = {2, 0, 1};
 static const uint16_t i_9d263a3630b7ebee[] = {0, 1, 2};
-const ::capnp::_::RawBrandedSchema::Dependency bd_9d263a3630b7ebee[] = {
-};
 const ::capnp::_::RawSchema s_9d263a3630b7ebee = {
   0x9d263a3630b7ebee, b_9d263a3630b7ebee.words, 65, nullptr, m_9d263a3630b7ebee,
-  0, 3, i_9d263a3630b7ebee, nullptr, nullptr, { &s_9d263a3630b7ebee, nullptr, bd_9d263a3630b7ebee, 0, sizeof(bd_9d263a3630b7ebee) / sizeof(bd_9d263a3630b7ebee[0]), nullptr }
+  0, 3, i_9d263a3630b7ebee, nullptr, nullptr, { &s_9d263a3630b7ebee, nullptr, nullptr, 0, 0, nullptr }
 };
 #endif  // !CAPNP_LITE
 }  // namespace schemas
@@ -364,12 +350,54 @@ namespace capnp {
 namespace rpc {
 namespace twoparty {
 
-CAPNP_DEFINE_STRUCT(VatId, , d20b909fee733a8e);
-CAPNP_DEFINE_STRUCT(ProvisionId, , b88d09a9c5f39817);
-CAPNP_DEFINE_STRUCT(RecipientId, , 89f389b6fd4082c1);
-CAPNP_DEFINE_STRUCT(ThirdPartyCapId, , b47f4979672cb59d);
-CAPNP_DEFINE_STRUCT(JoinKeyPart, , 95b29059097fca83);
-CAPNP_DEFINE_STRUCT(JoinResult, , 9d263a3630b7ebee);
+// VatId
+constexpr ::capnp::_::StructSize VatId::_capnpPrivate::structSize;
+#if !CAPNP_LITE
+constexpr ::capnp::Kind VatId::_capnpPrivate::kind;
+constexpr ::capnp::_::RawSchema const* VatId::_capnpPrivate::schema;
+constexpr ::capnp::_::RawBrandedSchema const* VatId::_capnpPrivate::brand;
+#endif  // !CAPNP_LITE
+
+// ProvisionId
+constexpr ::capnp::_::StructSize ProvisionId::_capnpPrivate::structSize;
+#if !CAPNP_LITE
+constexpr ::capnp::Kind ProvisionId::_capnpPrivate::kind;
+constexpr ::capnp::_::RawSchema const* ProvisionId::_capnpPrivate::schema;
+constexpr ::capnp::_::RawBrandedSchema const* ProvisionId::_capnpPrivate::brand;
+#endif  // !CAPNP_LITE
+
+// RecipientId
+constexpr ::capnp::_::StructSize RecipientId::_capnpPrivate::structSize;
+#if !CAPNP_LITE
+constexpr ::capnp::Kind RecipientId::_capnpPrivate::kind;
+constexpr ::capnp::_::RawSchema const* RecipientId::_capnpPrivate::schema;
+constexpr ::capnp::_::RawBrandedSchema const* RecipientId::_capnpPrivate::brand;
+#endif  // !CAPNP_LITE
+
+// ThirdPartyCapId
+constexpr ::capnp::_::StructSize ThirdPartyCapId::_capnpPrivate::structSize;
+#if !CAPNP_LITE
+constexpr ::capnp::Kind ThirdPartyCapId::_capnpPrivate::kind;
+constexpr ::capnp::_::RawSchema const* ThirdPartyCapId::_capnpPrivate::schema;
+constexpr ::capnp::_::RawBrandedSchema const* ThirdPartyCapId::_capnpPrivate::brand;
+#endif  // !CAPNP_LITE
+
+// JoinKeyPart
+constexpr ::capnp::_::StructSize JoinKeyPart::_capnpPrivate::structSize;
+#if !CAPNP_LITE
+constexpr ::capnp::Kind JoinKeyPart::_capnpPrivate::kind;
+constexpr ::capnp::_::RawSchema const* JoinKeyPart::_capnpPrivate::schema;
+constexpr ::capnp::_::RawBrandedSchema const* JoinKeyPart::_capnpPrivate::brand;
+#endif  // !CAPNP_LITE
+
+// JoinResult
+constexpr ::capnp::_::StructSize JoinResult::_capnpPrivate::structSize;
+#if !CAPNP_LITE
+constexpr ::capnp::Kind JoinResult::_capnpPrivate::kind;
+constexpr ::capnp::_::RawSchema const* JoinResult::_capnpPrivate::schema;
+constexpr ::capnp::_::RawBrandedSchema const* JoinResult::_capnpPrivate::brand;
+#endif  // !CAPNP_LITE
+
 
 }  // namespace
 }  // namespace

c++/src/capnp/rpc-twoparty.capnp.h

@@ -43,7 +43,12 @@ struct VatId {
   class Builder;
   class Pipeline;
 
-  CAPNP_DECLARE_STRUCT(d20b909fee733a8e, 1, 0);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(d20b909fee733a8e, 1, 0)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct ProvisionId {
@@ -53,7 +58,12 @@ struct ProvisionId {
   class Builder;
   class Pipeline;
 
-  CAPNP_DECLARE_STRUCT(b88d09a9c5f39817, 1, 0);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(b88d09a9c5f39817, 1, 0)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct RecipientId {
@@ -63,7 +73,12 @@ struct RecipientId {
   class Builder;
   class Pipeline;
 
-  CAPNP_DECLARE_STRUCT(89f389b6fd4082c1, 0, 0);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(89f389b6fd4082c1, 0, 0)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct ThirdPartyCapId {
@@ -73,7 +88,12 @@ struct ThirdPartyCapId {
   class Builder;
   class Pipeline;
 
-  CAPNP_DECLARE_STRUCT(b47f4979672cb59d, 0, 0);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(b47f4979672cb59d, 0, 0)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct JoinKeyPart {
@@ -83,7 +103,12 @@ struct JoinKeyPart {
   class Builder;
   class Pipeline;
 
-  CAPNP_DECLARE_STRUCT(95b29059097fca83, 1, 0);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(95b29059097fca83, 1, 0)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct JoinResult {
@@ -93,7 +118,12 @@ struct JoinResult {
   class Builder;
   class Pipeline;
 
-  CAPNP_DECLARE_STRUCT(9d263a3630b7ebee, 1, 1);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(9d263a3630b7ebee, 1, 1)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 // =======================================================================================

c++/src/capnp/rpc.capnp.h

@@ -71,7 +71,12 @@ struct Message {
     DISEMBARGO,
   };
 
-  CAPNP_DECLARE_STRUCT(91b79f1f808db032, 1, 1);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(91b79f1f808db032, 1, 1)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct Bootstrap {
@@ -81,7 +86,12 @@ struct Bootstrap {
   class Builder;
   class Pipeline;
 
-  CAPNP_DECLARE_STRUCT(e94ccf8031176ec4, 1, 1);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(e94ccf8031176ec4, 1, 1)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct Call {
@@ -92,7 +102,12 @@ struct Call {
   class Pipeline;
   struct SendResultsTo;
 
-  CAPNP_DECLARE_STRUCT(836a53ce789d4cd4, 3, 3);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(836a53ce789d4cd4, 3, 3)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct Call::SendResultsTo {
@@ -107,7 +122,12 @@ struct Call::SendResultsTo {
     THIRD_PARTY,
   };
 
-  CAPNP_DECLARE_STRUCT(dae8b0f61aab5f99, 3, 3);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(dae8b0f61aab5f99, 3, 3)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct Return {
@@ -125,7 +145,12 @@ struct Return {
     ACCEPT_FROM_THIRD_PARTY,
   };
 
-  CAPNP_DECLARE_STRUCT(9e19b28d3db3573a, 2, 1);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(9e19b28d3db3573a, 2, 1)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct Finish {
@@ -135,7 +160,12 @@ struct Finish {
   class Builder;
   class Pipeline;
 
-  CAPNP_DECLARE_STRUCT(d37d2eb2c2f80e63, 1, 0);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(d37d2eb2c2f80e63, 1, 0)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct Resolve {
@@ -149,7 +179,12 @@ struct Resolve {
     EXCEPTION,
   };
 
-  CAPNP_DECLARE_STRUCT(bbc29655fa89086e, 1, 1);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(bbc29655fa89086e, 1, 1)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct Release {
@@ -159,7 +194,12 @@ struct Release {
   class Builder;
   class Pipeline;
 
-  CAPNP_DECLARE_STRUCT(ad1a6c0d7dd07497, 1, 0);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(ad1a6c0d7dd07497, 1, 0)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct Disembargo {
@@ -170,7 +210,12 @@ struct Disembargo {
   class Pipeline;
   struct Context;
 
-  CAPNP_DECLARE_STRUCT(f964368b0fbd3711, 1, 1);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(f964368b0fbd3711, 1, 1)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct Disembargo::Context {
@@ -186,7 +231,12 @@ struct Disembargo::Context {
     PROVIDE,
   };
 
-  CAPNP_DECLARE_STRUCT(d562b4df655bdd4d, 1, 1);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(d562b4df655bdd4d, 1, 1)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct Provide {
@@ -196,7 +246,12 @@ struct Provide {
   class Builder;
   class Pipeline;
 
-  CAPNP_DECLARE_STRUCT(9c6a046bfbc1ac5a, 1, 2);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(9c6a046bfbc1ac5a, 1, 2)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct Accept {
@@ -206,7 +261,12 @@ struct Accept {
   class Builder;
   class Pipeline;
 
-  CAPNP_DECLARE_STRUCT(d4c9b56290554016, 1, 1);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(d4c9b56290554016, 1, 1)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct Join {
@@ -216,7 +276,12 @@ struct Join {
   class Builder;
   class Pipeline;
 
-  CAPNP_DECLARE_STRUCT(fbe1980490e001af, 1, 2);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(fbe1980490e001af, 1, 2)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct MessageTarget {
@@ -230,7 +295,12 @@ struct MessageTarget {
     PROMISED_ANSWER,
   };
 
-  CAPNP_DECLARE_STRUCT(95bc14545813fbc1, 1, 1);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(95bc14545813fbc1, 1, 1)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct Payload {
@@ -240,7 +310,12 @@ struct Payload {
   class Builder;
   class Pipeline;
 
-  CAPNP_DECLARE_STRUCT(9a0e61223d96743b, 0, 2);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(9a0e61223d96743b, 0, 2)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct CapDescriptor {
@@ -258,7 +333,12 @@ struct CapDescriptor {
     THIRD_PARTY_HOSTED,
   };
 
-  CAPNP_DECLARE_STRUCT(8523ddc40b86b8b0, 1, 1);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(8523ddc40b86b8b0, 1, 1)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct PromisedAnswer {
@@ -269,7 +349,12 @@ struct PromisedAnswer {
   class Pipeline;
   struct Op;
 
-  CAPNP_DECLARE_STRUCT(d800b1d6cd6f1ca0, 1, 1);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(d800b1d6cd6f1ca0, 1, 1)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct PromisedAnswer::Op {
@@ -283,7 +368,12 @@ struct PromisedAnswer::Op {
     GET_POINTER_FIELD,
   };
 
-  CAPNP_DECLARE_STRUCT(f316944415569081, 1, 0);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(f316944415569081, 1, 0)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct ThirdPartyCapDescriptor {
@@ -293,7 +383,12 @@ struct ThirdPartyCapDescriptor {
   class Builder;
   class Pipeline;
 
-  CAPNP_DECLARE_STRUCT(d37007fde1f0027d, 1, 1);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(d37007fde1f0027d, 1, 1)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 struct Exception {
@@ -305,7 +400,12 @@ struct Exception {
   typedef ::capnp::schemas::Durability_bbaeda2607b6f958 Durability;
 
 
-  CAPNP_DECLARE_STRUCT(d625b7063acf691a, 1, 1);
+  struct _capnpPrivate {
+    CAPNP_DECLARE_STRUCT_HEADER(d625b7063acf691a, 1, 1)
+    #if !CAPNP_LITE
+    static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
+    #endif  // !CAPNP_LITE
+  };
 };
 
 // =======================================================================================