Skip to content

P
protobuf
Commit 33545583 authored by Adam Cozzette's avatar Adam Cozzette Committed by GitHub
Browse files
Options

Merge pull request #3348 from matthauck/fix-gcc41-again 

Fix map_field_inl.h for gcc 4.1
parents dd6e420d 2130fead
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
src/google/protobuf/map_field_inl.h
View file @ 33545583
...@@ -252,9 +252,9 @@ template <typename Derived, typename Key, typename T, ...@@ -252,9 +252,9 @@ template <typename Derived, typename Key, typename T,
WireFormatLite::FieldType kValueFieldType, int default_enum_value> WireFormatLite::FieldType kValueFieldType, int default_enum_value>
void MapField<Derived, Key, T, kKeyFieldType, kValueFieldType, void MapField<Derived, Key, T, kKeyFieldType, kValueFieldType,
default_enum_value>::Swap(MapField* other) { 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_); impl_.Swap(&other->impl_);
std::swap(MapFieldBase::state_, other->state_); std::swap(this->MapFieldBase::state_, other->state_);
} }
template <typename Derived, typename Key, typename T, template <typename Derived, typename Key, typename T,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment