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

ZLToolKit @ 3b333274

-Subproject commit 0c37146426d8fb0a6d98472739ec3bcc683922db
+Subproject commit 3b333274b6595bb0d09576e9a2c1e4603129b64a

src/Common/config.cpp

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