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_field.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_field.cc')
| -rw-r--r-- | src/google/protobuf/compiler/objectivec/objectivec_field.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/compiler/objectivec/objectivec_field.cc b/src/google/protobuf/compiler/objectivec/objectivec_field.cc index b6123fad..67b026c3 100644 --- a/src/google/protobuf/compiler/objectivec/objectivec_field.cc +++ b/src/google/protobuf/compiler/objectivec/objectivec_field.cc @@ -411,9 +411,9 @@ FieldGeneratorMap::FieldGeneratorMap(const Descriptor* descriptor, const Options& options) : descriptor_(descriptor), field_generators_( - new scoped_ptr<FieldGenerator>[descriptor->field_count()]), + new std::unique_ptr<FieldGenerator>[descriptor->field_count()]), extension_generators_( - new scoped_ptr<FieldGenerator>[descriptor->extension_count()]) { + new std::unique_ptr<FieldGenerator>[descriptor->extension_count()]) { // Construct all the FieldGenerators. for (int i = 0; i < descriptor->field_count(); i++) { field_generators_[i].reset( |