AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

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

Browse Source 
Fix map_field_inl.h for gcc 4.1
This commit is contained in:
Adam Cozzette 2017-07-17 13:38:31 -07:00 committed by GitHub
commit 3354558328
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/google/protobuf/map_field_inl.h
View File

@ -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,