fix compile error on centos in metadata.h for constructors. (#2599)

a83ac866 · michaelpengcn · Paul Yang · a323f1e6 · a83ac866
Commit a83ac866 authored Jan 28, 2017 by michaelpengcn Committed by Paul Yang Jan 28, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

metadata.h src/google/protobuf/metadata.h +4 -2

No files found.
--- a/src/google/protobuf/metadata.h
+++ b/src/google/protobuf/metadata.h
@@ -172,7 +172,8 @@ class InternalMetadataWithArena
 public:
  InternalMetadataWithArena() {}
  explicit InternalMetadataWithArena(Arena* arena)
-      : InternalMetadataWithArenaBase(arena) {}
+      : InternalMetadataWithArenaBase<UnknownFieldSet,
+                                           InternalMetadataWithArena>(arena) {}

  void DoSwap(UnknownFieldSet* other) {
    mutable_unknown_fields()->Swap(other);
@@ -201,7 +202,8 @@ class InternalMetadataWithArenaLite
  InternalMetadataWithArenaLite() {}

  explicit InternalMetadataWithArenaLite(Arena* arena)
-      : InternalMetadataWithArenaBase(arena) {}
+      : InternalMetadataWithArenaBase<string,
+                                           InternalMetadataWithArenaLite>(arena) {}

  void DoSwap(string* other) {
    mutable_unknown_fields()->swap(*other);