Merge pull request #3073 from xfxyjwf/3.3.x

Cherry-pick a bug fix: workaround gcc < 4.5.0 bug
2017-05-08 13:38:48 -07:00 · 2017-05-08 13:38:48 -07:00 · c2154e124d
commit c2154e124d
parent d22493b6f6 9b82fce7f1
1 changed files with 2 additions and 1 deletions
--- a/src/google/protobuf/metadata_lite.h
+++ b/src/google/protobuf/metadata_lite.h
@ -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);