commit a082e0367f3805c48c70651038eff4156a2c3652
author Daniel Krupiński <danielkrupinski@outlook.com> Thu Sep 16 20:24:12 2021 +0200
committer Daniel Krupiński <danielkrupinski@outlook.com> Thu Sep 16 20:24:12 2021 +0200
tree c8d2b5502e1c85b9782b5527b8cd2ea069a7d9d4
parent 66d745372cfdb6a384b81c81729a01dd51c913b5

Use 'using' declaration instead of 'typedef' for creating type aliases

src/D3D12MemAlloc.cpp

diff --git a/src/D3D12MemAlloc.cpp b/src/D3D12MemAlloc.cpp
index 9c50a39..40f24a5 100644
--- a/src/D3D12MemAlloc.cpp
+++ b/src/D3D12MemAlloc.cpp
@@ -779,7 +779,7 @@
 class Vector

 {

 public:

-    typedef T value_type;

+    using value_type = T;

 

     // allocationCallbacks externally owned, must outlive this object.

     Vector(const ALLOCATION_CALLBACKS& allocationCallbacks) :

@@ -967,7 +967,7 @@
         remove(0);

     }

 

-    typedef T* iterator;

+    using iterator = T*;

 

     iterator begin() { return m_pArray; }

     iterator end() { return m_pArray + m_Count; }

@@ -1995,7 +1995,7 @@
 Expected interface of ItemTypeTraits:

 struct MyItemTypeTraits

 {

-    typedef MyItem ItemType;

+    using ItemType = MyItem;

     static ItemType* GetPrev(const ItemType* item) { return item->myPrevPtr; }

     static ItemType* GetNext(const ItemType* item) { return item->myNextPtr; }

     static ItemType*& AccessPrev(ItemType* item) { return item->myPrevPtr; }

@@ -2006,7 +2006,7 @@
 class IntrusiveLinkedList

 {

 public:

-    typedef typename ItemTypeTraits::ItemType ItemType;

+    using ItemType = typename ItemTypeTraits::ItemType;

     static ItemType* GetPrev(const ItemType* item) { return ItemTypeTraits::GetPrev(item); }

     static ItemType* GetNext(const ItemType* item) { return ItemTypeTraits::GetNext(item); }

     // Movable, not copyable.

@@ -2261,7 +2261,7 @@
     }

 };

 

-typedef List<Suballocation> SuballocationList;

+using SuballocationList = List<Suballocation>;

 

 struct SuballocationItemSizeLess

 {

@@ -2552,7 +2552,7 @@
 

 struct CommittedAllocationListItemTraits

 {

-    typedef Allocation ItemType;

+    using ItemType = Allocation;

     static ItemType* GetPrev(const ItemType* item)

     {

         D3D12MA_ASSERT(item->m_PackedData.GetType() == Allocation::TYPE_COMMITTED || item->m_PackedData.GetType() == Allocation::TYPE_HEAP);

@@ -2601,7 +2601,7 @@
     PoolPimpl* m_Pool = NULL;

 

     D3D12MA_RW_MUTEX m_Mutex;

-    typedef IntrusiveLinkedList<CommittedAllocationListItemTraits> CommittedAllocationLinkedList;

+    using CommittedAllocationLinkedList = IntrusiveLinkedList<CommittedAllocationListItemTraits>;

     CommittedAllocationLinkedList m_AllocationList;

 };

 

@@ -2812,7 +2812,7 @@
 

 struct PoolListItemTraits

 {

-    typedef PoolPimpl ItemType;

+    using ItemType = PoolPimpl;

     static ItemType* GetPrev(const ItemType* item) { return item->m_PrevPool; }

     static ItemType* GetNext(const ItemType* item) { return item->m_NextPool; }

     static ItemType*& AccessPrev(ItemType* item) { return item->m_PrevPool; }

@@ -2965,7 +2965,7 @@
     D3D12_FEATURE_DATA_ARCHITECTURE m_D3D12Architecture;

     AllocationObjectAllocator m_AllocationObjectAllocator;

 

-    typedef IntrusiveLinkedList<PoolListItemTraits> PoolList;

+    using PoolList = IntrusiveLinkedList<PoolListItemTraits>;

     PoolList m_Pools[HEAP_TYPE_COUNT];

     D3D12MA_RW_MUTEX m_PoolsMutex[HEAP_TYPE_COUNT];

 

src/D3D12MemAlloc.h

diff --git a/src/D3D12MemAlloc.h b/src/D3D12MemAlloc.h
index cce6f44..767f717 100644
--- a/src/D3D12MemAlloc.h
+++ b/src/D3D12MemAlloc.h
@@ -153,13 +153,13 @@
 struct StatInfo;

 

 /// Pointer to custom callback function that allocates CPU memory.

-typedef void* (*ALLOCATE_FUNC_PTR)(size_t Size, size_t Alignment, void* pUserData);

+using ALLOCATE_FUNC_PTR = void* (*)(size_t Size, size_t Alignment, void* pUserData);

 /**

 \brief Pointer to custom callback function that deallocates CPU memory.

 

 `pMemory = null` should be accepted and ignored.

 */

-typedef void (*FREE_FUNC_PTR)(void* pMemory, void* pUserData);

+using FREE_FUNC_PTR = void (*)(void* pMemory, void* pUserData);

 

 /// Custom callbacks to CPU memory allocation functions.

 struct ALLOCATION_CALLBACKS