From fc662341e6f85da78ada0e443f6116b978f79f22 Mon Sep 17 00:00:00 2001
From: Igor Pavlov <87184205+ip7z@users.noreply.github.com>
Date: Tue, 14 May 2024 00:00:00 +0000
Subject: 24.05

---
 CPP/Common/NewHandler.cpp | 50 +++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 46 insertions(+), 4 deletions(-)

(limited to 'CPP/Common/NewHandler.cpp')

diff --git a/CPP/Common/NewHandler.cpp b/CPP/Common/NewHandler.cpp
index c95833e..173b8eb 100644
--- a/CPP/Common/NewHandler.cpp
+++ b/CPP/Common/NewHandler.cpp
@@ -65,6 +65,13 @@ operator new(size_t size)
   return p;
 }
 
+
+#if defined(_MSC_VER) && _MSC_VER == 1600
+// vs2010 has no throw() by default ?
+#pragma warning(push)
+#pragma warning(disable : 4986) // 'operator delete': exception specification does not match previous declaration
+#endif
+
 void
 #ifdef _MSC_VER
 __cdecl
@@ -76,6 +83,27 @@ operator delete(void *p) throw()
   ::free(p);
 }
 
+/* we define operator delete(void *p, size_t n) because
+   vs2022 compiler uses delete(void *p, size_t n), and
+   we want to mix files from different compilers:
+     - old vc6 linker
+     - old vc6 complier
+     - new vs2022 complier
+*/
+void
+#ifdef _MSC_VER
+__cdecl
+#endif
+operator delete(void *p, size_t n) throw()
+{
+  UNUSED_VAR(n)
+  ::free(p);
+}
+
+#if defined(_MSC_VER) && _MSC_VER == 1600
+#pragma warning(pop)
+#endif
+
 /*
 void *
 #ifdef _MSC_VER
@@ -205,11 +233,9 @@ operator delete(void *p) throw()
       a[i] = 0;
   */
   HeapFree(GetProcessHeap(), 0, p);
-  if (numAllocs == 0)
-    numAllocs = numAllocs; // ERROR
+  // if (numAllocs == 0) numAllocs = numAllocs; // ERROR
   numAllocs--;
-  if (numAllocs == 0)
-    numAllocs = numAllocs; // OK: all objects were deleted
+  // if (numAllocs == 0) numAllocs = numAllocs; // OK: all objects were deleted
   printf("Free %d\n", numAllocs);
   LeaveCriticalSection(&cs);
  #else
@@ -219,6 +245,22 @@ operator delete(void *p) throw()
  #endif
 }
 
+void
+#ifdef _MSC_VER
+__cdecl
+#endif
+operator delete(void *p, size_t n) throw();
+void
+#ifdef _MSC_VER
+__cdecl
+#endif
+operator delete(void *p, size_t n) throw()
+{
+  UNUSED_VAR(n)
+  printf("delete_WITH_SIZE=%u, ptr = %p\n", (unsigned)n, p);
+  operator delete(p);
+}
+
 /*
 void *
 #ifdef _MSC_VER
-- 
cgit v1.2.3-55-g6feb