diff options
Diffstat (limited to 'ace/Metrics_Cache_T.cpp')
| -rw-r--r-- | ace/Metrics_Cache_T.cpp | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/ace/Metrics_Cache_T.cpp b/ace/Metrics_Cache_T.cpp index 3868df80269..de520773da7 100644 --- a/ace/Metrics_Cache_T.cpp +++ b/ace/Metrics_Cache_T.cpp @@ -1,19 +1,14 @@ // $Id$ -#ifndef ACE_METRICS_CACHE_CPP -#define ACE_METRICS_CACHE_CPP +#ifndef METRICS_CACHE_CPP +#define METRICS_CACHE_CPP //#define ACE_BUILD_DLL -#include "ace/Metrics_Cache_T.h" - #if defined (ACE_COMPILE_TIMEPROBES) #include "ace/Metrics_Cache.h" - -#if !defined (__ACE_INLINE__) -#include "ace/Metrics_Cache_T.inl" -#endif /* __ACE_INLINE__ */ +#include "ace/Metrics_Cache_T.h" // Const strings for timeprobe event type descriptions. @@ -25,7 +20,6 @@ static const char * event_description_strings [] = "resume" }; -ACE_BEGIN_VERSIONED_NAMESPACE_DECL ///////////////////////////////// // class ACE_Metrics_Timeprobe // @@ -64,8 +58,8 @@ ACE_Metrics_Timeprobe (ALLOCATOR *alloc, const char *name, u_long size) : - ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR> (size), - id_ (id), + ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR> (size), + id_ (id), name_ (0) { if (name == 0) @@ -101,11 +95,11 @@ ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::~ACE_Metrics_Timeprobe () template <class ACE_LOCK, class ALLOCATOR> int ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::is_event (const ACE_Metrics_Timeprobe<ACE_LOCK, - ALLOCATOR>:: - ACE_METRICS_TIMEPROBE_DATA_TYPE &t, + ALLOCATOR>:: + ACE_METRICS_TIMEPROBE_DATA_TYPE &t, ACE_Metrics_Timeprobe<ACE_LOCK, - ALLOCATOR>:: - event_id id) + ALLOCATOR>:: + event_id id) { return (t.event_.event_number_ == (u_long) id) ? 1 : 0; } @@ -232,8 +226,16 @@ flush_ACE_Metrics_Cache () { } -ACE_END_VERSIONED_NAMESPACE_DECL + +#if !defined (__ACE_INLINE__) +#include "ace/Metrics_Cache_T.inl" +#endif /* __ACE_INLINE__ */ #endif /* defined (ACE_COMPILE_TIMEPROBES) */ -#endif /* ACE_METRICS_CACHE_CPP */ +#endif /* METRICS_CACHE_CPP */ + + + + + |