diff options
| author |  kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-04-25 02:53:47 +0000 |
|---|---|---|
| committer | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-04-25 02:53:47 +0000 |
| commit | d37d46dfbcedadeb439ad0367f8afcf8867dca43 (patch) | |
| tree | b896df229f7c671637924c156d5a759ba50a3190 /src/google/protobuf/dynamic_message.cc | |
| parent | 709ea28f3264aa5632e5577a4080671173fc6166 (diff) | |
Integrate recent changes from Google-internal code tree. See CHANGES.txt
for details.
Diffstat (limited to 'src/google/protobuf/dynamic_message.cc')
| -rw-r--r-- | src/google/protobuf/dynamic_message.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/dynamic_message.cc b/src/google/protobuf/dynamic_message.cc index b969c13b..be8235e7 100644 --- a/src/google/protobuf/dynamic_message.cc +++ b/src/google/protobuf/dynamic_message.cc @@ -229,8 +229,7 @@ DynamicMessage::DynamicMessage(const TypeInfo* type_info) new(OffsetToPointer(type_info_->unknown_fields_offset)) UnknownFieldSet; if (type_info_->extensions_offset != -1) { - new(OffsetToPointer(type_info_->extensions_offset)) - ExtensionSet(&type_info_->type, type_info_->pool, type_info_->factory); + new(OffsetToPointer(type_info_->extensions_offset)) ExtensionSet; } for (int i = 0; i < descriptor->field_count(); i++) { @@ -508,6 +507,7 @@ const Message* DynamicMessageFactory::GetPrototype(const Descriptor* type) { type_info->unknown_fields_offset, type_info->extensions_offset, type_info->pool, + this, type_info->size)); // Cross link prototypes. |