Refactor allocators

New XRay::xray_allocator and XRay::xray_allocator_wrapper aliases

Not deleted Doug Lea allocator but disabled it since it's unused

Remove throw() specifiers from new/delete operators

Author: Xottab-DUTY

src/xrCommon/xr_deque.h

@@ -1,9 +1,8 @@
 #pragma once
 #include <deque>
-#include "xrCore/Memory/xalloc.h"
-#include "xrCore/xrDebug_macros.h"
+#include "xrCore/Memory/XRayAllocator.hpp"
 
-template <typename T, typename allocator = xalloc<T>>
+template <typename T, typename allocator = XRay::xray_allocator<T>>
 class xr_deque : public std::deque<T, allocator>
 {
 public:

src/xrCommon/xr_list.h

@@ -1,9 +1,8 @@
 #pragma once
 #include <list>
-#include "xrCore/Memory/xalloc.h"
-#include "xrCore/xrDebug_macros.h"
+#include "xrCore/Memory/XRayAllocator.hpp"
 
-template <typename T, typename allocator = xalloc<T>>
+template <typename T, typename allocator = XRay::xray_allocator<T>>
 class xr_list : public std::list<T, allocator>
 {
 public:

src/xrCommon/xr_map.h

@@ -1,16 +1,15 @@
 #pragma once
 #include <map>
-#include "xrCore/Memory/xalloc.h"
-#include "xrCore/xrDebug_macros.h"
+#include "xrCore/Memory/XRayAllocator.hpp"
 
-template <typename K, class V, class P = std::less<K>, typename allocator = xalloc<std::pair<K, V>>>
+template <typename K, class V, class P = std::less<K>, typename allocator = XRay::xray_allocator<std::pair<K, V>>>
 class xr_map : public std::map<K, V, P, allocator>
 {
 public:
     u32 size() const { return (u32)std::map<K, V, P, allocator>::size(); }
 };
 
-template <typename K, class V, class P = std::less<K>, typename allocator = xalloc<std::pair<K, V>>>
+template <typename K, class V, class P = std::less<K>, typename allocator = XRay::xray_allocator<std::pair<K, V>>>
 class xr_multimap : public std::multimap<K, V, P, allocator>
 {
 public:

src/xrCommon/xr_set.h

@@ -1,16 +1,15 @@
 #pragma once
 #include <set>
-#include "xrCore/Memory/xalloc.h"
-#include "xrCore/xrDebug_macros.h"
+#include "xrCore/Memory/XRayAllocator.hpp"
 
-template <typename K, class P = std::less<K>, typename allocator = xalloc<K>>
+template <typename K, class P = std::less<K>, typename allocator = XRay::xray_allocator<K>>
 class xr_set : public std::set<K, P, allocator>
 {
 public:
     u32 size() const { return (u32)std::set<K, P, allocator>::size(); }
 };
 
-template <typename K, class P = std::less<K>, typename allocator = xalloc<K>>
+template <typename K, class P = std::less<K>, typename allocator = XRay::xray_allocator<K>>
 class xr_multiset : public std::multiset<K, P, allocator>
 {
 public:

src/xrCommon/xr_string.h

@@ -1,12 +1,12 @@
 #pragma once
 #include <string>
-#include "xrCore/Memory/xalloc.h"
+#include "xrCore/Memory/XRayAllocator.hpp"
 
 // string(char)
-typedef std::basic_string<char, std::char_traits<char>, xalloc<char>> xr_string;
+using xr_string = std::basic_string<char, std::char_traits<char>, XRay::xray_allocator<char>>;
 
 inline void xr_strlwr(xr_string& src)
 {
-    for (xr_string::iterator it = src.begin(); it!=src.end(); it++)
-        *it = xr_string::value_type(tolower(*it));
+    for (auto& it : src)
+        it = xr_string::value_type(tolower(it));
 }

src/xrCommon/xr_vector.h

@@ -1,6 +1,6 @@
 #pragma once
 #include <vector>
-#include "xrCore/Memory/xalloc.h"
+#include "xrCore/Memory/XRayAllocator.hpp"
 
 #define DEF_VECTOR(N, T)\
     typedef xr_vector<T> N;\
@@ -10,5 +10,5 @@
     typedef xr_vector<T> N;\
     typedef N::iterator I;
 
-template <typename T, typename allocator = xalloc<T>>
+template <typename T, typename allocator = XRay::xray_allocator<T>>
 using xr_vector = class std::vector<T, allocator>;

src/xrCore/FixedMap.h

@@ -1,8 +1,6 @@
-#ifndef _FIXEDMAP_H
-#define _FIXEDMAP_H
 #pragma once
 
-template <class K, class T, class allocator = xr_allocator>
+template <class K, class T, class allocator = XRay::xray_allocator_wrapper>
 class FixedMAP
 {
     enum
@@ -301,4 +299,3 @@ class FixedMAP
             CB(nodes + i);
     }
 };
-#endif

src/xrCore/Memory/XRayAllocator.hpp

@@ -0,0 +1,13 @@
+#pragma once
+#include "memory_allocator_options.h"
+#include "xalloc.h"
+#ifdef USE_DOUG_LEA_ALLOCATOR
+#include "doug_lea_allocator.h"
+#endif
+
+namespace XRay
+{
+    template<typename T>
+    using xray_allocator = xalloc<T>;
+    using xray_allocator_wrapper = xr_allocator;
+} // namespace XRay

src/xrCore/Memory/doug_lea_allocator.cpp

@@ -7,11 +7,12 @@
 #include "stdafx.h"
 #include "doug_lea_allocator.h"
 
+#ifdef USE_DOUG_LEA_ALLOCATOR
 #define USE_DL_PREFIX
 #define MSPACES 1
 #define USE_OUT_OF_MEMORY_HANDLER
 #define USE_LOCKS 0
-#include "Memory/dlmalloc.h"
+#include "dlmalloc.h"
 
 static void __stdcall out_of_memory(mspace const space, void const* const parameter, int const first_time)
 {
@@ -51,3 +52,4 @@ void doug_lea_allocator::free_impl(void*& pointer)
 }
 
 u32 doug_lea_allocator::get_allocated_size() const { return (u32)mspace_mallinfo(m_dl_arena).uordblks; }
+#endif // USE_DOUG_LEA_ALLOCATOR

src/xrCore/Memory/doug_lea_allocator.h

@@ -5,8 +5,7 @@
 ////////////////////////////////////////////////////////////////////////////
 #pragma once
 
-#include "xrCore/Memory/memory_allocator_options.h"
-
+#ifdef USE_DOUG_LEA_ALLOCATOR
 class XRCORE_API doug_lea_allocator
 {
 public:
@@ -120,3 +119,4 @@ struct doug_lea_allocator_wrapper
         impl.free_impl((void*&)p);
     }
 };
+#endif // USE_DOUG_LEA_ALLOCATOR