diff options
| author | Rémi Verschelde | 2017-03-19 00:36:26 +0100 |
|---|---|---|
| committer | Rémi Verschelde | 2017-03-19 00:36:26 +0100 |
| commit | f8db8a3faa30b71dca33ced38be16d3f93f43e8a (patch) | |
| tree | 3b798318132cca7eccfbca5818ab55656a2896d7 /core/os/memory_pool_dynamic_prealloc.cpp | |
| parent | 1d418afe863c9e553b69174ce63aef203c46d2f0 (diff) | |
| download | godot-f8db8a3faa30b71dca33ced38be16d3f93f43e8a.tar.gz godot-f8db8a3faa30b71dca33ced38be16d3f93f43e8a.tar.zst godot-f8db8a3faa30b71dca33ced38be16d3f93f43e8a.zip | |
Bring that Whole New World to the Old Continent too
Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6e3e905b94b8764e99491e608122261.
Diffstat (limited to 'core/os/memory_pool_dynamic_prealloc.cpp')
| -rw-r--r-- | core/os/memory_pool_dynamic_prealloc.cpp | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/core/os/memory_pool_dynamic_prealloc.cpp b/core/os/memory_pool_dynamic_prealloc.cpp index d2efa4cc8..1a549477b 100644 --- a/core/os/memory_pool_dynamic_prealloc.cpp +++ b/core/os/memory_pool_dynamic_prealloc.cpp @@ -30,24 +30,22 @@ #include "os/memory.h" #include "print_string.h" -MemoryPoolDynamicPrealloc::ID MemoryPoolDynamicPrealloc::alloc(size_t p_amount,const char* p_description) { +MemoryPoolDynamicPrealloc::ID MemoryPoolDynamicPrealloc::alloc(size_t p_amount, const char *p_description) { - -// print_line("dynpool - allocating: "+itos(p_amount)); + // print_line("dynpool - allocating: "+itos(p_amount)); ID id = pool_alloc->alloc(p_amount); -// print_line("dynpool - free: "+itos(pool_alloc->get_free_mem())); + // print_line("dynpool - free: "+itos(pool_alloc->get_free_mem())); return id; - } -void MemoryPoolDynamicPrealloc::free(ID p_id) { +void MemoryPoolDynamicPrealloc::free(ID p_id) { pool_alloc->free(p_id); } Error MemoryPoolDynamicPrealloc::realloc(ID p_id, size_t p_amount) { - return pool_alloc->resize(p_id,p_amount); + return pool_alloc->resize(p_id, p_amount); } bool MemoryPoolDynamicPrealloc::is_valid(ID p_id) { @@ -60,26 +58,26 @@ size_t MemoryPoolDynamicPrealloc::get_size(ID p_id) const { return pool_alloc->get_size(p_id); } -const char* MemoryPoolDynamicPrealloc::get_description(ID p_id) const { +const char *MemoryPoolDynamicPrealloc::get_description(ID p_id) const { return ""; } Error MemoryPoolDynamicPrealloc::lock(ID p_id) { -// print_line("lock: "+itos(p_id)); + // print_line("lock: "+itos(p_id)); return pool_alloc->lock(p_id); } -void * MemoryPoolDynamicPrealloc::get(ID p_ID) { +void *MemoryPoolDynamicPrealloc::get(ID p_ID) { -// print_line("get: "+itos(p_ID)); + // print_line("get: "+itos(p_ID)); return pool_alloc->get(p_ID); } Error MemoryPoolDynamicPrealloc::unlock(ID p_id) { -// print_line("unlock: "+itos(p_id)); + // print_line("unlock: "+itos(p_id)); pool_alloc->unlock(p_id); return OK; } @@ -89,7 +87,6 @@ bool MemoryPoolDynamicPrealloc::is_locked(ID p_id) const { return pool_alloc->is_locked(p_id); } - size_t MemoryPoolDynamicPrealloc::get_available_mem() const { return pool_alloc->get_free_mem(); @@ -100,17 +97,12 @@ size_t MemoryPoolDynamicPrealloc::get_total_usage() const { return pool_alloc->get_used_mem(); } +MemoryPoolDynamicPrealloc::MemoryPoolDynamicPrealloc(void *p_mem, int p_size, int p_align, int p_max_entries) { - -MemoryPoolDynamicPrealloc::MemoryPoolDynamicPrealloc(void * p_mem,int p_size, int p_align, int p_max_entries) { - - pool_alloc = memnew( PoolAllocator(p_mem,p_size,p_align,true,p_max_entries)); - + pool_alloc = memnew(PoolAllocator(p_mem, p_size, p_align, true, p_max_entries)); } MemoryPoolDynamicPrealloc::~MemoryPoolDynamicPrealloc() { - - memdelete( pool_alloc ); + memdelete(pool_alloc); } - |