diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-01-05 18:05:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-05 18:05:35 +0100 |
| commit | ba6c23513f708413f218b6f6d97cedca8544f01f (patch) | |
| tree | acac87372429425bd64f5be99b1592c94886bdb4 /TAO/tests | |
| parent | 169c93b6746c3a9591b58cfb7404d14dde3df2f8 (diff) | |
| parent | cff1727443ca4b9c719220cf5cff71ec1fcfe614 (diff) | |
| download | ATCD-ba6c23513f708413f218b6f6d97cedca8544f01f.tar.gz | |
Merge pull request #1383 from jwillemsen/jwi-ACE_LACKS_PLACEMENT_OPERATOR_DELETE
Removed check for ACE_LACKS_PLACEMENT_OPERATOR_DELETE, supported by a…
Diffstat (limited to 'TAO/tests')
| -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); |