diff options
author | Adam Cozzette <acozzette@google.com> | 2018-03-14 11:17:48 -0700 |
---|---|---|
committer | Adam Cozzette <acozzette@google.com> | 2018-03-14 11:17:48 -0700 |
commit | 67952fab2c766ac5eacc15bb78e5af4039a3d398 (patch) | |
tree | eaaec1e5a17e676cd08535e15a365d557c332c3b /src/google/protobuf/compiler/objectivec/objectivec_message.cc | |
parent | b1216d95db304326f4c28d6dbc7d0860c43d8208 (diff) |
Deleted scoped_ptr.h
We no longer need this, now that we have finished the switch to C++11
and are using std::unique_ptr.
Diffstat (limited to 'src/google/protobuf/compiler/objectivec/objectivec_message.cc')
-rw-r--r-- | src/google/protobuf/compiler/objectivec/objectivec_message.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/google/protobuf/compiler/objectivec/objectivec_message.cc b/src/google/protobuf/compiler/objectivec/objectivec_message.cc index f1465c3e..83888854 100644 --- a/src/google/protobuf/compiler/objectivec/objectivec_message.cc +++ b/src/google/protobuf/compiler/objectivec/objectivec_message.cc @@ -310,7 +310,7 @@ void MessageGenerator::GenerateMessageHeader(io::Printer* printer) { "classname", class_name_); if (descriptor_->field_count()) { - scoped_array<const FieldDescriptor*> sorted_fields( + std::unique_ptr<const FieldDescriptor*[]> sorted_fields( SortFieldsByNumber(descriptor_)); printer->Print("typedef GPB_ENUM($classname$_FieldNumber) {\n", @@ -420,9 +420,9 @@ void MessageGenerator::GenerateSource(io::Printer* printer) { .GeneratePropertyImplementation(printer); } - scoped_array<const FieldDescriptor*> sorted_fields( + std::unique_ptr<const FieldDescriptor*[]> sorted_fields( SortFieldsByNumber(descriptor_)); - scoped_array<const FieldDescriptor*> size_order_fields( + std::unique_ptr<const FieldDescriptor*[]> size_order_fields( SortFieldsByStorageSize(descriptor_)); std::vector<const Descriptor::ExtensionRange*> sorted_extensions; |