Skip to content

Commit eace86c

Browse files
Fixed ambiguity in calls to JsonWriter::WriteNumber for size_t parameter to fix compilation on UWP
See #42
1 parent 4c5e910 commit eace86c

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

src/D3D12MemAlloc.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3010,10 +3010,10 @@ void BlockMetadata::PrintDetailedMap_Begin(JsonWriter& json,
30103010
json.WriteNumber(unusedBytes);
30113011

30123012
json.WriteString(L"Allocations");
3013-
json.WriteNumber(allocationCount);
3013+
json.WriteNumber((UINT64)allocationCount);
30143014

30153015
json.WriteString(L"UnusedRanges");
3016-
json.WriteNumber(unusedRangeCount);
3016+
json.WriteNumber((UINT64)unusedRangeCount);
30173017

30183018
json.WriteString(L"Suballocations");
30193019
json.BeginArray();
@@ -7191,11 +7191,11 @@ void AllocatorPimpl::BuildStatsString(WCHAR** ppStatsString, BOOL detailedMap)
71917191
json.WriteString(m_AdapterDesc.Description);
71927192

71937193
json.WriteString(L"DedicatedVideoMemory");
7194-
json.WriteNumber(m_AdapterDesc.DedicatedVideoMemory);
7194+
json.WriteNumber((UINT64)m_AdapterDesc.DedicatedVideoMemory);
71957195
json.WriteString(L"DedicatedSystemMemory");
7196-
json.WriteNumber(m_AdapterDesc.DedicatedSystemMemory);
7196+
json.WriteNumber((UINT64)m_AdapterDesc.DedicatedSystemMemory);
71977197
json.WriteString(L"SharedSystemMemory");
7198-
json.WriteNumber(m_AdapterDesc.SharedSystemMemory);
7198+
json.WriteNumber((UINT64)m_AdapterDesc.SharedSystemMemory);
71997199

72007200
json.WriteString(L"ResourceHeapTier");
72017201
json.WriteNumber(static_cast<UINT>(m_D3D12Options.ResourceHeapTier));

0 commit comments

Comments
 (0)