commit eace86c42911c8812841043d8f34c7574acee7da
author Adam Sawicki <adam.sawicki@amd.com> Tue Jun 14 13:43:22 2022 +0200
committer Adam Sawicki <adam.sawicki@amd.com> Tue Jun 14 13:43:22 2022 +0200
tree a6e04600f9597c798003eb15f3d4d7ca15c878cf
parent 4c5e910c9f87683ec369cc7ccf2486ab33ef4307

Fixed ambiguity in calls to JsonWriter::WriteNumber for size_t parameter to fix compilation on UWP

See #42

src/D3D12MemAlloc.cpp

diff --git a/src/D3D12MemAlloc.cpp b/src/D3D12MemAlloc.cpp
index 4388a79..9b4fb81 100644
--- a/src/D3D12MemAlloc.cpp
+++ b/src/D3D12MemAlloc.cpp
@@ -3010,10 +3010,10 @@
     json.WriteNumber(unusedBytes);

 

     json.WriteString(L"Allocations");

-    json.WriteNumber(allocationCount);

+    json.WriteNumber((UINT64)allocationCount);

 

     json.WriteString(L"UnusedRanges");

-    json.WriteNumber(unusedRangeCount);

+    json.WriteNumber((UINT64)unusedRangeCount);

 

     json.WriteString(L"Suballocations");

     json.BeginArray();

@@ -7191,11 +7191,11 @@
                 json.WriteString(m_AdapterDesc.Description);

 

                 json.WriteString(L"DedicatedVideoMemory");

-                json.WriteNumber(m_AdapterDesc.DedicatedVideoMemory);

+                json.WriteNumber((UINT64)m_AdapterDesc.DedicatedVideoMemory);

                 json.WriteString(L"DedicatedSystemMemory");

-                json.WriteNumber(m_AdapterDesc.DedicatedSystemMemory);

+                json.WriteNumber((UINT64)m_AdapterDesc.DedicatedSystemMemory);

                 json.WriteString(L"SharedSystemMemory");

-                json.WriteNumber(m_AdapterDesc.SharedSystemMemory);

+                json.WriteNumber((UINT64)m_AdapterDesc.SharedSystemMemory);

                 

                 json.WriteString(L"ResourceHeapTier");

                 json.WriteNumber(static_cast<UINT>(m_D3D12Options.ResourceHeapTier));