summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2021-01-05 13:50:32 +0100
committerJohnny Willemsen <jwillemsen@remedy.nl>2021-01-05 13:50:32 +0100
commitcff1727443ca4b9c719220cf5cff71ec1fcfe614 (patch)
tree39cb760c419c86fb1444a4b33c63c08b4c11eb50 /TAO
parent78006062ece6be12eba3e81471961c74743ba071 (diff)
downloadATCD-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 'TAO')
-rw-r--r--TAO/tests/POA/DSI/Database_i.cpp2
-rw-r--r--TAO/tests/POA/DSI/Database_i.h2
2 files changed, 0 insertions, 4 deletions
diff --git a/TAO/tests/POA/DSI/Database_i.cpp b/TAO/tests/POA/DSI/Database_i.cpp
index 7dae7d83b32..1f1c34d115e 100644
--- a/TAO/tests/POA/DSI/Database_i.cpp
+++ b/TAO/tests/POA/DSI/Database_i.cpp
@@ -359,13 +359,11 @@ DatabaseImpl::Employee::operator new (size_t size, const ACE_nothrow_t &)
return DATABASE::instance ()->malloc (size);
}
-#if !defined (ACE_LACKS_PLACEMENT_OPERATOR_DELETE)
void
DatabaseImpl::Employee::operator delete (void *ptr, const ACE_nothrow_t&) throw ()
{
DATABASE::instance ()->free (ptr);
}
-#endif /* ACE_LACKS_PLACEMENT_OPERATOR_DELETE */
#endif /* ACE_HAS_NEW_NOTHROW */
diff --git a/TAO/tests/POA/DSI/Database_i.h b/TAO/tests/POA/DSI/Database_i.h
index caa24a15eab..b4da8da23ae 100644
--- a/TAO/tests/POA/DSI/Database_i.h
+++ b/TAO/tests/POA/DSI/Database_i.h
@@ -115,9 +115,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 new (size_t);