amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 10:40:05 +08:00
Code Issues Actions 6 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
commit 40c1cb239d
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdpart/ZLToolKit

@ -1 +1 @@
Subproject commit 0c37146426d8fb0a6d98472739ec3bcc683922db
Subproject commit 3b333274b6595bb0d09576e9a2c1e4603129b64a

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