diff options
author | lloyd <[email protected]> | 2012-06-11 16:28:39 +0000 |
---|---|---|
committer | lloyd <[email protected]> | 2012-06-11 16:28:39 +0000 |
commit | 626a0afa0f232b015d5b5098d5cc7f35fa8284cf (patch) | |
tree | d82a4d1f0acda2c3021e2b5ed8c4ab29e97bdd08 | |
parent | 9494cb23020e18b9ff5272fa55cb9d125bb0b003 (diff) |
Compile fix
-rw-r--r-- | src/alloc/locking_allocator/locking_allocator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/alloc/locking_allocator/locking_allocator.cpp b/src/alloc/locking_allocator/locking_allocator.cpp index 1595c526f..6cdfc3e8e 100644 --- a/src/alloc/locking_allocator/locking_allocator.cpp +++ b/src/alloc/locking_allocator/locking_allocator.cpp @@ -70,7 +70,7 @@ size_t padding_for_alignment(size_t offset, size_t desired_alignment) void* mlock_allocator::allocate(size_t num_elems, size_t elem_size) { if(!m_pool) - return; + return nullptr; const size_t n = num_elems * elem_size; const size_t alignment = elem_size; |