Merge pull request #3397 from acozzette/initialization

Fixed default instance initialization for C++ lite
pull/3401/head
Adam Cozzette 7 years ago committed by GitHub
commit 040f56e61b
  1. 2
      src/google/protobuf/any.pb.cc
  2. 2
      src/google/protobuf/api.pb.cc
  3. 19
      src/google/protobuf/compiler/cpp/cpp_file.cc
  4. 4
      src/google/protobuf/compiler/cpp/cpp_message.cc
  5. 2
      src/google/protobuf/compiler/plugin.pb.cc
  6. 2
      src/google/protobuf/compiler/profile.pb.cc
  7. 2
      src/google/protobuf/descriptor.pb.cc
  8. 4
      src/google/protobuf/duration.pb.cc
  9. 4
      src/google/protobuf/empty.pb.cc
  10. 2
      src/google/protobuf/field_mask.pb.cc
  11. 2
      src/google/protobuf/source_context.pb.cc
  12. 8
      src/google/protobuf/struct.pb.cc
  13. 4
      src/google/protobuf/timestamp.pb.cc
  14. 12
      src/google/protobuf/type.pb.cc
  15. 20
      src/google/protobuf/wrappers.pb.cc

@ -123,7 +123,7 @@ void AddDescriptors() {
static GOOGLE_PROTOBUF_DECLARE_ONCE(once); static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl); ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);
} }
// Force AddDescriptors() to be called at static initialization time. // Force AddDescriptors() to be called at dynamic initialization time.
struct StaticDescriptorInitializer { struct StaticDescriptorInitializer {
StaticDescriptorInitializer() { StaticDescriptorInitializer() {
AddDescriptors(); AddDescriptors();

@ -182,7 +182,7 @@ void AddDescriptors() {
static GOOGLE_PROTOBUF_DECLARE_ONCE(once); static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl); ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);
} }
// Force AddDescriptors() to be called at static initialization time. // Force AddDescriptors() to be called at dynamic initialization time.
struct StaticDescriptorInitializer { struct StaticDescriptorInitializer {
StaticDescriptorInitializer() { StaticDescriptorInitializer() {
AddDescriptors(); AddDescriptors();

@ -526,11 +526,10 @@ class FileGenerator::ForwardDeclarations {
void FileGenerator::GenerateBuildDescriptors(io::Printer* printer) { void FileGenerator::GenerateBuildDescriptors(io::Printer* printer) {
// AddDescriptors() is a file-level procedure which adds the encoded // AddDescriptors() is a file-level procedure which adds the encoded
// FileDescriptorProto for this .proto file to the global DescriptorPool for // FileDescriptorProto for this .proto file to the global DescriptorPool for
// generated files (DescriptorPool::generated_pool()). It either runs at // generated files (DescriptorPool::generated_pool()). It ordinarily runs at
// static initialization time (by default) or when default_instance() is // static initialization time, but is not used at all in LITE_RUNTIME mode
// called for the first time (in LITE_RUNTIME mode with // except when extensions are used. This procedure also constructs default
// GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER flag enabled). This procedure also // instances and registers extensions.
// constructs default instances and registers extensions.
// //
// Its sibling, AssignDescriptors(), actually pulls the compiled // Its sibling, AssignDescriptors(), actually pulls the compiled
// FileDescriptor from the DescriptorPool and uses it to populate all of // FileDescriptor from the DescriptorPool and uses it to populate all of
@ -889,19 +888,15 @@ void FileGenerator::GenerateBuildDescriptors(io::Printer* printer) {
" ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);\n" " ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);\n"
"}\n"); "}\n");
if (!StaticInitializersForced(file_, options_)) { if (StaticInitializersForced(file_, options_)) {
printer->Print("#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER\n");
}
printer->Print( printer->Print(
// With static initializers. "// Force AddDescriptors() to be called at dynamic initialization "
"// Force AddDescriptors() to be called at static initialization time.\n" "time.\n"
"struct StaticDescriptorInitializer {\n" "struct StaticDescriptorInitializer {\n"
" StaticDescriptorInitializer() {\n" " StaticDescriptorInitializer() {\n"
" AddDescriptors();\n" " AddDescriptors();\n"
" }\n" " }\n"
"} static_descriptor_initializer;\n"); "} static_descriptor_initializer;\n");
if (!StaticInitializersForced(file_, options_)) {
printer->Print("#endif // GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER\n");
} }
} }

@ -2411,11 +2411,7 @@ GenerateStructors(io::Printer* printer) {
printer->Print( printer->Print(
"$classname$::$classname$(::google::protobuf::Arena* arena)\n" "$classname$::$classname$(::google::protobuf::Arena* arena)\n"
" : $initializer$ {\n" " : $initializer$ {\n"
// When arenas are used it's safe to assume we have finished
// static init time (protos with arenas are unsafe during static init)
"#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER\n"
" $file_namespace$::InitDefaults();\n" " $file_namespace$::InitDefaults();\n"
"#endif // GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER\n"
" SharedCtor();\n" " SharedCtor();\n"
" RegisterArenaDtor(arena);\n" " RegisterArenaDtor(arena);\n"
" // @@protoc_insertion_point(arena_constructor:$full_name$)\n" " // @@protoc_insertion_point(arena_constructor:$full_name$)\n"

@ -201,7 +201,7 @@ void AddDescriptors() {
static GOOGLE_PROTOBUF_DECLARE_ONCE(once); static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl); ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);
} }
// Force AddDescriptors() to be called at static initialization time. // Force AddDescriptors() to be called at dynamic initialization time.
struct StaticDescriptorInitializer { struct StaticDescriptorInitializer {
StaticDescriptorInitializer() { StaticDescriptorInitializer() {
AddDescriptors(); AddDescriptors();

@ -167,7 +167,7 @@ void AddDescriptors() {
static GOOGLE_PROTOBUF_DECLARE_ONCE(once); static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl); ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);
} }
// Force AddDescriptors() to be called at static initialization time. // Force AddDescriptors() to be called at dynamic initialization time.
struct StaticDescriptorInitializer { struct StaticDescriptorInitializer {
StaticDescriptorInitializer() { StaticDescriptorInitializer() {
AddDescriptors(); AddDescriptors();

@ -820,7 +820,7 @@ void AddDescriptors() {
static GOOGLE_PROTOBUF_DECLARE_ONCE(once); static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl); ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);
} }
// Force AddDescriptors() to be called at static initialization time. // Force AddDescriptors() to be called at dynamic initialization time.
struct StaticDescriptorInitializer { struct StaticDescriptorInitializer {
StaticDescriptorInitializer() { StaticDescriptorInitializer() {
AddDescriptors(); AddDescriptors();

@ -123,7 +123,7 @@ void AddDescriptors() {
static GOOGLE_PROTOBUF_DECLARE_ONCE(once); static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl); ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);
} }
// Force AddDescriptors() to be called at static initialization time. // Force AddDescriptors() to be called at dynamic initialization time.
struct StaticDescriptorInitializer { struct StaticDescriptorInitializer {
StaticDescriptorInitializer() { StaticDescriptorInitializer() {
AddDescriptors(); AddDescriptors();
@ -151,9 +151,7 @@ Duration::Duration()
Duration::Duration(::google::protobuf::Arena* arena) Duration::Duration(::google::protobuf::Arena* arena)
: ::google::protobuf::Message(), : ::google::protobuf::Message(),
_internal_metadata_(arena) { _internal_metadata_(arena) {
#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
protobuf_google_2fprotobuf_2fduration_2eproto::InitDefaults(); protobuf_google_2fprotobuf_2fduration_2eproto::InitDefaults();
#endif // GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
SharedCtor(); SharedCtor();
RegisterArenaDtor(arena); RegisterArenaDtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.Duration) // @@protoc_insertion_point(arena_constructor:google.protobuf.Duration)

@ -120,7 +120,7 @@ void AddDescriptors() {
static GOOGLE_PROTOBUF_DECLARE_ONCE(once); static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl); ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);
} }
// Force AddDescriptors() to be called at static initialization time. // Force AddDescriptors() to be called at dynamic initialization time.
struct StaticDescriptorInitializer { struct StaticDescriptorInitializer {
StaticDescriptorInitializer() { StaticDescriptorInitializer() {
AddDescriptors(); AddDescriptors();
@ -146,9 +146,7 @@ Empty::Empty()
Empty::Empty(::google::protobuf::Arena* arena) Empty::Empty(::google::protobuf::Arena* arena)
: ::google::protobuf::Message(), : ::google::protobuf::Message(),
_internal_metadata_(arena) { _internal_metadata_(arena) {
#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
protobuf_google_2fprotobuf_2fempty_2eproto::InitDefaults(); protobuf_google_2fprotobuf_2fempty_2eproto::InitDefaults();
#endif // GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
SharedCtor(); SharedCtor();
RegisterArenaDtor(arena); RegisterArenaDtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.Empty) // @@protoc_insertion_point(arena_constructor:google.protobuf.Empty)

@ -122,7 +122,7 @@ void AddDescriptors() {
static GOOGLE_PROTOBUF_DECLARE_ONCE(once); static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl); ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);
} }
// Force AddDescriptors() to be called at static initialization time. // Force AddDescriptors() to be called at dynamic initialization time.
struct StaticDescriptorInitializer { struct StaticDescriptorInitializer {
StaticDescriptorInitializer() { StaticDescriptorInitializer() {
AddDescriptors(); AddDescriptors();

@ -123,7 +123,7 @@ void AddDescriptors() {
static GOOGLE_PROTOBUF_DECLARE_ONCE(once); static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl); ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);
} }
// Force AddDescriptors() to be called at static initialization time. // Force AddDescriptors() to be called at dynamic initialization time.
struct StaticDescriptorInitializer { struct StaticDescriptorInitializer {
StaticDescriptorInitializer() { StaticDescriptorInitializer() {
AddDescriptors(); AddDescriptors();

@ -193,7 +193,7 @@ void AddDescriptors() {
static GOOGLE_PROTOBUF_DECLARE_ONCE(once); static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl); ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);
} }
// Force AddDescriptors() to be called at static initialization time. // Force AddDescriptors() to be called at dynamic initialization time.
struct StaticDescriptorInitializer { struct StaticDescriptorInitializer {
StaticDescriptorInitializer() { StaticDescriptorInitializer() {
AddDescriptors(); AddDescriptors();
@ -253,9 +253,7 @@ Struct::Struct(::google::protobuf::Arena* arena)
: ::google::protobuf::Message(), : ::google::protobuf::Message(),
_internal_metadata_(arena), _internal_metadata_(arena),
fields_(arena) { fields_(arena) {
#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
protobuf_google_2fprotobuf_2fstruct_2eproto::InitDefaults(); protobuf_google_2fprotobuf_2fstruct_2eproto::InitDefaults();
#endif // GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
SharedCtor(); SharedCtor();
RegisterArenaDtor(arena); RegisterArenaDtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.Struct) // @@protoc_insertion_point(arena_constructor:google.protobuf.Struct)
@ -652,9 +650,7 @@ Value::Value()
Value::Value(::google::protobuf::Arena* arena) Value::Value(::google::protobuf::Arena* arena)
: ::google::protobuf::Message(), : ::google::protobuf::Message(),
_internal_metadata_(arena) { _internal_metadata_(arena) {
#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
protobuf_google_2fprotobuf_2fstruct_2eproto::InitDefaults(); protobuf_google_2fprotobuf_2fstruct_2eproto::InitDefaults();
#endif // GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
SharedCtor(); SharedCtor();
RegisterArenaDtor(arena); RegisterArenaDtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.Value) // @@protoc_insertion_point(arena_constructor:google.protobuf.Value)
@ -1562,9 +1558,7 @@ ListValue::ListValue(::google::protobuf::Arena* arena)
: ::google::protobuf::Message(), : ::google::protobuf::Message(),
_internal_metadata_(arena), _internal_metadata_(arena),
values_(arena) { values_(arena) {
#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
protobuf_google_2fprotobuf_2fstruct_2eproto::InitDefaults(); protobuf_google_2fprotobuf_2fstruct_2eproto::InitDefaults();
#endif // GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
SharedCtor(); SharedCtor();
RegisterArenaDtor(arena); RegisterArenaDtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.ListValue) // @@protoc_insertion_point(arena_constructor:google.protobuf.ListValue)

@ -123,7 +123,7 @@ void AddDescriptors() {
static GOOGLE_PROTOBUF_DECLARE_ONCE(once); static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl); ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);
} }
// Force AddDescriptors() to be called at static initialization time. // Force AddDescriptors() to be called at dynamic initialization time.
struct StaticDescriptorInitializer { struct StaticDescriptorInitializer {
StaticDescriptorInitializer() { StaticDescriptorInitializer() {
AddDescriptors(); AddDescriptors();
@ -151,9 +151,7 @@ Timestamp::Timestamp()
Timestamp::Timestamp(::google::protobuf::Arena* arena) Timestamp::Timestamp(::google::protobuf::Arena* arena)
: ::google::protobuf::Message(), : ::google::protobuf::Message(),
_internal_metadata_(arena) { _internal_metadata_(arena) {
#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
protobuf_google_2fprotobuf_2ftimestamp_2eproto::InitDefaults(); protobuf_google_2fprotobuf_2ftimestamp_2eproto::InitDefaults();
#endif // GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
SharedCtor(); SharedCtor();
RegisterArenaDtor(arena); RegisterArenaDtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.Timestamp) // @@protoc_insertion_point(arena_constructor:google.protobuf.Timestamp)

@ -244,7 +244,7 @@ void AddDescriptors() {
static GOOGLE_PROTOBUF_DECLARE_ONCE(once); static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl); ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);
} }
// Force AddDescriptors() to be called at static initialization time. // Force AddDescriptors() to be called at dynamic initialization time.
struct StaticDescriptorInitializer { struct StaticDescriptorInitializer {
StaticDescriptorInitializer() { StaticDescriptorInitializer() {
AddDescriptors(); AddDescriptors();
@ -406,9 +406,7 @@ Type::Type(::google::protobuf::Arena* arena)
fields_(arena), fields_(arena),
oneofs_(arena), oneofs_(arena),
options_(arena) { options_(arena) {
#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
protobuf_google_2fprotobuf_2ftype_2eproto::InitDefaults(); protobuf_google_2fprotobuf_2ftype_2eproto::InitDefaults();
#endif // GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
SharedCtor(); SharedCtor();
RegisterArenaDtor(arena); RegisterArenaDtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.Type) // @@protoc_insertion_point(arena_constructor:google.protobuf.Type)
@ -1171,9 +1169,7 @@ Field::Field(::google::protobuf::Arena* arena)
: ::google::protobuf::Message(), : ::google::protobuf::Message(),
_internal_metadata_(arena), _internal_metadata_(arena),
options_(arena) { options_(arena) {
#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
protobuf_google_2fprotobuf_2ftype_2eproto::InitDefaults(); protobuf_google_2fprotobuf_2ftype_2eproto::InitDefaults();
#endif // GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
SharedCtor(); SharedCtor();
RegisterArenaDtor(arena); RegisterArenaDtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.Field) // @@protoc_insertion_point(arena_constructor:google.protobuf.Field)
@ -2245,9 +2241,7 @@ Enum::Enum(::google::protobuf::Arena* arena)
_internal_metadata_(arena), _internal_metadata_(arena),
enumvalue_(arena), enumvalue_(arena),
options_(arena) { options_(arena) {
#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
protobuf_google_2fprotobuf_2ftype_2eproto::InitDefaults(); protobuf_google_2fprotobuf_2ftype_2eproto::InitDefaults();
#endif // GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
SharedCtor(); SharedCtor();
RegisterArenaDtor(arena); RegisterArenaDtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.Enum) // @@protoc_insertion_point(arena_constructor:google.protobuf.Enum)
@ -2885,9 +2879,7 @@ EnumValue::EnumValue(::google::protobuf::Arena* arena)
: ::google::protobuf::Message(), : ::google::protobuf::Message(),
_internal_metadata_(arena), _internal_metadata_(arena),
options_(arena) { options_(arena) {
#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
protobuf_google_2fprotobuf_2ftype_2eproto::InitDefaults(); protobuf_google_2fprotobuf_2ftype_2eproto::InitDefaults();
#endif // GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
SharedCtor(); SharedCtor();
RegisterArenaDtor(arena); RegisterArenaDtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.EnumValue) // @@protoc_insertion_point(arena_constructor:google.protobuf.EnumValue)
@ -3381,9 +3373,7 @@ Option::Option()
Option::Option(::google::protobuf::Arena* arena) Option::Option(::google::protobuf::Arena* arena)
: ::google::protobuf::Message(), : ::google::protobuf::Message(),
_internal_metadata_(arena) { _internal_metadata_(arena) {
#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
protobuf_google_2fprotobuf_2ftype_2eproto::InitDefaults(); protobuf_google_2fprotobuf_2ftype_2eproto::InitDefaults();
#endif // GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
SharedCtor(); SharedCtor();
RegisterArenaDtor(arena); RegisterArenaDtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.Option) // @@protoc_insertion_point(arena_constructor:google.protobuf.Option)

@ -240,7 +240,7 @@ void AddDescriptors() {
static GOOGLE_PROTOBUF_DECLARE_ONCE(once); static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl); ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);
} }
// Force AddDescriptors() to be called at static initialization time. // Force AddDescriptors() to be called at dynamic initialization time.
struct StaticDescriptorInitializer { struct StaticDescriptorInitializer {
StaticDescriptorInitializer() { StaticDescriptorInitializer() {
AddDescriptors(); AddDescriptors();
@ -267,9 +267,7 @@ DoubleValue::DoubleValue()
DoubleValue::DoubleValue(::google::protobuf::Arena* arena) DoubleValue::DoubleValue(::google::protobuf::Arena* arena)
: ::google::protobuf::Message(), : ::google::protobuf::Message(),
_internal_metadata_(arena) { _internal_metadata_(arena) {
#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaults(); protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaults();
#endif // GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
SharedCtor(); SharedCtor();
RegisterArenaDtor(arena); RegisterArenaDtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.DoubleValue) // @@protoc_insertion_point(arena_constructor:google.protobuf.DoubleValue)
@ -532,9 +530,7 @@ FloatValue::FloatValue()
FloatValue::FloatValue(::google::protobuf::Arena* arena) FloatValue::FloatValue(::google::protobuf::Arena* arena)
: ::google::protobuf::Message(), : ::google::protobuf::Message(),
_internal_metadata_(arena) { _internal_metadata_(arena) {
#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaults(); protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaults();
#endif // GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
SharedCtor(); SharedCtor();
RegisterArenaDtor(arena); RegisterArenaDtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.FloatValue) // @@protoc_insertion_point(arena_constructor:google.protobuf.FloatValue)
@ -797,9 +793,7 @@ Int64Value::Int64Value()
Int64Value::Int64Value(::google::protobuf::Arena* arena) Int64Value::Int64Value(::google::protobuf::Arena* arena)
: ::google::protobuf::Message(), : ::google::protobuf::Message(),
_internal_metadata_(arena) { _internal_metadata_(arena) {
#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaults(); protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaults();
#endif // GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
SharedCtor(); SharedCtor();
RegisterArenaDtor(arena); RegisterArenaDtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.Int64Value) // @@protoc_insertion_point(arena_constructor:google.protobuf.Int64Value)
@ -1064,9 +1058,7 @@ UInt64Value::UInt64Value()
UInt64Value::UInt64Value(::google::protobuf::Arena* arena) UInt64Value::UInt64Value(::google::protobuf::Arena* arena)
: ::google::protobuf::Message(), : ::google::protobuf::Message(),
_internal_metadata_(arena) { _internal_metadata_(arena) {
#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaults(); protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaults();
#endif // GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
SharedCtor(); SharedCtor();
RegisterArenaDtor(arena); RegisterArenaDtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.UInt64Value) // @@protoc_insertion_point(arena_constructor:google.protobuf.UInt64Value)
@ -1331,9 +1323,7 @@ Int32Value::Int32Value()
Int32Value::Int32Value(::google::protobuf::Arena* arena) Int32Value::Int32Value(::google::protobuf::Arena* arena)
: ::google::protobuf::Message(), : ::google::protobuf::Message(),
_internal_metadata_(arena) { _internal_metadata_(arena) {
#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaults(); protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaults();
#endif // GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
SharedCtor(); SharedCtor();
RegisterArenaDtor(arena); RegisterArenaDtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.Int32Value) // @@protoc_insertion_point(arena_constructor:google.protobuf.Int32Value)
@ -1598,9 +1588,7 @@ UInt32Value::UInt32Value()
UInt32Value::UInt32Value(::google::protobuf::Arena* arena) UInt32Value::UInt32Value(::google::protobuf::Arena* arena)
: ::google::protobuf::Message(), : ::google::protobuf::Message(),
_internal_metadata_(arena) { _internal_metadata_(arena) {
#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaults(); protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaults();
#endif // GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
SharedCtor(); SharedCtor();
RegisterArenaDtor(arena); RegisterArenaDtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.UInt32Value) // @@protoc_insertion_point(arena_constructor:google.protobuf.UInt32Value)
@ -1865,9 +1853,7 @@ BoolValue::BoolValue()
BoolValue::BoolValue(::google::protobuf::Arena* arena) BoolValue::BoolValue(::google::protobuf::Arena* arena)
: ::google::protobuf::Message(), : ::google::protobuf::Message(),
_internal_metadata_(arena) { _internal_metadata_(arena) {
#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaults(); protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaults();
#endif // GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
SharedCtor(); SharedCtor();
RegisterArenaDtor(arena); RegisterArenaDtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.BoolValue) // @@protoc_insertion_point(arena_constructor:google.protobuf.BoolValue)
@ -2130,9 +2116,7 @@ StringValue::StringValue()
StringValue::StringValue(::google::protobuf::Arena* arena) StringValue::StringValue(::google::protobuf::Arena* arena)
: ::google::protobuf::Message(), : ::google::protobuf::Message(),
_internal_metadata_(arena) { _internal_metadata_(arena) {
#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaults(); protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaults();
#endif // GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
SharedCtor(); SharedCtor();
RegisterArenaDtor(arena); RegisterArenaDtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.StringValue) // @@protoc_insertion_point(arena_constructor:google.protobuf.StringValue)
@ -2468,9 +2452,7 @@ BytesValue::BytesValue()
BytesValue::BytesValue(::google::protobuf::Arena* arena) BytesValue::BytesValue(::google::protobuf::Arena* arena)
: ::google::protobuf::Message(), : ::google::protobuf::Message(),
_internal_metadata_(arena) { _internal_metadata_(arena) {
#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaults(); protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaults();
#endif // GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
SharedCtor(); SharedCtor();
RegisterArenaDtor(arena); RegisterArenaDtor(arena);
// @@protoc_insertion_point(arena_constructor:google.protobuf.BytesValue) // @@protoc_insertion_point(arena_constructor:google.protobuf.BytesValue)

Loading…
Cancel
Save