diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h index 69dde8b966c..2d18b1678e1 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - // $Id$ #ifndef METRICS_UPCALL_MONITOR_H @@ -24,11 +22,9 @@ #include "orbsvcs/Time_Utilities.h" #include "orbsvcs/MetricsS.h" -#include "orbsvcs/Metrics/Metrics_LocalCache.h" -#include "orbsvcs/Metrics/Metrics_FrameManager.h" -#include "orbsvcs/Metrics/Metrics_Utils.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Metrics_LocalCache.h" +#include "Metrics_FrameManager.h" +#include "Metrics_Utils.h" class TAO_Metrics_Export TAO_Metrics_UpcallMonitor : public POA_Metrics::QoSMonitor @@ -226,16 +222,13 @@ private: // The monitor we're wrapping. }; -TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "orbsvcs/Metrics/Metrics_UpcallMonitor.i" +#include "Metrics_UpcallMonitor.i" #endif /* __ACE_INLINE__ */ #include "orbsvcs/Metrics/Metrics_UpcallMonitor_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - typedef TAO_Metrics_UpcallMonitorAdapter<ACE_SYNCH_MUTEX, ACE_New_Allocator> TAO_METRICS_MONITOR_ADAPTER_TYPE; @@ -256,8 +249,6 @@ typedef TAO_METRICS_MONITOR_ADAPTER_TYPE TAO_METRICS_MONITOR_ADAPTER; typedef TAO_METRICS_MONITOR_SINGLETON_TYPE TAO_METRICS_MONITOR_SINGLETON; #endif -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* ACE_ENABLE_TIMEPROBES & ACE_COMPILE_TIMEPROBES */ #endif /* ACE_METRICS_COLLECTION */ |