Merge pull request #3062 from Oppen/master

Workaround gcc < 4.5.0 bug

Merge pull request #3062 from Oppen/master
Workaround gcc < 4.5.0 bug
455b61c6 · Feng Xiao · GitHub · 25abd7b7 · cd0efc00 · 455b61c6
Commit 455b61c6 authored May 08, 2017 by Feng Xiao Committed by GitHub May 08, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

metadata_lite.h src/google/protobuf/metadata_lite.h +2 -1

No files found.
--- 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);