diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-01-05 13:50:32 +0100 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-01-05 13:50:32 +0100 |
commit | cff1727443ca4b9c719220cf5cff71ec1fcfe614 (patch) | |
tree | 39cb760c419c86fb1444a4b33c63c08b4c11eb50 /ACE | |
parent | 78006062ece6be12eba3e81471961c74743ba071 (diff) | |
download | ATCD-cff1727443ca4b9c719220cf5cff71ec1fcfe614.tar.gz |
Removed check for ACE_LACKS_PLACEMENT_OPERATOR_DELETE, supported by all compilers supporting C++11
* ACE/ace/Svc_Handler.cpp:
* ACE/ace/Svc_Handler.h:
* ACE/ace/config-hpux-11.00.h:
* ACE/ace/config-sunos5.5.h:
* ACE/examples/DLL/Newsweek.cpp:
* ACE/examples/DLL/Newsweek.h:
* ACE/examples/DLL/Today.cpp:
* ACE/examples/DLL/Today.h:
* ACE/examples/Shared_Malloc/test_persistence.cpp:
* ACE/tests/DLL_Test_Impl.cpp:
* ACE/tests/DLL_Test_Impl.h:
* ACE/tests/Dynamic_Test.cpp:
* TAO/tests/POA/DSI/Database_i.cpp:
* TAO/tests/POA/DSI/Database_i.h:
Diffstat (limited to 'ACE')
-rw-r--r-- | ACE/ace/Svc_Handler.cpp | 5 | ||||
-rw-r--r-- | ACE/ace/Svc_Handler.h | 4 | ||||
-rw-r--r-- | ACE/ace/config-hpux-11.00.h | 6 | ||||
-rw-r--r-- | ACE/ace/config-sunos5.5.h | 2 | ||||
-rw-r--r-- | ACE/examples/DLL/Newsweek.cpp | 2 | ||||
-rw-r--r-- | ACE/examples/DLL/Newsweek.h | 2 | ||||
-rw-r--r-- | ACE/examples/DLL/Today.cpp | 2 | ||||
-rw-r--r-- | ACE/examples/DLL/Today.h | 2 | ||||
-rw-r--r-- | ACE/examples/Shared_Malloc/test_persistence.cpp | 2 | ||||
-rw-r--r-- | ACE/tests/DLL_Test_Impl.cpp | 2 | ||||
-rw-r--r-- | ACE/tests/DLL_Test_Impl.h | 2 | ||||
-rw-r--r-- | ACE/tests/Dynamic_Test.cpp | 6 |
12 files changed, 0 insertions, 37 deletions
diff --git a/ACE/ace/Svc_Handler.cpp b/ACE/ace/Svc_Handler.cpp index c5779be5420..c5830ed950c 100644 --- a/ACE/ace/Svc_Handler.cpp +++ b/ACE/ace/Svc_Handler.cpp @@ -10,7 +10,6 @@ #include "ace/OS_NS_sys_time.h" #include "ace/Object_Manager.h" #include "ace/Connection_Recycling_Strategy.h" - #include "ace/Dynamic.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -22,14 +21,12 @@ ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::operator new (size_t, void *p) return p; } -#if !defined (ACE_LACKS_PLACEMENT_OPERATOR_DELETE) template <typename PEER_STREAM, typename SYNCH_TRAITS> void ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::operator delete (void *, void *) { ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::operator delete (NOOP, 2 parameters)"); return; } -#endif /* ACE_LACKS_PLACEMENT_OPERATOR_DELETE */ template <typename PEER_STREAM, typename SYNCH_TRAITS> void * ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::operator new (size_t n) @@ -85,7 +82,6 @@ ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::operator new (size_t n, } } -#if !defined (ACE_LACKS_PLACEMENT_OPERATOR_DELETE) template <typename PEER_STREAM, typename SYNCH_TRAITS> void ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::operator delete (void *p, const ACE_nothrow_t&) throw() @@ -93,7 +89,6 @@ ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::operator delete (void *p, ACE_TRACE("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::operator delete(nothrow)"); ::delete [] static_cast <char *> (p); } -#endif /* ACE_LACKS_PLACEMENT_OPERATOR_DELETE */ #endif /* ACE_HAS_NEW_NOTHROW */ diff --git a/ACE/ace/Svc_Handler.h b/ACE/ace/Svc_Handler.h index e1cfef9a878..a02ac24c15a 100644 --- a/ACE/ace/Svc_Handler.h +++ b/ACE/ace/Svc_Handler.h @@ -176,9 +176,7 @@ public: /// itself up correctly whether or not it's allocated statically or /// dynamically. void *operator new (size_t n, const ACE_nothrow_t&) throw(); -#if !defined (ACE_LACKS_PLACEMENT_OPERATOR_DELETE) void operator delete (void *p, const ACE_nothrow_t&) throw (); -#endif /* ACE_LACKS_PLACEMENT_OPERATOR_DELETE */ #endif /// This operator permits "placement new" on a per-object basis. @@ -202,14 +200,12 @@ public: */ void operator delete (void *); -#if !defined (ACE_LACKS_PLACEMENT_OPERATOR_DELETE) /** * This operator is necessary to complement the class-specific * operator new above. Unfortunately, it's not portable to all C++ * compilers... */ void operator delete (void *, void *); -#endif /* ACE_LACKS_PLACEMENT_OPERATOR_DELETE */ /// Close down the descriptor and unregister from the Reactor void shutdown (); diff --git a/ACE/ace/config-hpux-11.00.h b/ACE/ace/config-hpux-11.00.h index 23d754068db..b02d918c4b9 100644 --- a/ACE/ace/config-hpux-11.00.h +++ b/ACE/ace/config-hpux-11.00.h @@ -52,12 +52,6 @@ // Platform lacks streambuf "linebuffered ()". # define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 -// Lack of (and broken) support for placement operator delete is a known -// bug by HP, up until aC++ A.03.55.02. -# if (__HP_aCC < 35502) -# define ACE_LACKS_PLACEMENT_OPERATOR_DELETE -# endif /* __HP_aCC < 35502 */ - // Compiler's 'new' throws exceptions on failure, regardless of whether or // not exception handling is enabled in the compiler options. Fortunately, // new(nothrow_t) is offered. diff --git a/ACE/ace/config-sunos5.5.h b/ACE/ace/config-sunos5.5.h index b738080b32f..9a0c54b585f 100644 --- a/ACE/ace/config-sunos5.5.h +++ b/ACE/ace/config-sunos5.5.h @@ -47,8 +47,6 @@ # define ACE_HAS_THR_C_DEST # endif /* __SUNPRO_CC_COMPAT >= 5 */ # define ACE_HAS_NEW_NOTHROW -# elif (__SUNPRO_CC == 0x420) || (__SUNPRO_CC == 0x410) -# define ACE_LACKS_PLACEMENT_OPERATOR_DELETE # endif /* __SUNPRO_CC >= 0x500 */ # endif /* __SUNPRO_CC >= 0x420 */ diff --git a/ACE/examples/DLL/Newsweek.cpp b/ACE/examples/DLL/Newsweek.cpp index 4de6025b7f0..f93c57acf01 100644 --- a/ACE/examples/DLL/Newsweek.cpp +++ b/ACE/examples/DLL/Newsweek.cpp @@ -24,13 +24,11 @@ Newsweek::operator new (size_t bytes, const ACE_nothrow_t&) { return ::new (ACE_nothrow) char[bytes]; } -#if !defined (ACE_LACKS_PLACEMENT_OPERATOR_DELETE) void Newsweek::operator delete (void *p, const ACE_nothrow_t&) throw () { delete [] static_cast <char *> (p); } -#endif /* ACE_LACKS_PLACEMENT_OPERATOR_DELETE */ #endif void Newsweek::operator delete (void *ptr) diff --git a/ACE/examples/DLL/Newsweek.h b/ACE/examples/DLL/Newsweek.h index 18175311771..32124b6a04c 100644 --- a/ACE/examples/DLL/Newsweek.h +++ b/ACE/examples/DLL/Newsweek.h @@ -44,9 +44,7 @@ public: #if defined (ACE_HAS_NEW_NOTHROW) // Overloaded new operator, nothrow_t variant. void *operator new (size_t bytes, const ACE_nothrow_t&); -#if !defined (ACE_LACKS_PLACEMENT_OPERATOR_DELETE) void operator delete (void *p, const ACE_nothrow_t&) throw (); -#endif /* ACE_LACKS_PLACEMENT_OPERATOR_DELETE */ #endif void operator delete (void *ptr); }; diff --git a/ACE/examples/DLL/Today.cpp b/ACE/examples/DLL/Today.cpp index 522bc6352ec..78dc766ce1f 100644 --- a/ACE/examples/DLL/Today.cpp +++ b/ACE/examples/DLL/Today.cpp @@ -25,13 +25,11 @@ Today::operator new (size_t bytes, const ACE_nothrow_t&) { return ::new (ACE_nothrow) char[bytes]; } -#if !defined (ACE_LACKS_PLACEMENT_OPERATOR_DELETE) void Today::operator delete (void *p, const ACE_nothrow_t&) throw () { delete [] static_cast <char *> (p); } -#endif /* ACE_LACKS_PLACEMENT_OPERATOR_DELETE */ #endif void Today::operator delete (void *ptr) diff --git a/ACE/examples/DLL/Today.h b/ACE/examples/DLL/Today.h index def10393c7f..8a74299420d 100644 --- a/ACE/examples/DLL/Today.h +++ b/ACE/examples/DLL/Today.h @@ -45,9 +45,7 @@ public: #if defined (ACE_HAS_NEW_NOTHROW) // Overloaded new operator, nothrow_t variant. void *operator new (size_t bytes, const ACE_nothrow_t&); -#if !defined (ACE_LACKS_PLACEMENT_OPERATOR_DELETE) void operator delete (void *p, const ACE_nothrow_t&) throw (); -#endif /* ACE_LACKS_PLACEMENT_OPERATOR_DELETE */ #endif void operator delete (void *ptr); }; diff --git a/ACE/examples/Shared_Malloc/test_persistence.cpp b/ACE/examples/Shared_Malloc/test_persistence.cpp index 11d67c806b8..6333a19a01d 100644 --- a/ACE/examples/Shared_Malloc/test_persistence.cpp +++ b/ACE/examples/Shared_Malloc/test_persistence.cpp @@ -64,12 +64,10 @@ public: { return shmem_allocator->malloc (sizeof (Employee)); } -#if !defined (ACE_LACKS_PLACEMENT_OPERATOR_DELETE) void operator delete (void *p, const ACE_nothrow_t&) throw () { shmem_allocator->free (p); } -#endif /* ACE_LACKS_PLACEMENT_OPERATOR_DELETE */ #endif void operator delete (void *pointer) diff --git a/ACE/tests/DLL_Test_Impl.cpp b/ACE/tests/DLL_Test_Impl.cpp index c99cb06fc8c..06b093a852d 100644 --- a/ACE/tests/DLL_Test_Impl.cpp +++ b/ACE/tests/DLL_Test_Impl.cpp @@ -61,14 +61,12 @@ Hello_Impl::operator new (size_t bytes, const ACE_nothrow_t &nt) return ::new (nt) char[bytes]; } -#if !defined (ACE_LACKS_PLACEMENT_OPERATOR_DELETE) void Hello_Impl::operator delete (void *ptr, const ACE_nothrow_t&) throw () { ACE_DEBUG ((LM_INFO, "Hello_Impl::delete\n")); ::delete [] static_cast<char *> (ptr); } -#endif /* ACE_LACKS_PLACEMENT_OPERATOR_DELETE */ #endif /* ACE_HAS_NEW_NOTHROW */ diff --git a/ACE/tests/DLL_Test_Impl.h b/ACE/tests/DLL_Test_Impl.h index 47ae742540a..0ca5c5323d0 100644 --- a/ACE/tests/DLL_Test_Impl.h +++ b/ACE/tests/DLL_Test_Impl.h @@ -53,9 +53,7 @@ public: #if defined (ACE_HAS_NEW_NOTHROW) /// Overloaded new operator, nothrow_t variant. void *operator new (size_t bytes, const ACE_nothrow_t &nt); -#if !defined (ACE_LACKS_PLACEMENT_OPERATOR_DELETE) void operator delete (void *p, const ACE_nothrow_t&) throw (); -#endif /* ACE_LACKS_PLACEMENT_OPERATOR_DELETE */ #endif /* ACE_HAS_NEW_NOTHROW */ void operator delete (void *ptr); diff --git a/ACE/tests/Dynamic_Test.cpp b/ACE/tests/Dynamic_Test.cpp index 8e811e98243..0ffc523544b 100644 --- a/ACE/tests/Dynamic_Test.cpp +++ b/ACE/tests/Dynamic_Test.cpp @@ -26,18 +26,14 @@ public: #if defined (ACE_HAS_NEW_NOTHROW) void *operator new (size_t n, const ACE_nothrow_t&) throw(); -#if !defined (ACE_LACKS_PLACEMENT_OPERATOR_DELETE) void operator delete (void *p, const ACE_nothrow_t&) throw (); -#endif /* ACE_LACKS_PLACEMENT_OPERATOR_DELETE */ #endif void * operator new (size_t n, void *p); void operator delete (void *); -#if !defined (ACE_LACKS_PLACEMENT_OPERATOR_DELETE) void operator delete (void *, void *); -#endif /* ACE_LACKS_PLACEMENT_OPERATOR_DELETE */ /// Have we been dynamically created? bool dynamic_; @@ -92,13 +88,11 @@ A::operator new (size_t n, const ACE_nothrow_t&) throw() } } -#if !defined (ACE_LACKS_PLACEMENT_OPERATOR_DELETE) void A::operator delete (void *p, const ACE_nothrow_t&) throw() { ::delete [] static_cast <char *> (p); } -#endif /* ACE_LACKS_PLACEMENT_OPERATOR_DELETE */ #endif /* ACE_HAS_NEW_NOTHROW */ |