From ef9cbef5ceb1a40af6eb81372c0635b537249aad Mon Sep 17 00:00:00 2001 From: parsons Date: Wed, 25 Jun 2008 15:37:09 +0000 Subject: ChangeLogTag: Wed Jun 25 15:35:59 UTC 2008 Jeff Parsons --- TAO/ChangeLog | 15 +++++++++++++++ .../orbsvcs/Notify/MonitorControl/Dynamic_Statistic.h | 4 ++++ .../orbsvcs/Notify/MonitorControl/MonitorManager.h | 4 ++-- .../Notify/MonitorControl/NotificationServiceMonitor_i.h | 4 ++-- .../orbsvcs/Notify/MonitorControl/Timestamp_Monitor.cpp | 4 ++-- .../orbsvcs/Notify/MonitorControl/Timestamp_Monitor.h | 4 ++-- .../Notify/MonitorControlExt/MonitorEventChannel.cpp | 5 +++++ .../Notify/MonitorControlExt/MonitorEventChannel.h | 4 ++++ .../MonitorControlExt/MonitorEventChannelFactory.cpp | 5 +++++ .../Notify/MonitorControlExt/MonitorEventChannelFactory.h | 5 +++++ 10 files changed, 46 insertions(+), 8 deletions(-) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index a152a8b6207..9345736fe53 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,18 @@ +Wed Jun 25 15:35:59 UTC 2008 Jeff Parsons + + * orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.h: + * orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp: + * orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h: + * orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.cpp: + * orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.h: + * orbsvcs/orbsvcs/Notify/MonitorControl/Dynamic_Statistic.h: + * orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h: + * orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.cpp: + * orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.h: + + Added TAO_HAS_MONITOR_FRAMEWORK==1 guards or changed existing ones + from ACE_HAS_MONITOR_FRAMEWORK==1. + Wed Jun 25 14:15:00 UTC 2008 Simon Massey * tests/HandleExhaustion/client.cpp: diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Dynamic_Statistic.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Dynamic_Statistic.h index 95282cd7309..5693509f5c2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Dynamic_Statistic.h +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Dynamic_Statistic.h @@ -7,6 +7,8 @@ #include "ace/Monitor_Base.h" +#if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1) + using namespace ACE_VERSIONED_NAMESPACE_NAME::ACE::Monitor_Control; TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -39,6 +41,8 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL +#endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */ + #include /**/ "ace/post.h" #endif /* DYNAMIC_STATISTIC_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h index 35844982d32..668a353e1ee 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h @@ -7,7 +7,7 @@ #include "ace/Service_Object.h" -#if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1) +#if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1) #include "ace/Task.h" #include "ace/ARGV.h" @@ -68,7 +68,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE_EXPORT(TAO_Notify_MC, TAO_MonitorAndControl) ACE_FACTORY_DECLARE(TAO_Notify_MC, TAO_MonitorAndControl) -#endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */ +#endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.h index 07eca56edf6..b1782f6fd1e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.h @@ -7,7 +7,7 @@ #include "orbsvcs/Notify/MonitorControl/NotificationServiceMCS.h" -#if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1) +#if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1) #include "tao/ORB.h" @@ -89,7 +89,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */ +#endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.cpp index 07af5bfd9f9..58d9cbc65fd 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.cpp @@ -2,7 +2,7 @@ #include "orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.h" -#if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1) +#if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1) TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -13,4 +13,4 @@ Timestamp_Monitor::Timestamp_Monitor (const char *name) TAO_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */ +#endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.h index f776602decf..ca2cffe9c7b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.h +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.h @@ -11,7 +11,7 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1) +#if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1) #include "tao/Versioned_Namespace.h" @@ -29,7 +29,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */ +#endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp index 71e021393f9..7923a67af9e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp @@ -14,6 +14,8 @@ #include "orbsvcs/Notify/ProxyConsumer.h" #include "orbsvcs/Notify/ThreadPool_Task.h" +#if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1) + using namespace ACE_VERSIONED_NAMESPACE_NAME::ACE::Monitor_Control; TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -1249,3 +1251,6 @@ TAO_MonitorEventChannel::destroy_supplier ( } TAO_END_VERSIONED_NAMESPACE_DECL + +#endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */ + diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h index 7851437e7a1..7a08d133b22 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h @@ -17,6 +17,8 @@ #include "orbsvcs/Notify/MonitorControlExt/NotifyMonitoringExtS.h" +#if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1) + ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE @@ -155,6 +157,8 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL +#endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */ + #include /**/ "ace/post.h" #endif /* MONITOREVENTCHANNEL_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.cpp index 342d90350e0..2ed89f0d329 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.cpp @@ -9,6 +9,8 @@ #include "ace/Monitor_Point_Registry.h" +#if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1) + TAO_BEGIN_VERSIONED_NAMESPACE_DECL // ****************************************************************** @@ -377,3 +379,6 @@ TAO_MonitorEventChannelFactory::Unbinder::release (void) } TAO_END_VERSIONED_NAMESPACE_DECL + +#endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */ + diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.h index 312718f1f14..82a2a20f7a4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.h @@ -17,6 +17,8 @@ #include "orbsvcs/Notify/MonitorControl/Timestamp_Monitor.h" #include "orbsvcs/Notify/MonitorControlExt/NotifyMonitoringExtS.h" +#if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1) + using namespace ACE_VERSIONED_NAMESPACE_NAME::ACE::Monitor_Control; TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -86,5 +88,8 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL +#endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */ + #include /**/ "ace/post.h" + #endif /* MONITOREVENTCHANNELFACTORY_H */ -- cgit v1.2.1