Commit 7f3a25be authored by Feng Xiao's avatar Feng Xiao

Merge pull request #103 from Ang3lus/master

Fix "anonymous types declared in an anonymous union are an extension" warning when using clang with -pedantic switch
parents 99aa0f9e dd449e1c
......@@ -224,13 +224,16 @@ class LIBPROTOBUF_EXPORT UnknownField {
uint32 number_;
uint32 type_;
union LengthDelimited {
string* string_value_;
};
union {
uint64 varint_;
uint32 fixed32_;
uint64 fixed64_;
mutable union {
string* string_value_;
} length_delimited_;
mutable union LengthDelimited length_delimited_;
UnknownFieldSet* group_;
};
};
......
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