diff options
| author |  Adam Cozzette <acozzette@gmail.com> | 2017-07-17 13:38:31 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-07-17 13:38:31 -0700 |
| commit | 33545583286a31940b6a732b1888e639cdf2e3c4 (patch) | |
| tree | 958c55f01e0411eb0d8cf2fa052d0acf4d2951fc | |
| parent | dd6e420dc41c7c55bfeac6a87e91903e883112f9 (diff) | |
| parent | 2130feadcfdbe0268b1afe6b050e000c83120aba (diff) | |
Merge pull request #3348 from matthauck/fix-gcc41-again
Fix map_field_inl.h for gcc 4.1
| -rw-r--r-- | src/google/protobuf/map_field_inl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/map_field_inl.h b/src/google/protobuf/map_field_inl.h index 0cfed72f..e317b5ed 100644 --- a/src/google/protobuf/map_field_inl.h +++ b/src/google/protobuf/map_field_inl.h @@ -252,9 +252,9 @@ template <typename Derived, typename Key, typename T, WireFormatLite::FieldType kValueFieldType, int default_enum_value> void MapField<Derived, Key, T, kKeyFieldType, kValueFieldType, default_enum_value>::Swap(MapField* other) { - std::swap(MapFieldBase::repeated_field_, other->repeated_field_); + std::swap(this->MapFieldBase::repeated_field_, other->repeated_field_); impl_.Swap(&other->impl_); - std::swap(MapFieldBase::state_, other->state_); + std::swap(this->MapFieldBase::state_, other->state_); } template <typename Derived, typename Key, typename T, |