diff options
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/tests/POA/DSI/Database_i.cpp | 2 | ||||
| -rw-r--r-- | TAO/tests/POA/DSI/Database_i.h | 2 |
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); |