ChangeLogTag: Tue Jul 15 17:29:22 UTC 2008 Jeff Parsons <j.parsons@vanderbilt.edu>

7 files changed, 15 insertions, 13 deletions

diff --git a/ACE/examples/Monitor/Bytes_Sent/bytes_sent.cpp b/ACE/examples/Monitor/Bytes_Sent/bytes_sent.cpp
index 90c9c251b6c..553f88e619d 100644
--- a/ACE/examples/Monitor/Bytes_Sent/bytes_sent.cpp
+++ b/ACE/examples/Monitor/Bytes_Sent/bytes_sent.cpp
@@ -34,7 +34,7 @@ public:
           {
             ACE_OS::sleep (2);
 
-            Monitor_Control_Types::Data data;
+            Monitor_Control_Types::Data data (bytes_monitor->type ());
             bytes_monitor->retrieve (data);
             MC_Test_Utilities::display_bytes_sent (data);
           }
diff --git a/ACE/examples/Monitor/CPU_Load/cpu_load.cpp b/ACE/examples/Monitor/CPU_Load/cpu_load.cpp
index 5cb589f5289..a1c321df8dc 100644
--- a/ACE/examples/Monitor/CPU_Load/cpu_load.cpp
+++ b/ACE/examples/Monitor/CPU_Load/cpu_load.cpp
@@ -32,7 +32,7 @@ public:
           {
             ACE_OS::sleep (2);
 
-            Monitor_Control_Types::Data data;
+            Monitor_Control_Types::Data data (cpu_monitor->type ());
             cpu_monitor->retrieve (data);
             MC_Test_Utilities::display_cpu_load (data);
           }
diff --git a/ACE/examples/Monitor/Constraint/constraint.cpp b/ACE/examples/Monitor/Constraint/constraint.cpp
index 5d66e8f6992..d3e7d5a5ffa 100644
--- a/ACE/examples/Monitor/Constraint/constraint.cpp
+++ b/ACE/examples/Monitor/Constraint/constraint.cpp
@@ -54,7 +54,7 @@ public:
           {
             ACE_OS::sleep (2);
 
-            Monitor_Control_Types::Data data;
+            Monitor_Control_Types::Data data (bytes_monitor->type ());
             bytes_monitor->retrieve (data);
             MC_Test_Utilities::display_bytes_received (data);
           }
diff --git a/ACE/examples/Monitor/Group/group.cpp b/ACE/examples/Monitor/Group/group.cpp
index 70ac9ec27d3..5f34bd8ec62 100644
--- a/ACE/examples/Monitor/Group/group.cpp
+++ b/ACE/examples/Monitor/Group/group.cpp
@@ -40,15 +40,17 @@ public:
       {
         ACE_OS::sleep (2);
 
-        Monitor_Control_Types::Data data;
-        cpu_monitor->retrieve (data);
-        MC_Test_Utilities::display_cpu_load (data);
+        Monitor_Control_Types::Data cpu_data (cpu_monitor->type ());
+        cpu_monitor->retrieve (cpu_data);
+        MC_Test_Utilities::display_cpu_load (cpu_data);
 
-        memory_monitor->retrieve (data);
-        MC_Test_Utilities::display_memory_usage (data);
+        Monitor_Control_Types::Data mem_data (memory_monitor->type ());
+        memory_monitor->retrieve (mem_data);
+        MC_Test_Utilities::display_memory_usage (mem_data);
 
-        bytes_monitor->retrieve (data);
-        MC_Test_Utilities::display_bytes_sent (data);
+        Monitor_Control_Types::Data bytes_data (bytes_monitor->type ());
+        bytes_monitor->retrieve (bytes_data);
+        MC_Test_Utilities::display_bytes_sent (bytes_data);
 
         cout << endl;
       }
diff --git a/ACE/examples/Monitor/Memory_Usage/memory_usage.cpp b/ACE/examples/Monitor/Memory_Usage/memory_usage.cpp
index a9c275728ba..ed0e354000d 100644
--- a/ACE/examples/Monitor/Memory_Usage/memory_usage.cpp
+++ b/ACE/examples/Monitor/Memory_Usage/memory_usage.cpp
@@ -32,7 +32,7 @@ public:
           {
             ACE_OS::sleep (2);
 
-            Monitor_Control_Types::Data data;
+            Monitor_Control_Types::Data data (memory_monitor->type ());
             memory_monitor->retrieve (data);
             MC_Test_Utilities::display_memory_usage (data);
           }
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 af9a9b02cd5..1d23ce1e951 100644
--- a/ACE/examples/Monitor/Message_Queue_Size/message_queue_size.cpp
+++ b/ACE/examples/Monitor/Message_Queue_Size/message_queue_size.cpp
@@ -50,7 +50,7 @@ public:
           {
             ACE_OS::sleep (1);
 
-            Monitor_Control_Types::Data data;
+            Monitor_Control_Types::Data data (mq_monitor->type ());
             mq_monitor->retrieve (data);
             MC_Test_Utilities::display_mq_size (data);
           }
diff --git a/ACE/examples/Monitor/Num_Threads/num_threads.cpp b/ACE/examples/Monitor/Num_Threads/num_threads.cpp
index 9f568e4a491..35512965832 100644
--- a/ACE/examples/Monitor/Num_Threads/num_threads.cpp
+++ b/ACE/examples/Monitor/Num_Threads/num_threads.cpp
@@ -42,7 +42,7 @@ public:
           {
             ACE_OS::sleep (2);
 
-            Monitor_Control_Types::Data data;
+            Monitor_Control_Types::Data data (thread_monitor->type ());
             thread_monitor->retrieve (data);
             MC_Test_Utilities::display_num_threads (data);
           }