From e8a20933dea57cd41bf90f53568824b5c94cc2db Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 12 Jun 2020 16:09:20 -0400 Subject: [PATCH] CVirtualDirectory: Resolve -Wreorder warnings --- src/Core/GameProject/CVirtualDirectory.cpp | 6 +++--- src/Core/GameProject/CVirtualDirectory.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Core/GameProject/CVirtualDirectory.cpp b/src/Core/GameProject/CVirtualDirectory.cpp index 0404a589..108171a7 100644 --- a/src/Core/GameProject/CVirtualDirectory.cpp +++ b/src/Core/GameProject/CVirtualDirectory.cpp @@ -5,17 +5,17 @@ #include CVirtualDirectory::CVirtualDirectory(CResourceStore *pStore) - : mpParent(nullptr), mpStore(pStore) + : mpStore(pStore) {} CVirtualDirectory::CVirtualDirectory(const TString& rkName, CResourceStore *pStore) - : mpParent(nullptr), mName(rkName), mpStore(pStore) + : mpStore(pStore), mName(rkName) { ASSERT(!mName.IsEmpty() && FileUtil::IsValidName(mName, true)); } CVirtualDirectory::CVirtualDirectory(CVirtualDirectory *pParent, const TString& rkName, CResourceStore *pStore) - : mpParent(pParent), mName(rkName), mpStore(pStore) + : mpParent(pParent), mpStore(pStore), mName(rkName) { ASSERT(!mName.IsEmpty() && FileUtil::IsValidName(mName, true)); } diff --git a/src/Core/GameProject/CVirtualDirectory.h b/src/Core/GameProject/CVirtualDirectory.h index 1c935ac3..58ef9e5e 100644 --- a/src/Core/GameProject/CVirtualDirectory.h +++ b/src/Core/GameProject/CVirtualDirectory.h @@ -12,7 +12,7 @@ class CResourceStore; class CVirtualDirectory { - CVirtualDirectory *mpParent; + CVirtualDirectory *mpParent = nullptr; CResourceStore *mpStore; TString mName; std::vector mSubdirectories;