ChangeLogTag: Mon Jun 14 06:57:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>

23 files changed, 38 insertions, 19 deletions

diff --git a/TAO/tests/AMH_Oneway/server.cpp b/TAO/tests/AMH_Oneway/server.cpp
index b0987da7bc4..8ee95f578b2 100644
--- a/TAO/tests/AMH_Oneway/server.cpp
+++ b/TAO/tests/AMH_Oneway/server.cpp
@@ -2,6 +2,7 @@
 // $Id$
 
 #include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_unistd.h"
 #include "ace/Get_Opt.h"
 #include "TestS.h"
 
diff --git a/TAO/tests/AMI_Timeouts/timeout_client.cpp b/TAO/tests/AMI_Timeouts/timeout_client.cpp
index 8d9e8541e7c..6b19f47ee68 100644
--- a/TAO/tests/AMI_Timeouts/timeout_client.cpp
+++ b/TAO/tests/AMI_Timeouts/timeout_client.cpp
@@ -14,6 +14,7 @@
 #include "timeout_client.h"
 #include "tao/Messaging/Messaging.h"
 #include "tao/PolicyC.h"
+#include "ace/OS_NS_unistd.h"
 
 TimeoutClient::TimeoutClient (CORBA::ORB_ptr orb,
                               TimeoutObj_ptr timeoutObject,
diff --git a/TAO/tests/AMI_Timeouts/timeout_i.cpp b/TAO/tests/AMI_Timeouts/timeout_i.cpp
index d15659f9208..f7812908404 100644
--- a/TAO/tests/AMI_Timeouts/timeout_i.cpp
+++ b/TAO/tests/AMI_Timeouts/timeout_i.cpp
@@ -17,7 +17,7 @@
 // ============================================================================
 
 #include "timeout_i.h"
-
+#include "ace/OS_NS_unistd.h"
 
 Timeout_i::Timeout_i (CORBA::ORB_ptr orb)
 {
diff --git a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp
index cbed955ae7b..a1183f7bd9c 100644
--- a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp
+++ b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp
@@ -1,6 +1,8 @@
-//$Id$
+// $Id$
+
 #include "Server_Thread_Pool.h"
 #include "TestC.h"
+#include "ace/OS_NS_unistd.h"
 
 time_t last_success;
 
@@ -162,7 +164,7 @@ Thread_Pool::svc (void)
             }
           ACE_CATCHANY
             {
-	      // Just forget the exception and continue	
+	      // Just forget the exception and continue
             }
           ACE_ENDTRY;
         }
diff --git a/TAO/tests/Bug_1551_Regression/Hello.cpp b/TAO/tests/Bug_1551_Regression/Hello.cpp
index 83d6469fcef..bc4d13dcf59 100644
--- a/TAO/tests/Bug_1551_Regression/Hello.cpp
+++ b/TAO/tests/Bug_1551_Regression/Hello.cpp
@@ -1,8 +1,7 @@
-//
 // $Id$
-//
 
 #include "Hello.h"
+#include "ace/OS_NS_unistd.h"
 
 ACE_RCSID(Bug_1XXX_Regression, Hello, "$Id$")
 
diff --git a/TAO/tests/Bug_1551_Regression/server.cpp b/TAO/tests/Bug_1551_Regression/server.cpp
index a0216e29b19..5adc91117fd 100644
--- a/TAO/tests/Bug_1551_Regression/server.cpp
+++ b/TAO/tests/Bug_1551_Regression/server.cpp
@@ -1,6 +1,4 @@
-//
 // $Id$
-//
 
 #include "Hello.h"
 #include "Server_Task.h"
diff --git a/TAO/tests/Connection_Purging/client.cpp b/TAO/tests/Connection_Purging/client.cpp
index ddd39137669..3ef97cea443 100644
--- a/TAO/tests/Connection_Purging/client.cpp
+++ b/TAO/tests/Connection_Purging/client.cpp
@@ -2,6 +2,7 @@
 
 #include "testC.h"
 #include "ace/Get_Opt.h"
+#include "ace/OS_NS_unistd.h"
 #include "tao/Strategies/advanced_resource.h"
 
 const char *ior = "server.ior";
