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
10 years ago · 7f3a25bebd
parent 99aa0f9e8f dd449e1c79
commit 7f3a25bebd
1 changed files with 6 additions and 3 deletions
--- a/src/google/protobuf/unknown_field_set.h
+++ b/src/google/protobuf/unknown_field_set.h
@ -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_;
  };
 };