浏览代码

Fix "anonymous types declared in an anonymous union are an extension"
warning when using clang with -pedantic switch

Łukasz Twarduś 11 年之前
父节点
当前提交
dd449e1c79
共有 1 个文件被更改,包括 6 次插入3 次删除
  1. 6 3
      src/google/protobuf/unknown_field_set.h

+ 6 - 3
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_;
   };
 };