From 4684c1c4b0e882f5272a4a146162c929f0198140 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Thu, 16 Dec 2004 16:52:42 +0000
Subject: ChangeLogTag: Thu Dec 16 16:51:12 UTC 2004  Johnny Willemsen 
 <jwillemsen@remedy.nl>

---
 ace/Timeprobe_T.cpp      | 21 +--------------------
 tests/Timeprobe_Test.cpp |  3 ++-
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/ace/Timeprobe_T.cpp b/ace/Timeprobe_T.cpp
index 0a122c1a808..bde2c1736dc 100644
--- a/ace/Timeprobe_T.cpp
+++ b/ace/Timeprobe_T.cpp
@@ -72,17 +72,10 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::ACE_Timeprobe_Ex (const ACE_Timeprobe_Ex<
 template <class ACE_LOCK, class ALLOCATOR>
 ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::~ACE_Timeprobe_Ex (void)
 {
-#if defined (ACE_HAS_BROKEN_DES_ARRAY_FREE)
-  ACE_DES_ARRAY_FREE ( (this->timeprobes_),
-                      this->max_size_,
-                      this->allocator ()->free,
-                      ACE_timeprobe_t);
-#else
   ACE_DES_ARRAY_FREE ((ACE_timeprobe_t *) (this->timeprobes_),
                       this->max_size_,
                       this->allocator ()->free,
                       ACE_timeprobe_t);
-#endif
 }
 
 template <class ACE_LOCK, class ALLOCATOR> void
@@ -158,22 +151,10 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::increase_size (u_long size)
          // Iterates over the array explicitly calling the destructor for
          // each probe instance, then deallocates the memory
 
-         // There is a compiler bug for VxWorks (gcc version 2.96-PentiumIII-991112 Tornado 2)
-         // which cannot handle the cast for timeprobes_addr()
-#if defined (ACE_HAS_BROKEN_DES_ARRAY_FREE)
-         ACE_DES_ARRAY_FREE (
-                             (this->timeprobes_),
+         ACE_DES_ARRAY_FREE ((ACE_timeprobe_t *)(this->timeprobes_),
                              this->max_size_,
                              this->allocator ()->free,
                              ACE_timeprobe_t);
-#else
-         ACE_DES_ARRAY_FREE ((ACE_timeprobe_t *)
-                             (this->timeprobes_),
-                             this->max_size_,
-                             this->allocator ()->free,
-                             ACE_timeprobe_t);
-#endif
-
       }
       this->timeprobes_ = temp;
       this->max_size_ = size;
diff --git a/tests/Timeprobe_Test.cpp b/tests/Timeprobe_Test.cpp
index 0fac4b94c72..2ec6c5c597c 100644
--- a/tests/Timeprobe_Test.cpp
+++ b/tests/Timeprobe_Test.cpp
@@ -21,11 +21,12 @@
 //#define ACE_TSS_TIMEPROBES
 
 #include "tests/test_config.h"
-#include "ace/Timeprobe.h"
 #include "ace/Singleton.h"
 #include "ace/Synch_Traits.h"
 #include "ace/Recursive_Thread_Mutex.h"
+#include "ace/Null_Mutex.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Timeprobe.h"
 
 ACE_RCSID(tests, Timeprobe_Test, "$Id$")
 
-- 
cgit v1.2.1