Browse Source

Quick fix for Android-CI build.
Related to modernize-use-equals-default.

Yao Wei Tjong 姚伟忠 8 years ago
parent
commit
dc384c1bec
2 changed files with 7 additions and 7 deletions
  1. 6 6
      Source/Urho3D/Core/Variant.cpp
  2. 1 1
      Source/Urho3D/Resource/JSONValue.cpp

+ 6 - 6
Source/Urho3D/Core/Variant.cpp

@@ -30,13 +30,13 @@
 namespace Urho3D
 {
 
-const Variant Variant::EMPTY;
-const PODVector<unsigned char> Variant::emptyBuffer;
-const ResourceRef Variant::emptyResourceRef;
-const ResourceRefList Variant::emptyResourceRefList;
+const Variant Variant::EMPTY { };
+const PODVector<unsigned char> Variant::emptyBuffer { };
+const ResourceRef Variant::emptyResourceRef { };
+const ResourceRefList Variant::emptyResourceRefList { };
 const VariantMap Variant::emptyVariantMap;
-const VariantVector Variant::emptyVariantVector;
-const StringVector Variant::emptyStringVector;
+const VariantVector Variant::emptyVariantVector { };
+const StringVector Variant::emptyStringVector { };
 
 static const char* typeNames[] =
 {

+ 1 - 1
Source/Urho3D/Resource/JSONValue.cpp

@@ -53,7 +53,7 @@ static const char* numberTypeNames[] =
 };
 
 const JSONValue JSONValue::EMPTY;
-const JSONArray JSONValue::emptyArray;
+const JSONArray JSONValue::emptyArray { };
 const JSONObject JSONValue::emptyObject;
 
 JSONValue& JSONValue::operator =(bool rhs)