aboutsummaryrefslogtreecommitdiff
path: root/CPP/Common/NewHandler.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--CPP/Common/NewHandler.h23
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
66operator new(size_t size); 66operator 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
68void 80void
69#ifdef _MSC_VER 81#ifdef _MSC_VER
70__cdecl 82__cdecl
71#endif 83#endif
72operator delete(void *p) throw(); 84operator delete(void *p) throw();
73 85
86void
87#ifdef _MSC_VER
88__cdecl
89#endif
90operator 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>