diff options
| author | Rémi Verschelde | 2016-03-09 00:14:08 +0100 |
|---|---|---|
| committer | Rémi Verschelde | 2016-03-09 00:14:08 +0100 |
| commit | e46e43d2aaa6339a1675eb989f41885e745bf5c3 (patch) | |
| tree | cf91f2869ff8f058c6682569fb31e22e5ee736ad /core/os/memory.cpp | |
| parent | 1dad6eca812e5c2e313b54265114de8a1d73d999 (diff) | |
| parent | 4a4f2479146aa33e235ed57cde311efda68d3c8f (diff) | |
| download | godot-e46e43d2aaa6339a1675eb989f41885e745bf5c3.tar.gz godot-e46e43d2aaa6339a1675eb989f41885e745bf5c3.tar.zst godot-e46e43d2aaa6339a1675eb989f41885e745bf5c3.zip | |
Merge pull request #3928 from Marqin/whitespace
remove trailing whitespace - sorry for the broken PRs, please rebase :)
Diffstat (limited to '')
| -rw-r--r-- | core/os/memory.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/os/memory.cpp b/core/os/memory.cpp index f7f8fef2b..c2ff2aa78 100644 --- a/core/os/memory.cpp +++ b/core/os/memory.cpp @@ -88,16 +88,16 @@ void Memory::dump_static_mem_to_file(const char* p_file) { MID Memory::alloc_dynamic(size_t p_bytes, const char *p_descr) { MemoryPoolDynamic::ID id = MemoryPoolDynamic::get_singleton()->alloc(p_bytes,p_descr); - + return MID(id); } Error Memory::realloc_dynamic(MID p_mid,size_t p_bytes) { MemoryPoolDynamic::ID id = p_mid.data?p_mid.data->id:MemoryPoolDynamic::INVALID_ID; - + if (id==MemoryPoolDynamic::INVALID_ID) return ERR_INVALID_PARAMETER; - + return MemoryPoolDynamic::get_singleton()->realloc(p_mid, p_bytes); } |