weiai/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-03-06 22:20:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev

Browse Source
This commit is contained in:
ziyue
2021-06-08 17:52:44 +08:00
parent 0593f65fcb 6ccf512367
commit 40c1cb239d
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
3rdpart/ZLToolKit

Submodule 3rdpart/ZLToolKit updated: 0c37146426...3b333274b6

8
src/Common/config.cpp
View File

@@ -405,6 +405,10 @@ void operator delete(void *ptr) {
free(ptr);
}
void operator delete(void *ptr, std::size_t) {
free(ptr);
}
void *operator new[](std::size_t size) {
auto ret = malloc(size);
if (ret) {
@@ -416,4 +420,8 @@ void *operator new[](std::size_t size) {
void operator delete[](void *ptr) {
free(ptr);
}
void operator delete[](void *ptr, std::size_t) {
free(ptr);
}
#endif