diff options
Diffstat (limited to 'ace/Svc_Handler.cpp')
| -rw-r--r-- | ace/Svc_Handler.cpp | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/ace/Svc_Handler.cpp b/ace/Svc_Handler.cpp index a1cb000c58a..2fb990a9064 100644 --- a/ace/Svc_Handler.cpp +++ b/ace/Svc_Handler.cpp @@ -1,7 +1,7 @@ // $Id$ -#ifndef ACE_SVC_HANDLER_CPP -#define ACE_SVC_HANDLER_CPP +#ifndef ACE_SVC_HANDLER_C +#define ACE_SVC_HANDLER_C #include "ace/Svc_Handler.h" @@ -15,11 +15,11 @@ #include "ace/Dynamic.h" +ACE_RCSID(ace, Svc_Handler, "$Id$") + #define PR_ST_1 ACE_PEER_STREAM_1 #define PR_ST_2 ACE_PEER_STREAM_2 -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - template <PR_ST_1, ACE_SYNCH_DECL> void * ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator new (size_t, void *p) @@ -91,18 +91,6 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator new (size_t n, return ::new(ACE_nothrow) char[n]; } } - -#if !defined (ACE_LACKS_PLACEMENT_OPERATOR_DELETE) -template <PR_ST_1, ACE_SYNCH_DECL> void -ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator delete (void *p, - const ACE_nothrow_t&) throw() -{ - ACE_TRACE - ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator delete(nothrow)"); - ::delete [] static_cast <char *> (p); -} -#endif /* ACE_LACKS_PLACEMENT_OPERATOR_DELETE */ - #endif /* ACE_HAS_NEW_NOTHROW */ template <PR_ST_1, ACE_SYNCH_DECL> void @@ -127,7 +115,8 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator delete (void *obj) // You cannot delete a 'void*' (X3J16/95-0087 5.3.5.3), but we know // the pointer was created using new char[] (see operator new code), // so we use a cast: - ::delete [] static_cast <char *> (obj); + char *tmp = (char *) obj; + ::delete [] tmp; } // Default constructor. @@ -520,8 +509,6 @@ ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::handle_timeout (const ACE_Time return 0; } -ACE_END_VERSIONED_NAMESPACE_DECL - #undef PR_ST_1 #undef PR_ST_2 -#endif /* ACE_SVC_HANDLER_CPP */ +#endif /* ACE_SVC_HANDLER_C */ |