Rename doug_lea_allocator

common -> g_common_allocator
OpenXRay · Dec 24, 2017 · 4fa8d8f · 4fa8d8f
1 parent e86e49e
commit 4fa8d8f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/xrCore/Memory/doug_lea_allocator.h b/src/xrCore/Memory/doug_lea_allocator.h
@@ -33,7 +33,7 @@ class XRCORE_API doug_lea_allocator
     void* m_dl_arena;
 };
 
-extern doug_lea_allocator common;
+extern doug_lea_allocator g_common_allocator;
 
 template <class T, doug_lea_allocator& _impl = common>
 class doug_lea_alloc

diff --git a/src/xrMisc/xrMisc_xrMemory.cpp b/src/xrMisc/xrMisc_xrMemory.cpp
@@ -24,8 +24,8 @@ void operator delete[](void* p) throw() { Memory.mem_free(p); }
 #ifdef USE_ARENA_ALLOCATOR
 constexpr static const u32 s_arena_size = 256 * 1024 * 1024;
 static char s_fake_array[s_arena_size];
-doug_lea_allocator common(s_fake_array, s_arena_size, "common");
+doug_lea_allocator g_common_allocator(s_fake_array, s_arena_size, "common");
 #else
-doug_lea_allocator common(nullptr, 0, "common");
+doug_lea_allocator g_common_allocator(nullptr, 0, "common");
 #endif
 #endif // USE_DOUG_LEA_ALLOCATOR