Skip to content

Commit

Permalink
Allocators cleanup
Browse files Browse the repository at this point in the history
Move xalloc.h to xrCore/Memory folder
Remove unused doug_lea_memory_allocator.* from xrRender and xrServerEntities
Remove unused ptmalloc3 allocator
Move dlmalloc to xrCore/Memory folder
xrCore project file:
- Move Memory manager and Memory monitor folders to Memory folder
  • Loading branch information
Xottab-DUTY committed Dec 23, 2017
1 parent 429e640 commit 156b48b
Show file tree
Hide file tree
Showing 45 changed files with 78 additions and 15,684 deletions.
2 changes: 1 addition & 1 deletion Externals/OPCODE/pch.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "Common/Common.hpp"
#include "xrCore/xrCore.h"
#include "xrCore/doug_lea_allocator.h"
#include "xrCore/Memory/doug_lea_allocator.h"
#include "xrCore/memory_allocator_options.h"

#ifdef USE_ARENA_ALLOCATOR
Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRender/RenderAllocator.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#pragma once
#include "xrCore/doug_lea_allocator.h"
#include "xrCore/Memory/doug_lea_allocator.h"

extern doug_lea_allocator g_render_allocator;
5,064 changes: 0 additions & 5,064 deletions src/Layers/xrRender/doug_lea_memory_allocator.c

This file was deleted.

Loading

0 comments on commit 156b48b

Please sign in to comment.