diff options
| author | michaelpengcn <michaelpengcn@gmail.com> | 2017-01-28 08:40:53 +0800 |
|---|---|---|
| committer | Paul Yang <TeBoring@users.noreply.github.com> | 2017-01-27 16:40:53 -0800 |
| commit | a83ac8663fb8042a881bc60b12a8bd3a0c03a3ff (patch) | |
| tree | ac3901ca731b24897bdfa257b993d141f8a68b49 /src/google/protobuf/metadata.h | |
| parent | a323f1e65da2c512f971a2edf1918a0cca340015 (diff) | |
| download | protobuf-a83ac8663fb8042a881bc60b12a8bd3a0c03a3ff.tar.gz protobuf-a83ac8663fb8042a881bc60b12a8bd3a0c03a3ff.tar.bz2 protobuf-a83ac8663fb8042a881bc60b12a8bd3a0c03a3ff.zip | |
fix compile error on centos in metadata.h for constructors. (#2599)
Diffstat (limited to 'src/google/protobuf/metadata.h')
| -rw-r--r-- | src/google/protobuf/metadata.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/google/protobuf/metadata.h b/src/google/protobuf/metadata.h index f9257534..dca1fa45 100644 --- 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); |