diff options
author | Aki <please@ignore.pl> | 2021-10-03 16:51:12 +0200 |
---|---|---|
committer | Aki <please@ignore.pl> | 2021-10-03 16:51:12 +0200 |
commit | 104248aabf40b692231fccd1adf1a2a494f1589a (patch) | |
tree | 5eee42a18a9688b03b483aff5c2bedffb4fe8a6c /FoundationEx | |
parent | ddd76aa4e1571c8d5965709db5c3cd47a89c9a38 (diff) | |
parent | d2f333bf998691760b8970c2784756d0fa81e820 (diff) | |
download | starshatter-104248aabf40b692231fccd1adf1a2a494f1589a.zip starshatter-104248aabf40b692231fccd1adf1a2a494f1589a.tar.gz starshatter-104248aabf40b692231fccd1adf1a2a494f1589a.tar.bz2 |
Stars45 can now be built under MSYS2/Mingw32
Diffstat (limited to 'FoundationEx')
-rw-r--r-- | FoundationEx/Dictionary.h | 2 | ||||
-rw-r--r-- | FoundationEx/List.h | 2 | ||||
-rw-r--r-- | FoundationEx/MemDebug.cpp | 24 | ||||
-rw-r--r-- | FoundationEx/MemDebug.h | 16 | ||||
-rw-r--r-- | FoundationEx/Text.h | 2 | ||||
-rw-r--r-- | FoundationEx/ThreadSync.h | 2 |
6 files changed, 39 insertions, 9 deletions
diff --git a/FoundationEx/Dictionary.h b/FoundationEx/Dictionary.h index 8a8c49d..cfbaab9 100644 --- a/FoundationEx/Dictionary.h +++ b/FoundationEx/Dictionary.h @@ -121,5 +121,5 @@ public: // +-------------------------------------------------------------------+ #include "Dictionary.inl" -#endif Dictionary_h +#endif // Dictionary_h diff --git a/FoundationEx/List.h b/FoundationEx/List.h index 13a48cd..8f31296 100644 --- a/FoundationEx/List.h +++ b/FoundationEx/List.h @@ -127,5 +127,5 @@ private: }; #include "List.inl" -#endif List_h +#endif // List_h diff --git a/FoundationEx/MemDebug.cpp b/FoundationEx/MemDebug.cpp index 4f3174f..060df5a 100644 --- a/FoundationEx/MemDebug.cpp +++ b/FoundationEx/MemDebug.cpp @@ -89,11 +89,21 @@ void __cdecl operator delete(void* p, const char*, int) #ifndef _DEBUG +void* __cdecl operator new[](unsigned int s, const char*, int) +{ + return ::operator new[](s); +} + void* __cdecl operator new(unsigned int s, const char*, int) { return ::operator new(s); } +void __cdecl operator delete[](void* p, const char*, int) +{ + ::operator delete[](p); +} + void __cdecl operator delete(void* p, const char*, int) { ::operator delete(p); @@ -104,6 +114,11 @@ void __cdecl operator delete(void* p, const char*, int) // No definitions for the following: //void* __cdecl operator new(unsigned int, int, const char*, int) {} +void* __cdecl operator new[](unsigned int s, const char*, int) +{ + return ::operator new[](s); +} + void* __cdecl operator new(unsigned int s, const char* f, int l) { return ::operator new(s, 1, f, l); @@ -114,14 +129,19 @@ void* __cdecl operator new(unsigned int s) return ::operator new(s, 1, __FILE__, __LINE__); } +void __cdecl operator delete[](void* p, const char*, int) +{ + ::operator delete[](p); +} + void __cdecl operator delete(void* p, const char*, int) { ::operator delete(p); } -#endif _DEBUG +#endif // _DEBUG -#endif FOUNDATION_USE_MFC +#endif // FOUNDATION_USE_MFC static void heapdump() { diff --git a/FoundationEx/MemDebug.h b/FoundationEx/MemDebug.h index 0bd63da..bcf217f 100644 --- a/FoundationEx/MemDebug.h +++ b/FoundationEx/MemDebug.h @@ -51,12 +51,16 @@ #ifndef _DEBUG +void* __cdecl operator new[](unsigned int, const char*, int); void* __cdecl operator new(unsigned int s, const char*, int); +void __cdecl operator delete[](void* p, const char*, int); void __cdecl operator delete(void* p, const char*, int); #else +void* __cdecl operator new[](unsigned int, const char*, int); void* __cdecl operator new(unsigned int s, const char*, int); +void __cdecl operator delete[](void* p, const char*, int); void __cdecl operator delete(void* p, const char*, int); #endif @@ -89,24 +93,30 @@ public: #ifndef _DEBUG +void* __cdecl operator new[](unsigned int, const char*, int); void* __cdecl operator new(unsigned int s, const char*, int); +void __cdecl operator delete[](void* p, const char*, int); void __cdecl operator delete(void* p, const char*, int); #else /*_CRTIMP*/ +void* __cdecl operator new[](unsigned int, const char*, int); + void* __cdecl operator new(unsigned int, int, const char*, int); void* __cdecl operator new(unsigned int s, const char* f, int l); void* __cdecl operator new(unsigned int s); +void __cdecl operator delete[](void* p, const char*, int); + void __cdecl operator delete(void* p, const char*, int); -#endif _DEBUG +#endif // _DEBUG // +--------------------------------------------------------------------+ -#endif FOUNDATION_USE_MFC +#endif // FOUNDATION_USE_MFC -#endif MemDebug_h +#endif // MemDebug_h diff --git a/FoundationEx/Text.h b/FoundationEx/Text.h index ee946f8..170eafe 100644 --- a/FoundationEx/Text.h +++ b/FoundationEx/Text.h @@ -214,4 +214,4 @@ inline Text operator+( char* l, const Text& r) { return Text(l) + r; } // +-------------------------------------------------------------------+ -#endif Text_h +#endif // Text_h diff --git a/FoundationEx/ThreadSync.h b/FoundationEx/ThreadSync.h index 7bf66c0..cfe7a4e 100644 --- a/FoundationEx/ThreadSync.h +++ b/FoundationEx/ThreadSync.h @@ -78,4 +78,4 @@ private: ThreadSync& sync; }; -#endif ThreadSync_h +#endif // ThreadSync_h |