From aa8f4373e0c9614b7d64a5760c0fa071b1c1edc9 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 21 Jul 2012 11:11:20 +0000 Subject: - MZeroedObject used instead of the operator new() inlining - SAFE_DELETE of local objects removed from ICQ git-svn-id: http://svn.miranda-ng.org/main/trunk@1092 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/IRCG/irc.h | 13 +------------ protocols/IRCG/irclib.h | 2 +- 2 files changed, 2 insertions(+), 13 deletions(-) (limited to 'protocols/IRCG') diff --git a/protocols/IRCG/irc.h b/protocols/IRCG/irc.h index 4580243385..3c4f10ec4f 100644 --- a/protocols/IRCG/irc.h +++ b/protocols/IRCG/irc.h @@ -104,17 +104,6 @@ struct CIrcProto; #include "mstring.h" typedef CMStringA String; -class CCallocBase -{ -public: - __inline void* operator new( size_t size ) - { return ::calloc( 1, size ); - } - __inline void operator delete( void* p ) - { ::free( p ); - } -}; - // special service for tweaking performance, implemented in chat.dll #define MS_GC_GETEVENTPTR "GChat/GetNewEventPtr" typedef int (*GETEVENTFUNC)(WPARAM wParam, LPARAM lParam); @@ -226,7 +215,7 @@ struct CIrcHandler PfnIrcMessageHandler m_handler; }; -struct CIrcProto : public PROTO_INTERFACE, public CCallocBase +struct CIrcProto : public PROTO_INTERFACE, public MZeroedObject { CIrcProto( const char*, const TCHAR* ); ~CIrcProto(); diff --git a/protocols/IRCG/irclib.h b/protocols/IRCG/irclib.h index c47172d2ab..7dcb5a4c01 100644 --- a/protocols/IRCG/irclib.h +++ b/protocols/IRCG/irclib.h @@ -33,7 +33,7 @@ char* ConvertIntegerToIP(unsigned long int_ip_addr); namespace irc { //////////////////////////////////////////////////////////////////// -struct DCCINFO : public CCallocBase +struct DCCINFO : public MZeroedObject { DWORD dwAdr; unsigned __int64 dwSize; -- cgit v1.2.3