diff --git a/TAO/tests/File_IO/server.cpp b/TAO/tests/File_IO/server.cpp
index 19ea4a746a8..7d73730e5dc 100644
--- a/TAO/tests/File_IO/server.cpp
+++ b/TAO/tests/File_IO/server.cpp
@@ -5,6 +5,8 @@
 #include "ace/SString.h"
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
+#include "ace/OS_NS_unistd.h"
+#include "ace/OS_NS_fcntl.h"
 
 ACE_RCSID (File_IO,
            server,
diff --git a/TAO/tests/Leader_Followers/client.cpp b/TAO/tests/Leader_Followers/client.cpp
index 64a61e7b5ff..2d6c4fbbdd8 100644
--- a/TAO/tests/Leader_Followers/client.cpp
+++ b/TAO/tests/Leader_Followers/client.cpp
@@ -16,6 +16,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
 #include "ace/Task.h"
+#include "ace/OS_NS_unistd.h"
 #include "testC.h"
 
 #include "tao/Strategies/advanced_resource.h"
diff --git a/TAO/tests/LongUpcalls/AMI_Manager.cpp b/TAO/tests/LongUpcalls/AMI_Manager.cpp
index db16c7a71f2..e244be88a2e 100644
--- a/TAO/tests/LongUpcalls/AMI_Manager.cpp
+++ b/TAO/tests/LongUpcalls/AMI_Manager.cpp
@@ -3,6 +3,7 @@
 //
 
 #include "AMI_Manager.h"
+#include "ace/OS_NS_unistd.h"
 
 ACE_RCSID (LongUpcalls,
            AMI_Manager,
diff --git a/TAO/tests/LongUpcalls/Manager.cpp b/TAO/tests/LongUpcalls/Manager.cpp
index f32400c0b75..562ff8f262c 100644
--- a/TAO/tests/LongUpcalls/Manager.cpp
+++ b/TAO/tests/LongUpcalls/Manager.cpp
@@ -3,6 +3,7 @@
 //
 
 #include "Manager.h"
+#include "ace/OS_NS_unistd.h"
 
 ACE_RCSID (LongUpcalls,
            Manager,
diff --git a/TAO/tests/MProfile/client.cpp b/TAO/tests/MProfile/client.cpp
index 6fe86bdfcad..b25b828894c 100644
--- a/TAO/tests/MProfile/client.cpp
+++ b/TAO/tests/MProfile/client.cpp
@@ -3,6 +3,7 @@
 #include "tao/IORManipulation/IORManip_Loader.h"
 #include "ace/SString.h"
 #include "ace/Get_Opt.h"
+#include "ace/OS_NS_unistd.h"
 #include "testC.h"
 
 ACE_RCSID(MT_Server, client, "$Id$")
diff --git a/TAO/tests/MProfile_Forwarding/client.cpp b/TAO/tests/MProfile_Forwarding/client.cpp
index e0d3cc53969..610899838a9 100644
--- a/TAO/tests/MProfile_Forwarding/client.cpp
+++ b/TAO/tests/MProfile_Forwarding/client.cpp
@@ -2,6 +2,7 @@
 
 #include "ace/SString.h"
 #include "ace/Get_Opt.h"
+#include "ace/OS_NS_unistd.h"
 #include "testC.h"
 
 ACE_RCSID(MT_Server, client, "$Id$")
diff --git a/TAO/tests/MT_Timeout/Client_Task.cpp b/TAO/tests/MT_Timeout/Client_Task.cpp
index d9da19fc884..865e10abc65 100644
--- a/TAO/tests/MT_Timeout/Client_Task.cpp
+++ b/TAO/tests/MT_Timeout/Client_Task.cpp
@@ -3,6 +3,7 @@
 //
 
 #include "Client_Task.h"
+#include "ace/OS_NS_unistd.h"
 #include "tao/TimeBaseC.h"
 #include "tao/Messaging/Messaging.h"
 
diff --git a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp
index fee6305702c..0c5c38a7ddf 100644
--- a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp
+++ b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp
@@ -22,6 +22,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/SString.h"
 #include "ace/Auto_Event.h"
+#include "ace/OS_NS_unistd.h"
 
 static int debug = 1;
 
diff --git a/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp b/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp
index fdab05f2291..0ed0c9b48dd 100644
--- a/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp
+++ b/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp
@@ -14,6 +14,7 @@
 #include "ace/ACE.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_time.h"
+#include "ace/OS_NS_stdlib.h"
 
 ACE_RCSID (tests,
            Queued_Message_Test,
diff --git a/TAO/tests/RTCORBA/Client_Protocol/client.cpp b/TAO/tests/RTCORBA/Client_Protocol/client.cpp
index 675aea8dd15..2ef31055c8f 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/client.cpp
+++ b/TAO/tests/RTCORBA/Client_Protocol/client.cpp
@@ -2,6 +2,7 @@
 
 #include "testC.h"
 #include "ace/Get_Opt.h"
+#include "ace/OS_NS_unistd.h"
 #include "tao/RTCORBA/RTCORBA.h"
 
 #include "tao/Strategies/advanced_resource.h"
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/client.cpp b/TAO/tests/RTCORBA/Explicit_Binding/client.cpp
index c3d9a5d3785..25e0135f39b 100644
--- a/TAO/tests/RTCORBA/Explicit_Binding/client.cpp
+++ b/TAO/tests/RTCORBA/Explicit_Binding/client.cpp
@@ -2,7 +2,7 @@
 
 #include "testC.h"
 #include "ace/Get_Opt.h"
-
+#include "ace/OS_NS_unistd.h"
 #include "tao/Strategies/advanced_resource.h"
 #include "tao/RTCORBA/RTCORBA.h"
 
diff --git a/TAO/tests/RTCORBA/Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Thread_Pool/client.cpp
index 55b8e23de04..d6cd667cc91 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/client.cpp
+++ b/TAO/tests/RTCORBA/Thread_Pool/client.cpp
@@ -5,6 +5,7 @@
 #include "tao/RTCORBA/RTCORBA.h"
 #include "tao/ORB_Core.h"
 #include "ace/Task.h"
+#include "ace/OS_NS_unistd.h"
 #include "../check_supported_priorities.cpp"
 
 ACE_RCSID(Thread_Pool, client, "$Id$")
diff --git a/TAO/tests/RTCORBA/Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Thread_Pool/server.cpp
index 2ba5ec065ad..ebbb52926fd 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/server.cpp
+++ b/TAO/tests/RTCORBA/Thread_Pool/server.cpp
@@ -2,6 +2,7 @@
 
 #include "test_i.h"
 #include "ace/Get_Opt.h"
+#include "ace/OS_NS_unistd.h"
 #include "tao/ORB_Core.h"
 #include "ace/Task.h"
 #include "tao/RTPortableServer/RTPortableServer.h"
diff --git a/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp b/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp
index d3079c4283e..c6c2e516c01 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp
+++ b/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "test_i.h"
+#include "ace/OS_NS_unistd.h"
 #include "tao/ORB_Core.h"
 #include "tao/RTCORBA/Thread_Pool.h"
 
diff --git a/TAO/tests/RTScheduling/Thread_Cancel/test.cpp b/TAO/tests/RTScheduling/Thread_Cancel/test.cpp
index cca30cda99a..c2288510263 100644
--- a/TAO/tests/RTScheduling/Thread_Cancel/test.cpp
+++ b/TAO/tests/RTScheduling/Thread_Cancel/test.cpp
@@ -1,5 +1,7 @@
-//$Id$
+// $Id$
+
 #include "Thread_Task.h"
+#include "ace/OS_NS_unistd.h"
 #include "../Scheduler.h"
 #include "tao/RTScheduling/RTScheduler_Manager.h"
 #include "tao/ORB_Core.h"
@@ -19,17 +21,17 @@ main (int argc, char* argv [])
       CORBA::Object_ptr manager_obj = orb->resolve_initial_references ("RTSchedulerManager"
 								       ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
-      
+
       TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj
 									      ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
-      
+
       TAO_Scheduler scheduler (orb.in ());
-      
+
       manager->rtscheduler (&scheduler);
-      
+
       Thread_Task task;
-      
+
       task.activate_task (orb.in ());
 
       ACE_DEBUG ((LM_DEBUG,
@@ -45,11 +47,11 @@ main (int argc, char* argv [])
       CORBA::Object_ptr current_obj = orb->resolve_initial_references ("RTScheduler_Current"
 								       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       RTScheduling::Current_var current = RTScheduling::Current::_narrow (current_obj
 									  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-            
+
       for (int i = 0; i < 4; i++)
 	{
 	  RTScheduling::DistributableThread_var DT = current->lookup ((task.guids ())[i]
@@ -69,8 +71,8 @@ main (int argc, char* argv [])
                            "Caught exception:");
       return 1;
     }
-  ACE_ENDTRY; 
-  
+  ACE_ENDTRY;
+
   return 0;
 }
 
diff --git a/TAO/tests/Timed_Buffered_Oneways/client.cpp b/TAO/tests/Timed_Buffered_Oneways/client.cpp
index 62f5c9600dd..48e37d13caa 100644
--- a/TAO/tests/Timed_Buffered_Oneways/client.cpp
+++ b/TAO/tests/Timed_Buffered_Oneways/client.cpp
@@ -20,6 +20,7 @@
 #include "tao/TAOC.h"
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
+#include "ace/OS_NS_unistd.h"
 
 ACE_RCSID(Timed_Buffered_Oneways, client, "$Id$")
 
@@ -316,7 +317,7 @@ main (int argc, char **argv)
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+                           "Client side exception caught:");
       return -1;
     }
   ACE_ENDTRY;