Commit c2154e12 authored by Feng Xiao's avatar Feng Xiao Committed by GitHub

Merge pull request #3073 from xfxyjwf/3.3.x

Cherry-pick a bug fix: workaround gcc < 4.5.0 bug
parents d22493b6 9b82fce7
......@@ -167,7 +167,8 @@ class InternalMetadataWithArenaLite
InternalMetadataWithArenaLite() {}
explicit InternalMetadataWithArenaLite(Arena* arena)
: InternalMetadataWithArenaBase(arena) {}
: InternalMetadataWithArenaBase<string,
InternalMetadataWithArenaLite>(arena) {}
void DoSwap(string* other) {
mutable_unknown_fields()->swap(*other);
......
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