diff options
| author |  Bo Yang <teboring@google.com> | 2015-05-21 14:28:59 -0700 |
|---|---|---|
| committer | Bo Yang <teboring@google.com> | 2015-05-21 19:32:02 -0700 |
| commit | 5db217305f37a79eeccd70f000088a06ec82fcec (patch) | |
| tree | be53dcf0c0b47ef9178ab8a6fa5c1946ee84a28f /src/google/protobuf/unknown_field_set.cc | |
| parent | 56095026ccc2f755a6fdb296e30c3ddec8f556a2 (diff) | |
down-integrate internal changes
Diffstat (limited to 'src/google/protobuf/unknown_field_set.cc')
| -rw-r--r-- | src/google/protobuf/unknown_field_set.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/google/protobuf/unknown_field_set.cc b/src/google/protobuf/unknown_field_set.cc index e15280c8..76644900 100644 --- a/src/google/protobuf/unknown_field_set.cc +++ b/src/google/protobuf/unknown_field_set.cc @@ -93,7 +93,7 @@ void UnknownFieldSet::InternalMergeFrom(const UnknownFieldSet& other) { fields_ = new vector<UnknownField>(); for (int i = 0; i < other_field_count; i++) { fields_->push_back((*other.fields_)[i]); - fields_->back().DeepCopy(); + fields_->back().DeepCopy((*other.fields_)[i]); } } } @@ -104,7 +104,7 @@ void UnknownFieldSet::MergeFrom(const UnknownFieldSet& other) { if (fields_ == NULL) fields_ = new vector<UnknownField>(); for (int i = 0; i < other_field_count; i++) { fields_->push_back((*other.fields_)[i]); - fields_->back().DeepCopy(); + fields_->back().DeepCopy((*other.fields_)[i]); } } } @@ -202,7 +202,7 @@ UnknownFieldSet* UnknownFieldSet::AddGroup(int number) { void UnknownFieldSet::AddField(const UnknownField& field) { if (fields_ == NULL) fields_ = new vector<UnknownField>(); fields_->push_back(field); - fields_->back().DeepCopy(); + fields_->back().DeepCopy(field); } void UnknownFieldSet::DeleteSubrange(int start, int num) { @@ -303,7 +303,7 @@ void UnknownField::Reset() { } } -void UnknownField::DeepCopy() { +void UnknownField::DeepCopy(const UnknownField& other) { switch (type()) { case UnknownField::TYPE_LENGTH_DELIMITED: length_delimited_.string_value_ = new string( |