From c712d72297ad5d8dca5e61b2d93a034312fda79d Mon Sep 17 00:00:00 2001
From: Egor Yusov <egor.yusov@gmail.com>
Date: Mon, 22 Oct 2018 19:05:03 -0700
Subject: Fixed https://github.com/DiligentGraphics/DiligentCore/issues/37
 (build error on VS2015)

---
 Graphics/GraphicsEngineVulkan/include/VulkanUploadHeap.h | 10 +++++++++-
 Primitives/interface/FormatString.h                      |  9 +++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/Graphics/GraphicsEngineVulkan/include/VulkanUploadHeap.h b/Graphics/GraphicsEngineVulkan/include/VulkanUploadHeap.h
index eadce104..7414edee 100644
--- a/Graphics/GraphicsEngineVulkan/include/VulkanUploadHeap.h
+++ b/Graphics/GraphicsEngineVulkan/include/VulkanUploadHeap.h
@@ -111,9 +111,17 @@ private:
 
     struct UploadPageInfo
     {
+        UploadPageInfo(VulkanUtilities::VulkanMemoryAllocation&& _MemAllocation, 
+                       VulkanUtilities::BufferWrapper&&          _Buffer,
+                       Uint8*                                    _CPUAddress) :
+            MemAllocation(std::move(_MemAllocation)),
+            Buffer       (std::move(_Buffer)),
+            CPUAddress   (_CPUAddress)
+        {
+        }
         VulkanUtilities::VulkanMemoryAllocation MemAllocation;
         VulkanUtilities::BufferWrapper          Buffer;
-        Uint8*                                  CPUAddress = nullptr;
+        Uint8* const                            CPUAddress = nullptr;
     };
     std::vector<UploadPageInfo> m_Pages;
 
diff --git a/Primitives/interface/FormatString.h b/Primitives/interface/FormatString.h
index 993abbaf..a3e046d9 100644
--- a/Primitives/interface/FormatString.h
+++ b/Primitives/interface/FormatString.h
@@ -57,9 +57,14 @@ namespace Diligent
     template<typename Type>
     struct MemorySizeFormatter
     {
-        Type size        = 0;
+        MemorySizeFormatter(Type _size, size_t _precision, Type _ref_size) : 
+            size     (_size),
+            precision(_precision),
+            ref_size (_ref_size)
+        {}
+        Type   size      = 0;
         size_t precision = 0;
-        Type ref_size    = 0;
+        Type   ref_size  = 0;
     };
 
     template<typename Type>
-- 
cgit v1.2.3