ソースを参照

Add NOLINT to prevent false positive from modernize-use-equals-default.
Minor refactor to rearrange the union member of the VariantValue class separating the trivial and non-trivial members.

Yao Wei Tjong 姚伟忠 8 年 前
コミット
f2a7fb9aa8
1 ファイル変更16 行追加16 行削除
  1. 16 16
      Source/Urho3D/Core/Variant.h

+ 16 - 16
Source/Urho3D/Core/Variant.h

@@ -282,38 +282,38 @@ union VariantValue
     int int_;
     int int_;
     bool bool_;
     bool bool_;
     float float_;
     float float_;
+    double double_;
+    long long int64_;
+    void* voidPtr_;
+    WeakPtr<RefCounted> weakPtr_;
     Vector2 vector2_;
     Vector2 vector2_;
     Vector3 vector3_;
     Vector3 vector3_;
     Vector4 vector4_;
     Vector4 vector4_;
+    Rect rect_;
+    IntVector2 intVector2_;
+    IntVector3 intVector3_;
+    IntRect intRect_;
+    Matrix3* matrix3_;
+    Matrix3x4* matrix3x4_;
+    Matrix4* matrix4_;
     Quaternion quaternion_;
     Quaternion quaternion_;
     Color color_;
     Color color_;
     String string_;
     String string_;
+    StringVector stringVector_;
+    VariantVector variantVector_;
+    VariantMap variantMap_;
     PODVector<unsigned char> buffer_;
     PODVector<unsigned char> buffer_;
-    void* voidPtr_;
     ResourceRef resourceRef_;
     ResourceRef resourceRef_;
     ResourceRefList resourceRefList_;
     ResourceRefList resourceRefList_;
-    VariantVector variantVector_;
-    VariantMap variantMap_;
-    IntRect intRect_;
-    IntVector2 intVector2_;
-    WeakPtr<RefCounted> weakPtr_;
-    Matrix3* matrix3_;
-    Matrix3x4* matrix3x4_;
-    Matrix4* matrix4_;
-    double double_;
-    StringVector stringVector_;
-    Rect rect_;
-    IntVector3 intVector3_;
-    long long int64_;
     CustomVariantValue* customValueHeap_;
     CustomVariantValue* customValueHeap_;
     CustomVariantValue customValueStack_;
     CustomVariantValue customValueStack_;
 
 
     /// Construct uninitialized.
     /// Construct uninitialized.
-    VariantValue() { }
+    VariantValue() { }      // NOLINT
     /// Non-copyable.
     /// Non-copyable.
     VariantValue(const VariantValue& value) = delete;
     VariantValue(const VariantValue& value) = delete;
     /// Destruct.
     /// Destruct.
-    ~VariantValue() { }
+    ~VariantValue() { }     // NOLINT
 };
 };
 
 
 static_assert(sizeof(VariantValue) == VARIANT_VALUE_SIZE, "Unexpected size of VariantValue");
 static_assert(sizeof(VariantValue) == VARIANT_VALUE_SIZE, "Unexpected size of VariantValue");