Fix additional warning related to new() overloads
Former-commit-id: 218111eb7244643bd13af47b878622c429535288
This commit is contained in:
parent
9983a59895
commit
95f0357746
@ -200,9 +200,9 @@ REDIS_SERVER_NAME=keydb-server
|
|||||||
REDIS_SENTINEL_NAME=keydb-sentinel
|
REDIS_SENTINEL_NAME=keydb-sentinel
|
||||||
REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o acl.o storage.o rdb-s3.o fastlock.o new.o $(ASM_OBJ)
|
REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o acl.o storage.o rdb-s3.o fastlock.o new.o $(ASM_OBJ)
|
||||||
REDIS_CLI_NAME=keydb-cli
|
REDIS_CLI_NAME=keydb-cli
|
||||||
REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o redis-cli-cpphelper.o zmalloc.o release.o anet.o ae.o crc64.o siphash.o crc16.o storage-lite.o fastlock.o $(ASM_OBJ)
|
REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o redis-cli-cpphelper.o zmalloc.o release.o anet.o ae.o crc64.o siphash.o crc16.o storage-lite.o fastlock.o new.o $(ASM_OBJ)
|
||||||
REDIS_BENCHMARK_NAME=keydb-benchmark
|
REDIS_BENCHMARK_NAME=keydb-benchmark
|
||||||
REDIS_BENCHMARK_OBJ=ae.o anet.o redis-benchmark.o adlist.o dict.o zmalloc.o siphash.o redis-benchmark.o storage-lite.o fastlock.o $(ASM_OBJ)
|
REDIS_BENCHMARK_OBJ=ae.o anet.o redis-benchmark.o adlist.o dict.o zmalloc.o siphash.o redis-benchmark.o storage-lite.o fastlock.o new.o $(ASM_OBJ)
|
||||||
REDIS_CHECK_RDB_NAME=keydb-check-rdb
|
REDIS_CHECK_RDB_NAME=keydb-check-rdb
|
||||||
REDIS_CHECK_AOF_NAME=keydb-check-aof
|
REDIS_CHECK_AOF_NAME=keydb-check-aof
|
||||||
|
|
||||||
|
@ -8,8 +8,17 @@ void *operator new(size_t size)
|
|||||||
return zmalloc(size, MALLOC_LOCAL);
|
return zmalloc(size, MALLOC_LOCAL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void *operator new(size_t size, enum MALLOC_CLASS mclass)
|
||||||
|
{
|
||||||
|
return zmalloc(size, mclass);
|
||||||
|
}
|
||||||
|
|
||||||
void operator delete(void * p) noexcept
|
void operator delete(void * p) noexcept
|
||||||
{
|
{
|
||||||
zfree(p);
|
zfree(p);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void operator delete(void *p, std::size_t) noexcept
|
||||||
|
{
|
||||||
|
zfree(p);
|
||||||
|
}
|
11
src/new.h
11
src/new.h
@ -4,14 +4,7 @@
|
|||||||
[[deprecated]]
|
[[deprecated]]
|
||||||
void *operator new(size_t size);
|
void *operator new(size_t size);
|
||||||
|
|
||||||
inline void *operator new(size_t size, enum MALLOC_CLASS mclass)
|
void *operator new(size_t size, enum MALLOC_CLASS mclass);
|
||||||
{
|
|
||||||
return zmalloc(size, mclass);
|
|
||||||
}
|
|
||||||
|
|
||||||
void operator delete(void * p) noexcept;
|
void operator delete(void * p) noexcept;
|
||||||
|
void operator delete(void *p, std::size_t) noexcept;
|
||||||
inline void operator delete(void *p, std::size_t) noexcept
|
|
||||||
{
|
|
||||||
zfree(p);
|
|
||||||
}
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user