From 309d3544ca7ab144fa5c60f1cf83b38f17d070b7 Mon Sep 17 00:00:00 2001 From: Aki Date: Sat, 2 Oct 2021 00:32:11 +0200 Subject: Streamlined file and guard endings in Foundation and NetEx --- FoundationEx/Dictionary.h | 2 +- FoundationEx/List.h | 2 +- FoundationEx/MemDebug.cpp | 4 ++-- FoundationEx/MemDebug.h | 6 +++--- FoundationEx/Text.h | 2 +- FoundationEx/ThreadSync.h | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) (limited to 'FoundationEx') 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..2a02a2e 100644 --- a/FoundationEx/MemDebug.cpp +++ b/FoundationEx/MemDebug.cpp @@ -119,9 +119,9 @@ 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..f8ca60e 100644 --- a/FoundationEx/MemDebug.h +++ b/FoundationEx/MemDebug.h @@ -102,11 +102,11 @@ void* __cdecl operator new(unsigned int s); 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 -- cgit v1.1 From 5f5aa47b4260d4e688acdd85558baedfc99da752 Mon Sep 17 00:00:00 2001 From: Aki Date: Sat, 2 Oct 2021 13:41:10 +0200 Subject: Added missing new[] debug overload --- FoundationEx/MemDebug.cpp | 20 ++++++++++++++++++++ FoundationEx/MemDebug.h | 10 ++++++++++ 2 files changed, 30 insertions(+) (limited to 'FoundationEx') diff --git a/FoundationEx/MemDebug.cpp b/FoundationEx/MemDebug.cpp index 2a02a2e..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,6 +129,11 @@ 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); diff --git a/FoundationEx/MemDebug.h b/FoundationEx/MemDebug.h index f8ca60e..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,17 +93,23 @@ 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 -- cgit v1.1