Skip to content

Commit 4fa8d8f

Browse files
committed
Rename doug_lea_allocator
common -> g_common_allocator
1 parent e86e49e commit 4fa8d8f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/xrCore/Memory/doug_lea_allocator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class XRCORE_API doug_lea_allocator
3333
void* m_dl_arena;
3434
};
3535

36-
extern doug_lea_allocator common;
36+
extern doug_lea_allocator g_common_allocator;
3737

3838
template <class T, doug_lea_allocator& _impl = common>
3939
class doug_lea_alloc

src/xrMisc/xrMisc_xrMemory.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ void operator delete[](void* p) throw() { Memory.mem_free(p); }
2424
#ifdef USE_ARENA_ALLOCATOR
2525
constexpr static const u32 s_arena_size = 256 * 1024 * 1024;
2626
static char s_fake_array[s_arena_size];
27-
doug_lea_allocator common(s_fake_array, s_arena_size, "common");
27+
doug_lea_allocator g_common_allocator(s_fake_array, s_arena_size, "common");
2828
#else
29-
doug_lea_allocator common(nullptr, 0, "common");
29+
doug_lea_allocator g_common_allocator(nullptr, 0, "common");
3030
#endif
3131
#endif // USE_DOUG_LEA_ALLOCATOR

0 commit comments

Comments
 (0)