From b8961f030853f498468a1960add58c58a94718ae Mon Sep 17 00:00:00 2001 From: ejcoumans Date: Thu, 7 Sep 2006 22:59:57 +0000 Subject: [PATCH] added __cdecl to memory definition, should allow compilation of code with non-cdecl default calling convention --- LinearMath/Memory2.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/LinearMath/Memory2.h b/LinearMath/Memory2.h index cdc8ddcab..287209e47 100644 --- a/LinearMath/Memory2.h +++ b/LinearMath/Memory2.h @@ -20,11 +20,13 @@ #ifdef WIN32 +//added __cdecl, thanks Jack + // default new and delete overrides that guarantee 16 byte alignment and zero allocated memory -void* operator new(size_t sz) throw(); -void* operator new[](size_t sz) throw(); -void operator delete(void* m) throw(); -void operator delete[](void* m) throw(); +void* __cdecl operator new(size_t sz) throw(); +void* __cdecl operator new[](size_t sz) throw(); +void __cdecl operator delete(void* m) throw(); +void __cdecl operator delete[](void* m) throw(); #include