From dd449e1c79835832f7ef01cd7df7ccb20f7cfa93 Mon Sep 17 00:00:00 2001
From: Łukasz Twarduś <ltwardus@gmail.com>
Date: Tue, 25 Nov 2014 19:25:38 +0100
Subject: Fix "anonymous types declared in an anonymous union are an extension"
 warning when using clang with -pedantic switch

---
 src/google/protobuf/unknown_field_set.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/google/protobuf/unknown_field_set.h')

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_;
   };
 };
-- 
cgit v1.2.3