CVS wrapper -- version: 1.57 ? mypatch Index: globname.hxx =================================================================== RCS file: /cvs/util/tools/inc/globname.hxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 globname.hxx --- globname.hxx 18 Sep 2000 17:03:01 -0000 1.1.1.1 +++ globname.hxx 8 Nov 2002 09:47:15 -0000 @@ -98,7 +98,7 @@ class SvGlobalNameList; class SvGlobalName { -friend SvGlobalNameList; +friend class SvGlobalNameList; ImpSvGlobalName * pImp; void NewImp(); public: Index: mempool.hxx =================================================================== RCS file: /cvs/util/tools/inc/mempool.hxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 mempool.hxx --- mempool.hxx 18 Sep 2000 17:03:02 -0000 1.1.1.1 +++ mempool.hxx 8 Nov 2002 09:47:16 -0000 @@ -98,10 +98,10 @@ public: \ void* operator new( size_t n ) \ { if ( n == sizeof( class ) ) return (aPool).Alloc(); \ - else return new char[n]; } \ + else return ::operator new(n); } \ void operator delete( void* p, size_t n ) \ { if ( n == sizeof( class ) ) (aPool).Free( p ); \ - else delete p; } + else ::operator delete(p); } #define INIT_FIXEDMEMPOOL_NEWDEL_DLL( class, aPool, InitSize, GrowSize )\ aPool( sizeof( class ), InitSize, GrowSize ) Index: simplecm.hxx =================================================================== RCS file: /cvs/util/tools/inc/simplecm.hxx,v retrieving revision 1.11 diff -u -r1.11 simplecm.hxx --- simplecm.hxx 8 Jan 2002 16:12:15 -0000 1.11 +++ simplecm.hxx 8 Nov 2002 09:47:17 -0000 @@ -183,10 +183,10 @@ class CommunicationLink : public SvRefBase { protected: - friend CommunicationManager; - friend SingleCommunicationManager; - friend MultiCommunicationManager; - friend CommunicationManagerServerAcceptThread; + friend class CommunicationManager; + friend class SingleCommunicationManager; + friend class MultiCommunicationManager; + friend class CommunicationManagerServerAcceptThread; // Darf nicht abgeräumt werden zwischen Empfang des Streams und ende des Callbacks protected: // so daß nur über Ref gelöscht werden kann @@ -275,8 +275,8 @@ class CommonSocketFunctions; class CommunicationManager { - friend CommunicationLink; - friend CommonSocketFunctions; + friend class CommunicationLink; + friend class CommonSocketFunctions; public: CommunicationManager( BOOL bUseMultiChannel = FALSE ); virtual ~CommunicationManager(); @@ -363,7 +363,7 @@ class ICommunicationManagerClient { - friend CommonSocketFunctions; + friend class CommonSocketFunctions; protected: virtual BOOL RetryConnect() { return FALSE; } // Kann dann eventuell die Applikation starten }; Index: unqid.hxx =================================================================== RCS file: /cvs/util/tools/inc/unqid.hxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 unqid.hxx --- unqid.hxx 18 Sep 2000 17:03:03 -0000 1.1.1.1 +++ unqid.hxx 8 Nov 2002 09:47:18 -0000 @@ -89,7 +89,7 @@ class UniqueIdContainer; class UniqueItemId { - friend UniqueIdContainer; + friend class UniqueIdContainer; ImpUniqueId* pId; UniqueItemId( ImpUniqueId * pIdP )