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

1 files changed, 6 insertions, 3 deletions

diff --git a/src/google/protobuf/unknown_field_set.h b/src/google/protobuf/unknown_field_set.h
index 6f7a9fdb..e8c0a13c 100644
--- 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_;
   };
 };