Skip to content

P
protobuf
Commit a83ac866 authored by michaelpengcn's avatar michaelpengcn Committed by Paul Yang
Browse files
Options

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

parent a323f1e6
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
src/google/protobuf/metadata.h
View file @ a83ac866
...@@ -172,7 +172,8 @@ class InternalMetadataWithArena ...@@ -172,7 +172,8 @@ class InternalMetadataWithArena
public: public:
InternalMetadataWithArena() {} InternalMetadataWithArena() {}
explicit InternalMetadataWithArena(Arena* arena) explicit InternalMetadataWithArena(Arena* arena)
: InternalMetadataWithArenaBase(arena) {} : InternalMetadataWithArenaBase<UnknownFieldSet,
InternalMetadataWithArena>(arena) {}
void DoSwap(UnknownFieldSet* other) { void DoSwap(UnknownFieldSet* other) {
mutable_unknown_fields()->Swap(other); mutable_unknown_fields()->Swap(other);
...@@ -201,7 +202,8 @@ class InternalMetadataWithArenaLite ...@@ -201,7 +202,8 @@ class InternalMetadataWithArenaLite
InternalMetadataWithArenaLite() {} InternalMetadataWithArenaLite() {}
explicit InternalMetadataWithArenaLite(Arena* arena) explicit InternalMetadataWithArenaLite(Arena* arena)
: InternalMetadataWithArenaBase(arena) {} : InternalMetadataWithArenaBase<string,
InternalMetadataWithArenaLite>(arena) {}
void DoSwap(string* other) { void DoSwap(string* other) {
mutable_unknown_fields()->swap(*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