diff options
Diffstat (limited to 'examples/Shared_Malloc/test_persistence.cpp')
| -rw-r--r-- | examples/Shared_Malloc/test_persistence.cpp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/examples/Shared_Malloc/test_persistence.cpp b/examples/Shared_Malloc/test_persistence.cpp index a981cfd6a4f..682ed8a5943 100644 --- a/examples/Shared_Malloc/test_persistence.cpp +++ b/examples/Shared_Malloc/test_persistence.cpp @@ -69,18 +69,9 @@ 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) - { - shmem_allocator->free (pointer); - } + void operator delete (void *pointer) { shmem_allocator->free (pointer); } private: char *name_; @@ -208,7 +199,7 @@ GUI_Handler::insert_employee (const char *name, int GUI_Handler::find_employee (const char *name) { - void *temp = 0; + void *temp; if (shmem_allocator->find (name, temp) == 0) @@ -272,7 +263,7 @@ GUI_Handler::list_employees (void) int GUI_Handler::delete_employee (const char *name) { - void *temp = 0; + void *temp; if (shmem_allocator->unbind (name, temp) == 0) |