diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-03-22 19:39:54 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-03-22 19:39:54 +0000 |
| commit | a03bc0928993027f9c77a63d40db6276e470352c (patch) | |
| tree | c423deeac6b4c4336e39beb407c7ad3ee1989893 /ACE/ace/Timer_Heap_T.cpp | |
| parent | 9a618d3733b212a4aa3bbf2e96762fec6a832939 (diff) | |
| download | ATCD-a03bc0928993027f9c77a63d40db6276e470352c.tar.gz | |
Thu Mar 22 19:38:02 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'ACE/ace/Timer_Heap_T.cpp')
| -rw-r--r-- | ACE/ace/Timer_Heap_T.cpp | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/ACE/ace/Timer_Heap_T.cpp b/ACE/ace/Timer_Heap_T.cpp index de2926362f8..9570380d145 100644 --- a/ACE/ace/Timer_Heap_T.cpp +++ b/ACE/ace/Timer_Heap_T.cpp @@ -190,13 +190,8 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Heap_T (FUNCTOR *upcall_fun #endif /* ACE_LACKS_NUMERIC_LIMITS */ // Create the heap array. -#if defined (__IBMCPP__) && (__IBMCPP__ >= 400) && defined (_WINDOWS) - ACE_NEW (this->heap_, - ACE_Timer_Node_T<TYPE> *[ACE_DEFAULT_TIMERS]); -#else ACE_NEW (this->heap_, ACE_Timer_Node_T<TYPE> *[this->max_size_]); -#endif /* defined (__IBMCPP__) && (__IBMCPP__ >= 400) && defined (_WINDOWS) */ // Create the parallel array. ACE_NEW (this->timer_ids_, @@ -542,13 +537,9 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::grow_heap (void) ACE_Timer_Node_T<TYPE> **new_heap = 0; -#if defined (__IBMCPP__) && (__IBMCPP__ >= 400) && defined (_WINDOWS) - ACE_NEW (new_heap, - ACE_Timer_Node_T<TYPE> *[1024]); -#else ACE_NEW (new_heap, ACE_Timer_Node_T<TYPE> *[new_size]); -#endif /* defined (__IBMCPP__) && (__IBMCPP__ >= 400) && defined (_WINDOWS) */ + ACE_OS::memcpy (new_heap, this->heap_, this->max_size_ * sizeof *new_heap); @@ -578,13 +569,8 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::grow_heap (void) { // Create a new array with max_size elements to link in to // existing list. -#if defined (__IBMCPP__) && (__IBMCPP__ >= 400) && defined (_WINDOWS) - ACE_NEW (this->preallocated_nodes_, - ACE_Timer_Node_T<TYPE>[88]); -#else ACE_NEW (this->preallocated_nodes_, ACE_Timer_Node_T<TYPE>[this->max_size_]); -#endif /* defined (__IBMCPP__) && (__IBMCPP__ >= 400) && defined (_WINDOWS) */ // Add it to the set for later deletion this->preallocated_node_set_.insert (this->preallocated_nodes_); |