ChangeLogTag: Mon Oct 4 12:52:21 2004 Chad Elliott <elliott_c@ociweb.com>

3 files changed, 36 insertions, 28 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index b250fa88053..4e3d85eeec4 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,36 +1,44 @@
+Mon Oct  4 12:52:21 2004  Chad Elliott  <elliott_c@ociweb.com>
+
+        * orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h:
+        * orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp:
+
+          Prefixed Task class with MTD_ to avoid name collisions with
+          Integrity system header files.
+
 Mon Oct  4 12:32:05 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
- 	* tao/Transport_Cache_Manager.cpp:
-	 
-	  Use the ORBConnectionCacheMax value within the transport cache
-	  manager. Added an extra check to disallow setting the value to
-	  0. Thanks to Vladislav Zverev <vladislav at gtss dot spb dot ru>
-	  for reporting the problem.
-	
-	* tao/default_resource.cpp:
+        * tao/Transport_Cache_Manager.cpp:
 
-	  Cosmetic fix. 
+          Use the ORBConnectionCacheMax value within the transport cache
+          manager. Added an extra check to disallow setting the value to
+          0. Thanks to Vladislav Zverev <vladislav at gtss dot spb dot ru>
+          for reporting the problem.
+
+        * tao/default_resource.cpp:
+
+          Cosmetic fix.
 
 Mon Oct  4 11:59:43 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
- 	* orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp:
-	* orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h:
 
-	  Replicated the changes mentioned below to the above wait
-	  strategy. 
+          Replicated the changes mentioned below to the above wait
+          strategy.
 
 Sun Oct  3 20:24:51 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-	* tao/Wait_On_Leader_Follower.cpp:
-	* tao/Wait_On_Leader_Follower.h:
-	* tao/Wait_On_Reactor.cpp:
-	* tao/Wait_On_Reactor.h:
-	* tao/Wait_On_Read.cpp:
-	* tao/Wait_On_Read.h:
-	* tao/Wait_Strategy.h:
+        * tao/Wait_On_Leader_Follower.cpp:
+        * tao/Wait_On_Leader_Follower.h:
+        * tao/Wait_On_Reactor.cpp:
+        * tao/Wait_On_Reactor.h:
+        * tao/Wait_On_Read.cpp:
+        * tao/Wait_On_Read.h:
+        * tao/Wait_Strategy.h:
 
-	  Changed the method non_blocking () to return a boolean and
-	  improved its const correctness.
+          Changed the method non_blocking () to return a boolean and
+          improved its const correctness.
 
 Sun Oct  3 19:28:08 2004  Olli Savia  <ops@iki.fi>
 
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
index cb87203f303..e6237a44469 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
@@ -98,7 +98,7 @@ run_test (PortableServer::POA_ptr poa,
     ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  Task task (event_channel.in (), use_callbacks);
+  MTD_Task task (event_channel.in (), use_callbacks);
 
   if (task.activate (THR_BOUND|THR_NEW_LWP, 1) != 0)
     {
@@ -115,7 +115,7 @@ run_test (PortableServer::POA_ptr poa,
   ACE_CHECK;
 }
 
-Task::Task (CosEventChannelAdmin::EventChannel_ptr ec,
+MTD_Task::MTD_Task (CosEventChannelAdmin::EventChannel_ptr ec,
             int callbacks)
   :  event_channel (CosEventChannelAdmin::EventChannel::_duplicate (ec)),
      use_callbacks (callbacks)
@@ -124,7 +124,7 @@ Task::Task (CosEventChannelAdmin::EventChannel_ptr ec,
 
 
 int
-Task::svc ()
+MTD_Task::svc ()
 {
   for (int i = 0; i < 10; ++i)
     {
@@ -143,7 +143,7 @@ Task::svc ()
 }
 
 void
-Task::run_iteration (ACE_ENV_SINGLE_ARG_DECL)
+MTD_Task::run_iteration (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Obtain the consumer admin..
   CosEventChannelAdmin::ConsumerAdmin_var consumer_admin =
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h
index 06a263e9178..1248ee1b8ff 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h
@@ -24,10 +24,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class Task : public ACE_Task_Base
+class MTD_Task : public ACE_Task_Base
 {
 public:
-  Task (CosEventChannelAdmin::EventChannel_ptr ec,
+  MTD_Task (CosEventChannelAdmin::EventChannel_ptr ec,
         int use_callbacks);
   // Create the task...