Wed May 14 11:03:15 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

8 files changed, 11 insertions, 11 deletions

diff --git a/ACE/examples/Monitor/Bytes_Sent/bytes_sent.cpp b/ACE/examples/Monitor/Bytes_Sent/bytes_sent.cpp
index e431f842369..8fa09d508b9 100644
--- a/ACE/examples/Monitor/Bytes_Sent/bytes_sent.cpp
+++ b/ACE/examples/Monitor/Bytes_Sent/bytes_sent.cpp
@@ -8,7 +8,7 @@
 
 #if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1)
 
-using namespace ACE_VERSIONED_NAMESPACE_NAME::ACE::MonitorControl;
+using namespace ACE_VERSIONED_NAMESPACE_NAME::ACE::Monitor_Control;
 
 /// Subclass of ACE_Task_Base, meaning that the override of
 /// the svc() method below will run in a new thread when
diff --git a/ACE/examples/Monitor/CPU_Load/cpu_load.cpp b/ACE/examples/Monitor/CPU_Load/cpu_load.cpp
index aa6f0e39116..e5f85b2bafe 100644
--- a/ACE/examples/Monitor/CPU_Load/cpu_load.cpp
+++ b/ACE/examples/Monitor/CPU_Load/cpu_load.cpp
@@ -21,7 +21,7 @@ public:
       ACE_Dynamic_Service<MC_ADMINMANAGER>::instance ("MC_ADMINMANAGER");
 
     /// Call on the administrator class to look up the desired monitors.
-    ACE::MonitorControl::Monitor_Base *cpu_monitor =
+    ACE::Monitor_Control::Monitor_Base *cpu_monitor =
       mgr->admin ().monitor_point ("OS/Processor/CPULoad");
 
     if (cpu_monitor != 0)
diff --git a/ACE/examples/Monitor/Constraint/constraint.cpp b/ACE/examples/Monitor/Constraint/constraint.cpp
index 8ec24ee63bf..80e0b2df532 100644
--- a/ACE/examples/Monitor/Constraint/constraint.cpp
+++ b/ACE/examples/Monitor/Constraint/constraint.cpp
@@ -9,7 +9,7 @@
 
 #if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1)
 
-using namespace ACE_VERSIONED_NAMESPACE_NAME::ACE::MonitorControl;
+using namespace ACE_VERSIONED_NAMESPACE_NAME::ACE::Monitor_Control;
 
 /// Two control actions that will be associated with two different
 /// constraints on the same monitor.
diff --git a/ACE/examples/Monitor/Group/group.cpp b/ACE/examples/Monitor/Group/group.cpp
index 68a108f3a6a..bd86d2a6eaf 100644
--- a/ACE/examples/Monitor/Group/group.cpp
+++ b/ACE/examples/Monitor/Group/group.cpp
@@ -11,7 +11,7 @@
 
 #if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1)
 
-using namespace ACE_VERSIONED_NAMESPACE_NAME::ACE::MonitorControl;
+using namespace ACE_VERSIONED_NAMESPACE_NAME::ACE::Monitor_Control;
 
 /// Subclass of ACE_Task_Base, meaning that the override of
 /// the svc() method below will run in a new thread when
@@ -25,13 +25,13 @@ public:
     MC_ADMINMANAGER* mgr =
       ACE_Dynamic_Service<Monitor_Admin_Manager>::instance ("MC_ADMINMANAGER");
 
-    ACE::MonitorControl::Monitor_Base *cpu_monitor =
+    ACE::Monitor_Control::Monitor_Base *cpu_monitor =
       mgr->admin ().monitor_point ("OS/Processor/CPULoad");
 
-    ACE::MonitorControl::Monitor_Base *memory_monitor =
+    ACE::Monitor_Control::Monitor_Base *memory_monitor =
       mgr->admin ().monitor_point ("OS/Memory/TotalUsage");
 
-    ACE::MonitorControl::Monitor_Base *bytes_monitor =
+    ACE::Monitor_Control::Monitor_Base *bytes_monitor =
       mgr->admin ().monitor_point ("OS/Network/BytesSent");
 
     /// Query the monitor for its data every 2 seconds, and call the
diff --git a/ACE/examples/Monitor/MC_Test_Utilities.h b/ACE/examples/Monitor/MC_Test_Utilities.h
index 9898af09daf..76b29215419 100644
--- a/ACE/examples/Monitor/MC_Test_Utilities.h
+++ b/ACE/examples/Monitor/MC_Test_Utilities.h
@@ -25,7 +25,7 @@
 
 #if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1)
 
-using namespace ACE_VERSIONED_NAMESPACE_NAME::ACE::MonitorControl;
+using namespace ACE_VERSIONED_NAMESPACE_NAME::ACE::Monitor_Control;
 
 #endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */
 
diff --git a/ACE/examples/Monitor/Memory_Usage/memory_usage.cpp b/ACE/examples/Monitor/Memory_Usage/memory_usage.cpp
index f39eeabe5e3..89c9ec5b310 100644
--- a/ACE/examples/Monitor/Memory_Usage/memory_usage.cpp
+++ b/ACE/examples/Monitor/Memory_Usage/memory_usage.cpp
@@ -21,7 +21,7 @@ public:
       ACE_Dynamic_Service<MC_ADMINMANAGER>::instance ("MC_ADMINMANAGER");
 
     /// Call on the administrator class to look up the desired monitors.
-    ACE::MonitorControl::Monitor_Base *memory_monitor =
+    ACE::Monitor_Control::Monitor_Base *memory_monitor =
       mgr->admin ().monitor_point ("OS/Memory/TotalUsage");
 
     if (memory_monitor != 0)
diff --git a/ACE/examples/Monitor/Message_Queue_Size/message_queue_size.cpp b/ACE/examples/Monitor/Message_Queue_Size/message_queue_size.cpp
index b418a723d31..1b018e5f5d1 100644
--- a/ACE/examples/Monitor/Message_Queue_Size/message_queue_size.cpp
+++ b/ACE/examples/Monitor/Message_Queue_Size/message_queue_size.cpp
@@ -37,7 +37,7 @@ public:
       ACE_Dynamic_Service<MC_ADMINMANAGER>::instance ("MC_ADMINMANAGER");
 
     /// Call on the administrator class to look up the desired monitors.
-    ACE::MonitorControl::Monitor_Base *mq_monitor =
+    ACE::Monitor_Control::Monitor_Base *mq_monitor =
       mgr->admin ().monitor_point (name_str.c_str ());
 
     if (mq_monitor != 0)
diff --git a/ACE/examples/Monitor/Num_Threads/num_threads.cpp b/ACE/examples/Monitor/Num_Threads/num_threads.cpp
index aecbe21c4f5..a8806fab05d 100644
--- a/ACE/examples/Monitor/Num_Threads/num_threads.cpp
+++ b/ACE/examples/Monitor/Num_Threads/num_threads.cpp
@@ -28,7 +28,7 @@ public:
       ACE_Dynamic_Service<MC_ADMINMANAGER>::instance ("MC_ADMINMANAGER");
 
     /// Call on the administrator class to look up the desired monitors.
-    ACE::MonitorControl::Monitor_Base *thread_monitor =
+    ACE::Monitor_Control::Monitor_Base *thread_monitor =
       mgr->admin ().monitor_point ("OS/System/NumThreads");
 
     if (thread_monitor != 0)