commit bf36fb708ea8e3b6a63ec969c2461d7b3fd9e0ef
author Adam Sawicki <adam.sawicki@amd.com> Mon May 25 17:27:38 2020 +0200
committer Adam Sawicki <adam.sawicki@amd.com> Mon May 25 17:27:38 2020 +0200
tree 364dfdceee26b87b9a8bf687f3b5a635d94bbc89
parent aff54a5d8a10d26a2bb074679bdf10b1eeb7b68f

Some fixes for compiler warnings

Closes #6

src/D3D12MemAlloc.cpp

diff --git a/src/D3D12MemAlloc.cpp b/src/D3D12MemAlloc.cpp
index 7fc1695..5e88331 100644
--- a/src/D3D12MemAlloc.cpp
+++ b/src/D3D12MemAlloc.cpp
@@ -134,7 +134,7 @@
 #define D3D12MA_NEW_ARRAY(allocs, type, count) new(D3D12MA::AllocateArray<type>((allocs), (count)))(type)

 

 template<typename T>

-static void D3D12MA_DELETE(const ALLOCATION_CALLBACKS& allocs, T* memory)

+void D3D12MA_DELETE(const ALLOCATION_CALLBACKS& allocs, T* memory)

 {

     if(memory)

     {

@@ -143,7 +143,7 @@
     }

 }

 template<typename T>

-static void D3D12MA_DELETE_ARRAY(const ALLOCATION_CALLBACKS& allocs, T* memory, size_t count)

+void D3D12MA_DELETE_ARRAY(const ALLOCATION_CALLBACKS& allocs, T* memory, size_t count)

 {

     if(memory)

     {

@@ -1212,9 +1212,9 @@
                     UINT hexDigit = (val & 0xF000) >> 12;

                     val <<= 4;

                     if (hexDigit < 10)

-                        m_SB.Add(L'0' + hexDigit);

+                        m_SB.Add(L'0' + (WCHAR)hexDigit);

                     else

-                        m_SB.Add(L'A' + hexDigit);

+                        m_SB.Add(L'A' + (WCHAR)hexDigit);

                 }

             }

             break;

@@ -4765,7 +4765,6 @@
     // Process custom pools

     for(size_t heapTypeIndex = 0; heapTypeIndex < HEAP_TYPE_COUNT; ++heapTypeIndex)

     {

-        StatInfo& heapStatInfo = outStats.HeapType[heapTypeIndex];

         MutexLockRead lock(m_PoolsMutex[heapTypeIndex], m_UseMutex);

         const PoolVectorType* const poolVector = m_pPools[heapTypeIndex];

         D3D12MA_ASSERT(poolVector);