michael/lean2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Suppress style warning on util/memory.cpp

Browse source
This commit is contained in:
Soonho Kong 2013-09-20 18:07:12 -07:00
parent 9226c46358
commit bef44899c8
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/util/memory.cpp
View file

@ -43,7 +43,7 @@ void free(void * ptr) {
#include <atomic> #include <atomic>
#if defined(HAS_MALLOC_USABLE_SIZE) #if defined(HAS_MALLOC_USABLE_SIZE)
#include <malloc.h> #include <malloc.h> // NOLINT
namespace lean { namespace lean {
inline size_t malloc_size(void * ptr) { return malloc_usable_size(ptr); } inline size_t malloc_size(void * ptr) { return malloc_usable_size(ptr); }
inline void * malloc_core(size_t sz) { return ::malloc(sz); } inline void * malloc_core(size_t sz) { return ::malloc(sz); }
@ -61,7 +61,7 @@ inline void free_core(void * ptr) { free(ptr); }
// inline void free_core(void * ptr) { tc_free(ptr); } // inline void free_core(void * ptr) { tc_free(ptr); }
// } // }
#elif defined(HAS_MALLOCSIZE) #elif defined(HAS_MALLOCSIZE)
#include <malloc/malloc.h> #include <malloc/malloc.h> // NOLINT
namespace lean { namespace lean {
inline size_t malloc_size(void * ptr) { return ::malloc_size(ptr); } inline size_t malloc_size(void * ptr) { return ::malloc_size(ptr); }
inline void * malloc_core(size_t sz) { return ::malloc(sz); } inline void * malloc_core(size_t sz) { return ::malloc(sz); }
@ -69,7 +69,7 @@ inline void * realloc_core(void * ptr, size_t sz) { return realloc(ptr, sz); }
inline void free_core(void * ptr) { free(ptr); } inline void free_core(void * ptr) { free(ptr); }
} }
#elif defined(HAS_MSIZE) #elif defined(HAS_MSIZE)
#include <malloc.h> #include <malloc.h> // NOLINT
namespace lean { namespace lean {
inline size_t malloc_size(void * ptr) { return _msize(ptr); } inline size_t malloc_size(void * ptr) { return _msize(ptr); }
inline void * malloc_core(size_t sz) { return ::malloc(sz); } inline void * malloc_core(size_t sz) { return ::malloc(sz); }