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 /ACE/examples | |
| 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 'ACE/examples')
| -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 |
5 files changed, 0 insertions, 10 deletions
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) |