Skip to content

C
capnproto
Commit 1633318a authored by Harris Hancock's avatar Harris Hancock
Browse files
Options

Convert brand-pointer to constexpr-function (2/3)

parent 1572e754
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 97 deletions
c++/src/capnp/compat/json.capnp.c++
View file @ 1633318a
......@@ -303,7 +303,6 @@ constexpr uint16_t JsonValue::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind JsonValue::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* JsonValue::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* JsonValue::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// JsonValue::Field
......@@ -312,7 +311,6 @@ constexpr uint16_t JsonValue::Field::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind JsonValue::Field::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* JsonValue::Field::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* JsonValue::Field::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// JsonValue::Call
......@@ -321,7 +319,6 @@ constexpr uint16_t JsonValue::Call::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind JsonValue::Call::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* JsonValue::Call::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* JsonValue::Call::_capnpPrivate::brand;
#endif // !CAPNP_LITE
......
c++/src/capnp/compat/json.capnp.h
View file @ 1633318a
......@@ -47,7 +47,7 @@ struct JsonValue {
struct _capnpPrivate {
CAPNP_DECLARE_STRUCT_HEADER(8825ffaa852cda72, 2, 1)
#if !CAPNP_LITE
static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
static constexpr ::capnp::_::RawBrandedSchema const* brand() { return &schema->defaultBrand; }
#endif // !CAPNP_LITE
};
};
......@@ -62,7 +62,7 @@ struct JsonValue::Field {
struct _capnpPrivate {
CAPNP_DECLARE_STRUCT_HEADER(c27855d853a937cc, 0, 2)
#if !CAPNP_LITE
static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
static constexpr ::capnp::_::RawBrandedSchema const* brand() { return &schema->defaultBrand; }
#endif // !CAPNP_LITE
};
};
......@@ -77,7 +77,7 @@ struct JsonValue::Call {
struct _capnpPrivate {
CAPNP_DECLARE_STRUCT_HEADER(9bbf84153dd4bb60, 0, 2)
#if !CAPNP_LITE
static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
static constexpr ::capnp::_::RawBrandedSchema const* brand() { return &schema->defaultBrand; }
#endif // !CAPNP_LITE
};
};
......@@ -97,7 +97,7 @@ public:
#if !CAPNP_LITE
inline ::kj::StringTree toString() const {
return ::capnp::_::structString(_reader, *_capnpPrivate::brand);
return ::capnp::_::structString(_reader, *_capnpPrivate::brand());
}
#endif // !CAPNP_LITE
......@@ -239,7 +239,7 @@ public:
#if !CAPNP_LITE
inline ::kj::StringTree toString() const {
return ::capnp::_::structString(_reader, *_capnpPrivate::brand);
return ::capnp::_::structString(_reader, *_capnpPrivate::brand());
}
#endif // !CAPNP_LITE
......@@ -331,7 +331,7 @@ public:
#if !CAPNP_LITE
inline ::kj::StringTree toString() const {
return ::capnp::_::structString(_reader, *_capnpPrivate::brand);
return ::capnp::_::structString(_reader, *_capnpPrivate::brand());
}
#endif // !CAPNP_LITE
......
c++/src/capnp/compiler/grammar.capnp.c++
View file @ 1633318a
......@@ -2774,7 +2774,6 @@ constexpr uint16_t LocatedText::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind LocatedText::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* LocatedText::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* LocatedText::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// LocatedInteger
......@@ -2783,7 +2782,6 @@ constexpr uint16_t LocatedInteger::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind LocatedInteger::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* LocatedInteger::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* LocatedInteger::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// LocatedFloat
......@@ -2792,7 +2790,6 @@ constexpr uint16_t LocatedFloat::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind LocatedFloat::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* LocatedFloat::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* LocatedFloat::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// Expression
......@@ -2801,7 +2798,6 @@ constexpr uint16_t Expression::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind Expression::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* Expression::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* Expression::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// Expression::Param
......@@ -2810,7 +2806,6 @@ constexpr uint16_t Expression::Param::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind Expression::Param::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* Expression::Param::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* Expression::Param::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// Expression::Application
......@@ -2819,7 +2814,6 @@ constexpr uint16_t Expression::Application::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind Expression::Application::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* Expression::Application::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* Expression::Application::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// Expression::Member
......@@ -2828,7 +2822,6 @@ constexpr uint16_t Expression::Member::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind Expression::Member::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* Expression::Member::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* Expression::Member::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// Declaration
......@@ -2837,7 +2830,6 @@ constexpr uint16_t Declaration::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind Declaration::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* Declaration::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* Declaration::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// Declaration::BrandParameter
......@@ -2846,7 +2838,6 @@ constexpr uint16_t Declaration::BrandParameter::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind Declaration::BrandParameter::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* Declaration::BrandParameter::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* Declaration::BrandParameter::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// Declaration::AnnotationApplication
......@@ -2855,7 +2846,6 @@ constexpr uint16_t Declaration::AnnotationApplication::_capnpPrivate::pointerCou
#if !CAPNP_LITE
constexpr ::capnp::Kind Declaration::AnnotationApplication::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* Declaration::AnnotationApplication::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* Declaration::AnnotationApplication::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// Declaration::AnnotationApplication::Value
......@@ -2864,7 +2854,6 @@ constexpr uint16_t Declaration::AnnotationApplication::Value::_capnpPrivate::poi
#if !CAPNP_LITE
constexpr ::capnp::Kind Declaration::AnnotationApplication::Value::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* Declaration::AnnotationApplication::Value::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* Declaration::AnnotationApplication::Value::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// Declaration::ParamList
......@@ -2873,7 +2862,6 @@ constexpr uint16_t Declaration::ParamList::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind Declaration::ParamList::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* Declaration::ParamList::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* Declaration::ParamList::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// Declaration::Param
......@@ -2882,7 +2870,6 @@ constexpr uint16_t Declaration::Param::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind Declaration::Param::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* Declaration::Param::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* Declaration::Param::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// Declaration::Param::DefaultValue
......@@ -2891,7 +2878,6 @@ constexpr uint16_t Declaration::Param::DefaultValue::_capnpPrivate::pointerCount
#if !CAPNP_LITE
constexpr ::capnp::Kind Declaration::Param::DefaultValue::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* Declaration::Param::DefaultValue::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* Declaration::Param::DefaultValue::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// Declaration::Id
......@@ -2900,7 +2886,6 @@ constexpr uint16_t Declaration::Id::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind Declaration::Id::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* Declaration::Id::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* Declaration::Id::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// Declaration::Using
......@@ -2909,7 +2894,6 @@ constexpr uint16_t Declaration::Using::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind Declaration::Using::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* Declaration::Using::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* Declaration::Using::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// Declaration::Const
......@@ -2918,7 +2902,6 @@ constexpr uint16_t Declaration::Const::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind Declaration::Const::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* Declaration::Const::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* Declaration::Const::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// Declaration::Field
......@@ -2927,7 +2910,6 @@ constexpr uint16_t Declaration::Field::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind Declaration::Field::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* Declaration::Field::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* Declaration::Field::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// Declaration::Field::DefaultValue
......@@ -2936,7 +2918,6 @@ constexpr uint16_t Declaration::Field::DefaultValue::_capnpPrivate::pointerCount
#if !CAPNP_LITE
constexpr ::capnp::Kind Declaration::Field::DefaultValue::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* Declaration::Field::DefaultValue::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* Declaration::Field::DefaultValue::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// Declaration::Interface
......@@ -2945,7 +2926,6 @@ constexpr uint16_t Declaration::Interface::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind Declaration::Interface::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* Declaration::Interface::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* Declaration::Interface::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// Declaration::Method
......@@ -2954,7 +2934,6 @@ constexpr uint16_t Declaration::Method::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind Declaration::Method::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* Declaration::Method::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* Declaration::Method::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// Declaration::Method::Results
......@@ -2963,7 +2942,6 @@ constexpr uint16_t Declaration::Method::Results::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind Declaration::Method::Results::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* Declaration::Method::Results::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* Declaration::Method::Results::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// Declaration::Annotation
......@@ -2972,7 +2950,6 @@ constexpr uint16_t Declaration::Annotation::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind Declaration::Annotation::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* Declaration::Annotation::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* Declaration::Annotation::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// ParsedFile
......@@ -2981,7 +2958,6 @@ constexpr uint16_t ParsedFile::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind ParsedFile::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* ParsedFile::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* ParsedFile::_capnpPrivate::brand;
#endif // !CAPNP_LITE
......
c++/src/capnp/compiler/grammar.capnp.h
View file @ 1633318a
This diff is collapsed.
c++/src/capnp/compiler/lexer.capnp.c++
View file @ 1633318a
......@@ -468,7 +468,6 @@ constexpr uint16_t Token::_capnpPrivate::pointerCount;
#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
......@@ -477,7 +476,6 @@ constexpr uint16_t Statement::_capnpPrivate::pointerCount;
#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
......@@ -486,7 +484,6 @@ constexpr uint16_t LexedTokens::_capnpPrivate::pointerCount;
#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
......@@ -495,7 +492,6 @@ constexpr uint16_t LexedStatements::_capnpPrivate::pointerCount;
#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
......
c++/src/capnp/compiler/lexer.capnp.h
View file @ 1633318a
......@@ -45,7 +45,7 @@ struct Token {
struct _capnpPrivate {
CAPNP_DECLARE_STRUCT_HEADER(91cc55cd57de5419, 3, 1)
#if !CAPNP_LITE
static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
static constexpr ::capnp::_::RawBrandedSchema const* brand() { return &schema->defaultBrand; }
#endif // !CAPNP_LITE
};
};
......@@ -64,7 +64,7 @@ struct Statement {
struct _capnpPrivate {
CAPNP_DECLARE_STRUCT_HEADER(c6725e678d60fa37, 2, 3)
#if !CAPNP_LITE
static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
static constexpr ::capnp::_::RawBrandedSchema const* brand() { return &schema->defaultBrand; }
#endif // !CAPNP_LITE
};
};
......@@ -79,7 +79,7 @@ struct LexedTokens {
struct _capnpPrivate {
CAPNP_DECLARE_STRUCT_HEADER(9e69a92512b19d18, 0, 1)
#if !CAPNP_LITE
static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
static constexpr ::capnp::_::RawBrandedSchema const* brand() { return &schema->defaultBrand; }
#endif // !CAPNP_LITE
};
};
......@@ -94,7 +94,7 @@ struct LexedStatements {
struct _capnpPrivate {
CAPNP_DECLARE_STRUCT_HEADER(a11f97b9d6c73dd4, 0, 1)
#if !CAPNP_LITE
static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
static constexpr ::capnp::_::RawBrandedSchema const* brand() { return &schema->defaultBrand; }
#endif // !CAPNP_LITE
};
};
......@@ -114,7 +114,7 @@ public:
#if !CAPNP_LITE
inline ::kj::StringTree toString() const {
return ::capnp::_::structString(_reader, *_capnpPrivate::brand);
return ::capnp::_::structString(_reader, *_capnpPrivate::brand());
}
#endif // !CAPNP_LITE
......@@ -285,7 +285,7 @@ public:
#if !CAPNP_LITE
inline ::kj::StringTree toString() const {
return ::capnp::_::structString(_reader, *_capnpPrivate::brand);
return ::capnp::_::structString(_reader, *_capnpPrivate::brand());
}
#endif // !CAPNP_LITE
......@@ -407,7 +407,7 @@ public:
#if !CAPNP_LITE
inline ::kj::StringTree toString() const {
return ::capnp::_::structString(_reader, *_capnpPrivate::brand);
return ::capnp::_::structString(_reader, *_capnpPrivate::brand());
}
#endif // !CAPNP_LITE
......@@ -488,7 +488,7 @@ public:
#if !CAPNP_LITE
inline ::kj::StringTree toString() const {
return ::capnp::_::structString(_reader, *_capnpPrivate::brand);
return ::capnp::_::structString(_reader, *_capnpPrivate::brand());
}
#endif // !CAPNP_LITE
......
c++/src/capnp/persistent.capnp.c++
View file @ 1633318a
......@@ -68,9 +68,9 @@ static const ::capnp::_::RawSchema* const d_c8cb212fcd9f5691[] = {
&s_f76fba59183073a5,
};
static const uint16_t m_c8cb212fcd9f5691[] = {0};
const ::capnp::_::RawBrandedSchema::Dependency bd_c8cb212fcd9f5691[] = {
{ 33554432, ::capnp::Persistent< ::capnp::AnyPointer, ::capnp::AnyPointer>::SaveParams::_capnpPrivate::brand },
{ 50331648, ::capnp::Persistent< ::capnp::AnyPointer, ::capnp::AnyPointer>::SaveResults::_capnpPrivate::brand },
KJ_CONSTEXPR(const) ::capnp::_::RawBrandedSchema::Dependency bd_c8cb212fcd9f5691[] = {
{ 33554432, ::capnp::Persistent< ::capnp::AnyPointer, ::capnp::AnyPointer>::SaveParams::_capnpPrivate::brand() },
{ 50331648, ::capnp::Persistent< ::capnp::AnyPointer, ::capnp::AnyPointer>::SaveResults::_capnpPrivate::brand() },
};
const ::capnp::_::RawSchema s_c8cb212fcd9f5691 = {
0xc8cb212fcd9f5691, b_c8cb212fcd9f5691.words, 54, d_c8cb212fcd9f5691, m_c8cb212fcd9f5691,
......@@ -279,11 +279,11 @@ static const ::capnp::_::RawSchema* const d_84ff286cd00a3ed4[] = {
&s_f0c2cc1d3909574d,
};
static const uint16_t m_84ff286cd00a3ed4[] = {1, 0};
const ::capnp::_::RawBrandedSchema::Dependency bd_84ff286cd00a3ed4[] = {
{ 33554432, ::capnp::RealmGateway< ::capnp::AnyPointer, ::capnp::AnyPointer, ::capnp::AnyPointer, ::capnp::AnyPointer>::ImportParams::_capnpPrivate::brand },
{ 33554433, ::capnp::RealmGateway< ::capnp::AnyPointer, ::capnp::AnyPointer, ::capnp::AnyPointer, ::capnp::AnyPointer>::ExportParams::_capnpPrivate::brand },
{ 50331648, ::capnp::Persistent< ::capnp::AnyPointer, ::capnp::AnyPointer>::SaveResults::_capnpPrivate::brand },
{ 50331649, ::capnp::Persistent< ::capnp::AnyPointer, ::capnp::AnyPointer>::SaveResults::_capnpPrivate::brand },
KJ_CONSTEXPR(const) ::capnp::_::RawBrandedSchema::Dependency bd_84ff286cd00a3ed4[] = {
{ 33554432, ::capnp::RealmGateway< ::capnp::AnyPointer, ::capnp::AnyPointer, ::capnp::AnyPointer, ::capnp::AnyPointer>::ImportParams::_capnpPrivate::brand() },
{ 33554433, ::capnp::RealmGateway< ::capnp::AnyPointer, ::capnp::AnyPointer, ::capnp::AnyPointer, ::capnp::AnyPointer>::ExportParams::_capnpPrivate::brand() },
{ 50331648, ::capnp::Persistent< ::capnp::AnyPointer, ::capnp::AnyPointer>::SaveResults::_capnpPrivate::brand() },
{ 50331649, ::capnp::Persistent< ::capnp::AnyPointer, ::capnp::AnyPointer>::SaveResults::_capnpPrivate::brand() },
};
const ::capnp::_::RawSchema s_84ff286cd00a3ed4 = {
0x84ff286cd00a3ed4, b_84ff286cd00a3ed4.words, 99, d_84ff286cd00a3ed4, m_84ff286cd00a3ed4,
......@@ -386,9 +386,9 @@ static const ::capnp::_::RawSchema* const d_f0c2cc1d3909574d[] = {
};
static const uint16_t m_f0c2cc1d3909574d[] = {0, 1};
static const uint16_t i_f0c2cc1d3909574d[] = {0, 1};
const ::capnp::_::RawBrandedSchema::Dependency bd_f0c2cc1d3909574d[] = {
{ 16777216, ::capnp::Persistent< ::capnp::AnyPointer, ::capnp::AnyPointer>::_capnpPrivate::brand },
{ 16777217, ::capnp::Persistent< ::capnp::AnyPointer, ::capnp::AnyPointer>::SaveParams::_capnpPrivate::brand },
KJ_CONSTEXPR(const) ::capnp::_::RawBrandedSchema::Dependency bd_f0c2cc1d3909574d[] = {
{ 16777216, ::capnp::Persistent< ::capnp::AnyPointer, ::capnp::AnyPointer>::_capnpPrivate::brand() },
{ 16777217, ::capnp::Persistent< ::capnp::AnyPointer, ::capnp::AnyPointer>::SaveParams::_capnpPrivate::brand() },
};
const ::capnp::_::RawSchema s_f0c2cc1d3909574d = {
0xf0c2cc1d3909574d, b_f0c2cc1d3909574d.words, 86, d_f0c2cc1d3909574d, m_f0c2cc1d3909574d,
......@@ -491,9 +491,9 @@ static const ::capnp::_::RawSchema* const d_ecafa18b482da3aa[] = {
};
static const uint16_t m_ecafa18b482da3aa[] = {0, 1};
static const uint16_t i_ecafa18b482da3aa[] = {0, 1};
const ::capnp::_::RawBrandedSchema::Dependency bd_ecafa18b482da3aa[] = {
{ 16777216, ::capnp::Persistent< ::capnp::AnyPointer, ::capnp::AnyPointer>::_capnpPrivate::brand },
{ 16777217, ::capnp::Persistent< ::capnp::AnyPointer, ::capnp::AnyPointer>::SaveParams::_capnpPrivate::brand },
KJ_CONSTEXPR(const) ::capnp::_::RawBrandedSchema::Dependency bd_ecafa18b482da3aa[] = {
{ 16777216, ::capnp::Persistent< ::capnp::AnyPointer, ::capnp::AnyPointer>::_capnpPrivate::brand() },
{ 16777217, ::capnp::Persistent< ::capnp::AnyPointer, ::capnp::AnyPointer>::SaveParams::_capnpPrivate::brand() },
};
const ::capnp::_::RawSchema s_ecafa18b482da3aa = {
0xecafa18b482da3aa, b_ecafa18b482da3aa.words, 86, d_ecafa18b482da3aa, m_ecafa18b482da3aa,
......
c++/src/capnp/persistent.capnp.h
View file @ 1633318a
This diff is collapsed.
c++/src/capnp/rpc-twoparty.capnp.c++
View file @ 1633318a
......@@ -356,7 +356,6 @@ constexpr uint16_t VatId::_capnpPrivate::pointerCount;
#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
......@@ -365,7 +364,6 @@ constexpr uint16_t ProvisionId::_capnpPrivate::pointerCount;
#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
......@@ -374,7 +372,6 @@ constexpr uint16_t RecipientId::_capnpPrivate::pointerCount;
#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
......@@ -383,7 +380,6 @@ constexpr uint16_t ThirdPartyCapId::_capnpPrivate::pointerCount;
#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
......@@ -392,7 +388,6 @@ constexpr uint16_t JoinKeyPart::_capnpPrivate::pointerCount;
#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
......@@ -401,7 +396,6 @@ constexpr uint16_t JoinResult::_capnpPrivate::pointerCount;
#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
......
c++/src/capnp/rpc-twoparty.capnp.h
View file @ 1633318a
......@@ -46,7 +46,7 @@ struct VatId {
struct _capnpPrivate {
CAPNP_DECLARE_STRUCT_HEADER(d20b909fee733a8e, 1, 0)
#if !CAPNP_LITE
static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
static constexpr ::capnp::_::RawBrandedSchema const* brand() { return &schema->defaultBrand; }
#endif // !CAPNP_LITE
};
};
......@@ -61,7 +61,7 @@ struct ProvisionId {
struct _capnpPrivate {
CAPNP_DECLARE_STRUCT_HEADER(b88d09a9c5f39817, 1, 0)
#if !CAPNP_LITE
static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
static constexpr ::capnp::_::RawBrandedSchema const* brand() { return &schema->defaultBrand; }
#endif // !CAPNP_LITE
};
};
......@@ -76,7 +76,7 @@ struct RecipientId {
struct _capnpPrivate {
CAPNP_DECLARE_STRUCT_HEADER(89f389b6fd4082c1, 0, 0)
#if !CAPNP_LITE
static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
static constexpr ::capnp::_::RawBrandedSchema const* brand() { return &schema->defaultBrand; }
#endif // !CAPNP_LITE
};
};
......@@ -91,7 +91,7 @@ struct ThirdPartyCapId {
struct _capnpPrivate {
CAPNP_DECLARE_STRUCT_HEADER(b47f4979672cb59d, 0, 0)
#if !CAPNP_LITE
static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
static constexpr ::capnp::_::RawBrandedSchema const* brand() { return &schema->defaultBrand; }
#endif // !CAPNP_LITE
};
};
......@@ -106,7 +106,7 @@ struct JoinKeyPart {
struct _capnpPrivate {
CAPNP_DECLARE_STRUCT_HEADER(95b29059097fca83, 1, 0)
#if !CAPNP_LITE
static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
static constexpr ::capnp::_::RawBrandedSchema const* brand() { return &schema->defaultBrand; }
#endif // !CAPNP_LITE
};
};
......@@ -121,7 +121,7 @@ struct JoinResult {
struct _capnpPrivate {
CAPNP_DECLARE_STRUCT_HEADER(9d263a3630b7ebee, 1, 1)
#if !CAPNP_LITE
static constexpr ::capnp::_::RawBrandedSchema const* brand = &schema->defaultBrand;
static constexpr ::capnp::_::RawBrandedSchema const* brand() { return &schema->defaultBrand; }
#endif // !CAPNP_LITE
};
};
......@@ -141,7 +141,7 @@ public:
#if !CAPNP_LITE
inline ::kj::StringTree toString() const {
return ::capnp::_::structString(_reader, *_capnpPrivate::brand);
return ::capnp::_::structString(_reader, *_capnpPrivate::brand());
}
#endif // !CAPNP_LITE
......@@ -217,7 +217,7 @@ public:
#if !CAPNP_LITE
inline ::kj::StringTree toString() const {
return ::capnp::_::structString(_reader, *_capnpPrivate::brand);
return ::capnp::_::structString(_reader, *_capnpPrivate::brand());
}
#endif // !CAPNP_LITE
......@@ -293,7 +293,7 @@ public:
#if !CAPNP_LITE
inline ::kj::StringTree toString() const {
return ::capnp::_::structString(_reader, *_capnpPrivate::brand);
return ::capnp::_::structString(_reader, *_capnpPrivate::brand());
}
#endif // !CAPNP_LITE
......@@ -364,7 +364,7 @@ public:
#if !CAPNP_LITE
inline ::kj::StringTree toString() const {
return ::capnp::_::structString(_reader, *_capnpPrivate::brand);
return ::capnp::_::structString(_reader, *_capnpPrivate::brand());
}
#endif // !CAPNP_LITE
......@@ -435,7 +435,7 @@ public:
#if !CAPNP_LITE
inline ::kj::StringTree toString() const {
return ::capnp::_::structString(_reader, *_capnpPrivate::brand);
return ::capnp::_::structString(_reader, *_capnpPrivate::brand());
}
#endif // !CAPNP_LITE
......@@ -521,7 +521,7 @@ public:
#if !CAPNP_LITE
inline ::kj::StringTree toString() const {
return ::capnp::_::structString(_reader, *_capnpPrivate::brand);
return ::capnp::_::structString(_reader, *_capnpPrivate::brand());
}
#endif // !CAPNP_LITE
......
c++/src/capnp/rpc.capnp.c++
View file @ 1633318a
......@@ -1895,7 +1895,6 @@ constexpr uint16_t Message::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind Message::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* Message::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* Message::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// Bootstrap
......@@ -1904,7 +1903,6 @@ constexpr uint16_t Bootstrap::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind Bootstrap::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* Bootstrap::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* Bootstrap::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// Call
......@@ -1913,7 +1911,6 @@ constexpr uint16_t Call::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind Call::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* Call::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* Call::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// Call::SendResultsTo
......@@ -1922,7 +1919,6 @@ constexpr uint16_t Call::SendResultsTo::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind Call::SendResultsTo::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* Call::SendResultsTo::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* Call::SendResultsTo::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// Return
......@@ -1931,7 +1927,6 @@ constexpr uint16_t Return::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind Return::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* Return::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* Return::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// Finish
......@@ -1940,7 +1935,6 @@ constexpr uint16_t Finish::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind Finish::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* Finish::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* Finish::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// Resolve
......@@ -1949,7 +1943,6 @@ constexpr uint16_t Resolve::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind Resolve::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* Resolve::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* Resolve::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// Release
......@@ -1958,7 +1951,6 @@ constexpr uint16_t Release::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind Release::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* Release::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* Release::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// Disembargo
......@@ -1967,7 +1959,6 @@ constexpr uint16_t Disembargo::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind Disembargo::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* Disembargo::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* Disembargo::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// Disembargo::Context
......@@ -1976,7 +1967,6 @@ constexpr uint16_t Disembargo::Context::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind Disembargo::Context::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* Disembargo::Context::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* Disembargo::Context::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// Provide
......@@ -1985,7 +1975,6 @@ constexpr uint16_t Provide::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind Provide::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* Provide::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* Provide::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// Accept
......@@ -1994,7 +1983,6 @@ constexpr uint16_t Accept::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind Accept::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* Accept::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* Accept::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// Join
......@@ -2003,7 +1991,6 @@ constexpr uint16_t Join::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind Join::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* Join::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* Join::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// MessageTarget
......@@ -2012,7 +1999,6 @@ constexpr uint16_t MessageTarget::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind MessageTarget::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* MessageTarget::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* MessageTarget::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// Payload
......@@ -2021,7 +2007,6 @@ constexpr uint16_t Payload::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind Payload::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* Payload::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* Payload::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// CapDescriptor
......@@ -2030,7 +2015,6 @@ constexpr uint16_t CapDescriptor::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind CapDescriptor::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* CapDescriptor::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* CapDescriptor::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// PromisedAnswer
......@@ -2039,7 +2023,6 @@ constexpr uint16_t PromisedAnswer::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind PromisedAnswer::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* PromisedAnswer::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* PromisedAnswer::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// PromisedAnswer::Op
......@@ -2048,7 +2031,6 @@ constexpr uint16_t PromisedAnswer::Op::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind PromisedAnswer::Op::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* PromisedAnswer::Op::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* PromisedAnswer::Op::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// ThirdPartyCapDescriptor
......@@ -2057,7 +2039,6 @@ constexpr uint16_t ThirdPartyCapDescriptor::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind ThirdPartyCapDescriptor::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* ThirdPartyCapDescriptor::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* ThirdPartyCapDescriptor::_capnpPrivate::brand;
#endif // !CAPNP_LITE
// Exception
......@@ -2066,7 +2047,6 @@ constexpr uint16_t Exception::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind Exception::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* Exception::_capnpPrivate::schema;
constexpr ::capnp::_::RawBrandedSchema const* Exception::_capnpPrivate::brand;
#endif // !CAPNP_LITE
......
c++/src/capnp/rpc.capnp.h
View file @ 1633318a
This diff is collapsed.
c++/src/capnp/schema.capnp.c++
View file @ 1633318a
This diff is collapsed.
c++/src/capnp/schema.capnp.h
View file @ 1633318a
This diff is collapsed.
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