diff options
author | Igor Pavlov <87184205+ip7z@users.noreply.github.com> | 2024-05-14 00:00:00 +0000 |
---|---|---|
committer | Igor Pavlov <87184205+ip7z@users.noreply.github.com> | 2024-05-15 23:55:04 +0500 |
commit | fc662341e6f85da78ada0e443f6116b978f79f22 (patch) | |
tree | 1be1cc402a7a9cbc18d4eeea6b141354c2d559e3 /CPP/Common/NewHandler.h | |
parent | 5b39dc76f1bc82f941d5c800ab9f34407a06b53a (diff) | |
download | 7zip-24.05.tar.gz 7zip-24.05.tar.bz2 7zip-24.05.zip |
24.0524.05
Diffstat (limited to 'CPP/Common/NewHandler.h')
-rw-r--r-- | CPP/Common/NewHandler.h | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/CPP/Common/NewHandler.h b/CPP/Common/NewHandler.h index 50f6d0a..5ba64b7 100644 --- a/CPP/Common/NewHandler.h +++ b/CPP/Common/NewHandler.h | |||
@@ -65,12 +65,35 @@ __cdecl | |||
65 | #endif | 65 | #endif |
66 | operator new(size_t size); | 66 | operator new(size_t size); |
67 | 67 | ||
68 | /* | ||
69 | #if 0 && defined(_MSC_VER) && _MSC_VER == 1600 | ||
70 | #define Z7_OPERATOR_DELETE_SPEC_THROW0 | ||
71 | #else | ||
72 | #define Z7_OPERATOR_DELETE_SPEC_THROW0 throw() | ||
73 | #endif | ||
74 | */ | ||
75 | #if defined(_MSC_VER) && _MSC_VER == 1600 | ||
76 | #pragma warning(push) | ||
77 | #pragma warning(disable : 4986) // 'operator delete': exception specification does not match previous declaration | ||
78 | #endif | ||
79 | |||
68 | void | 80 | void |
69 | #ifdef _MSC_VER | 81 | #ifdef _MSC_VER |
70 | __cdecl | 82 | __cdecl |
71 | #endif | 83 | #endif |
72 | operator delete(void *p) throw(); | 84 | operator delete(void *p) throw(); |
73 | 85 | ||
86 | void | ||
87 | #ifdef _MSC_VER | ||
88 | __cdecl | ||
89 | #endif | ||
90 | operator delete(void *p, size_t n) throw(); | ||
91 | |||
92 | #if defined(_MSC_VER) && _MSC_VER == 1600 | ||
93 | #pragma warning(pop) | ||
94 | #endif | ||
95 | |||
96 | |||
74 | #else | 97 | #else |
75 | 98 | ||
76 | #include <new> | 99 | #include <new> |