organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #103 from Ang3lus/master

Browse source 
Fix "anonymous types declared in an anonymous union are an extension" warning when using clang with -pedantic switch
This commit is contained in:
Feng Xiao 2014-11-25 11:46:39 -08:00
commit 7f3a25bebd
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/google/protobuf/unknown_field_set.h
View file

@ -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_;
};
};