Fixed compiler warnings about unused variable

3 files changed, 10 insertions, 11 deletions

diff --git a/ace/Metrics_Cache.h b/ace/Metrics_Cache.h
index f57828a6cb5..94e96be0125 100644
--- a/ace/Metrics_Cache.h
+++ b/ace/Metrics_Cache.h
@@ -32,7 +32,7 @@
 #  define REGISTER_METRICS_PROBE_RETURN(METRICS_PTR,METRICS_REGION,PROBE_NAME,PROBE_TYPE,METRICS_HANDLE) \
 do { if((METRICS_PTR->metrics_enabled())) { \
 METRICS_HANDLE = METRICS_PTR-> \
-register_##METRICS_REGION## ( \
+register_##METRICS_REGION ( \
 PROBE_NAME, \
 PROBE_TYPE); \
 } } while (0)
@@ -112,5 +112,3 @@ METRICS_PTR->report_##NAME##_stop(); \
 #endif /* ACE_COMPILE_TIMEPROBES */
 
 #endif /* ACE_METRICS_CACHE_H */
-
-
diff --git a/ace/Metrics_Cache_T.cpp b/ace/Metrics_Cache_T.cpp
index ed32042a1b3..e442617a853 100644
--- a/ace/Metrics_Cache_T.cpp
+++ b/ace/Metrics_Cache_T.cpp
@@ -18,7 +18,7 @@
 
 // Const strings for timeprobe event type descriptions.
 
-static const char * event_description_strings [] = 
+static const char * event_description_strings [] =
 {
   "start",
   "stop",
@@ -63,7 +63,7 @@ ACE_Metrics_Timeprobe (ALLOCATOR *alloc,
                        u_int id,
                        const char *name,
                        u_long size)
-  : 
+  :
 	ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR> (size),
 		id_ (id),
     name_ (0)
@@ -75,7 +75,8 @@ ACE_Metrics_Timeprobe (ALLOCATOR *alloc,
 
   char * name_tmp;
   ACE_NEW_MALLOC_ARRAY (name_tmp,
-                        (char *) this->allocator ()->malloc (strlen(name)+1),
+//                        (char *) this->allocator ()->malloc (strlen(name)+1),
+                        (char *) alloc->malloc(strlen(name)+1),
                         char,
                         strlen(name)+1);
   ACE_OS::memcpy (name_tmp, name, strlen (name)+1);
@@ -111,7 +112,7 @@ ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::is_event (const ACE_Metrics_Timeprob
 
 template <class ACE_LOCK, class ALLOCATOR>
 const char *
-ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::probe_name (void) 
+ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::probe_name (void)
 {
    return name_;
 }
diff --git a/ace/Metrics_Cache_T.h b/ace/Metrics_Cache_T.h
index 02dd264a834..09ab0a0000c 100644
--- a/ace/Metrics_Cache_T.h
+++ b/ace/Metrics_Cache_T.h
@@ -23,7 +23,7 @@
 
 template <class ACE_LOCK, class ALLOCATOR>
 class ACE_Metrics_Timeprobe :
-  public ACE_Timeprobe<ACE_LOCK>
+  public ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>
   {
   // = TITLE
   //   This class implements a timeprobe for use in a Metrics framework.
@@ -94,7 +94,7 @@ private:
   ACE_Metrics_Timeprobe (const ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR> &);
   void operator =(const ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR> &);
 };
- 
+
 
 template <class ACE_LOCK, class ALLOCATOR>
 class ACE_Metrics_Cache
@@ -114,7 +114,7 @@ public:
                      u_long number_of_probes
                        = METRICS_DEFAULT_TIMEPROBE_COUNT,
                      ALLOCATOR * allocatorPtr = 0);
-  // Default constructor. 
+  // Default constructor.
 
   ~ACE_Metrics_Cache ();
   // Destructor.
@@ -199,7 +199,7 @@ protected:
   // Indicator of whether metrics is enabled.
 
 private:
- 
+
   ALLOCATOR* allocator_;
   // Allocation strategy object.