diff options
14 files changed, 28 insertions, 14 deletions
diff --git a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp index edaff2abfee..546647e55aa 100644 --- a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp +++ b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp @@ -21,6 +21,7 @@ #include "tao/debug.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" +#include "ace/OS_NS_unistd.h" // Constructor. diff --git a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp index fcf78bada34..60a0519cbd0 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp @@ -4,6 +4,7 @@ // Ossama Othman <ossama@uci.edu> #include "ace/FILE_Connector.h" +#include "ace/OS_NS_unistd.h" #include "Content_Iterator_i.h" ACE_RCSID (AMI_Iterator, Content_Iterator_i, "$Id$") diff --git a/TAO/examples/Content_Server/AMI_Iterator/client.cpp b/TAO/examples/Content_Server/AMI_Iterator/client.cpp index ea4f3158c3e..7a5969d2c29 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/client.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/client.cpp @@ -4,12 +4,13 @@ // Ossama Othman <ossama@uci.edu> #include "ace/Process_Manager.h" +#include "ace/OS_NS_unistd.h" #include "orbsvcs/orbsvcs/CosNamingC.h" #include "Web_ServerC.h" #include "Iterator_Handler.h" -ACE_RCSID (AMI_Iterator, - client, +ACE_RCSID (AMI_Iterator, + client, "$Id$") // Obtain reference to Iterator_Factory diff --git a/TAO/examples/Content_Server/AMI_Observer/client.cpp b/TAO/examples/Content_Server/AMI_Observer/client.cpp index 890221c96ba..2daf289a7ff 100644 --- a/TAO/examples/Content_Server/AMI_Observer/client.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/client.cpp @@ -4,12 +4,13 @@ // Ossama Othman <ossama@uci.edu> #include "ace/Process_Manager.h" +#include "ace/OS_NS_unistd.h" #include "orbsvcs/orbsvcs/CosNamingC.h" #include "Push_Web_ServerC.h" #include "Push_Iterator_Handler.h" -ACE_RCSID (AMI_Observer, - client, +ACE_RCSID (AMI_Observer, + client, "$Id$") // Obtain reference to Iterator_Factory diff --git a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp index 1e6b5c4ec8b..5fef64be5a2 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp +++ b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp @@ -4,6 +4,7 @@ // Ossama Othman <ossama@uci.edu> #include "ace/FILE_Connector.h" +#include "ace/OS_NS_unistd.h" #include "Content_Iterator_i.h" ACE_RCSID(SMI_Iterator, Content_Iterator_i, "$Id$") diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp index 774bfbfedf3..6d3ab90a29b 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp @@ -3,6 +3,7 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" #include "ace/High_Res_Timer.h" +#include "ace/OS_NS_unistd.h" #include "tao/RTScheduling/RTScheduler_Manager.h" #include "testC.h" #include "FP_Scheduler.h" @@ -106,7 +107,7 @@ main (int argc, char *argv[]) if (sched_policy == ACE_SCHED_RR) flags = THR_NEW_LWP | THR_BOUND | THR_JOINABLE | THR_SCHED_RR; - else + else flags = THR_NEW_LWP | THR_BOUND | THR_JOINABLE | THR_SCHED_FIFO; ACE_hthread_t main_thr_handle; @@ -184,9 +185,9 @@ main (int argc, char *argv[]) { disp_impl_type = Kokyu::DSRT_OS_BASED; } - + ACE_NEW_RETURN (scheduler, - Fixed_Priority_Scheduler (orb.in (), + Fixed_Priority_Scheduler (orb.in (), disp_impl_type, sched_policy, sched_scope), -1); diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp index 71cc7f62e17..122e2b06881 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp @@ -3,6 +3,7 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" #include "ace/High_Res_Timer.h" +#include "ace/OS_NS_unistd.h" #include "tao/RTScheduling/RTScheduler_Manager.h" #include "testC.h" #include "MIF_Scheduler.h" @@ -106,7 +107,7 @@ main (int argc, char *argv[]) if (sched_policy == ACE_SCHED_RR) flags = THR_NEW_LWP | THR_BOUND | THR_JOINABLE | THR_SCHED_RR; - else + else flags = THR_NEW_LWP | THR_BOUND | THR_JOINABLE | THR_SCHED_FIFO; ACE_hthread_t main_thr_handle; @@ -184,9 +185,9 @@ main (int argc, char *argv[]) { disp_impl_type = Kokyu::DSRT_OS_BASED; } - + ACE_NEW_RETURN (scheduler, - MIF_Scheduler (orb.in (), + MIF_Scheduler (orb.in (), disp_impl_type, sched_policy, sched_scope), -1); diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp index 68cfb4814b0..7b8721e8014 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp @@ -3,6 +3,7 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" #include "ace/High_Res_Timer.h" +#include "ace/OS_NS_unistd.h" #include "tao/RTScheduling/RTScheduler_Manager.h" #include "testC.h" #include "MUF_Scheduler.h" @@ -111,7 +112,7 @@ main (int argc, char *argv[]) if (sched_policy == ACE_SCHED_RR) flags = THR_NEW_LWP | THR_BOUND | THR_JOINABLE | THR_SCHED_RR; - else + else flags = THR_NEW_LWP | THR_BOUND | THR_JOINABLE | THR_SCHED_FIFO; ACE_hthread_t main_thr_handle; @@ -189,9 +190,9 @@ main (int argc, char *argv[]) { disp_impl_type = Kokyu::DSRT_OS_BASED; } - + ACE_NEW_RETURN (scheduler, - MUF_Scheduler (orb.in (), + MUF_Scheduler (orb.in (), disp_impl_type, sched_policy, sched_scope), -1); diff --git a/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp b/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp index bdfd4c9a2ae..c5f2e57cda8 100644 --- a/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp +++ b/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp @@ -2,6 +2,7 @@ #include "UDP_Client_i.h" #include "ace/SString.h" +#include "ace/OS_NS_unistd.h" // This is the interface program that accesses the remote object diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp index 80027299d55..dc60b8aeebd 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp @@ -2,6 +2,7 @@ #include "ace/High_Res_Timer.h" #include "ace/SString.h" +#include "ace/OS_NS_unistd.h" #include "UDP_PerformanceClient.h" diff --git a/TAO/examples/RTCORBA/Activity/Activity.cpp b/TAO/examples/RTCORBA/Activity/Activity.cpp index 07fdbe27c7d..1046525d3e6 100644 --- a/TAO/examples/RTCORBA/Activity/Activity.cpp +++ b/TAO/examples/RTCORBA/Activity/Activity.cpp @@ -436,7 +436,7 @@ main (int argc, char *argv[]) ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGHUP); ACE_Timer_Heap timer_queue; - ACE_Reactor::instance ()->set_timer_queue (&timer_queue); + ACE_Reactor::instance ()->timer_queue (&timer_queue); ACE_TRY_NEW_ENV { diff --git a/TAO/examples/RTCORBA/Activity/Thread_Task.cpp b/TAO/examples/RTCORBA/Activity/Thread_Task.cpp index 2c8a27e8894..4a44ccfc9e8 100644 --- a/TAO/examples/RTCORBA/Activity/Thread_Task.cpp +++ b/TAO/examples/RTCORBA/Activity/Thread_Task.cpp @@ -2,6 +2,7 @@ #include "Thread_Task.h" #include "ace/High_Res_Timer.h" +#include "ace/OS_NS_unistd.h" #include "tao/debug.h" #include "tao/ORB_Core.h" diff --git a/TAO/examples/Simple/Simple_util.cpp b/TAO/examples/Simple/Simple_util.cpp index 9db4e610871..e4aea7df2bc 100644 --- a/TAO/examples/Simple/Simple_util.cpp +++ b/TAO/examples/Simple/Simple_util.cpp @@ -9,6 +9,7 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_string.h" +#include "ace/OS_NS_fcntl.h" // Constructor. diff --git a/TAO/examples/Simple/chat/Client_i.cpp b/TAO/examples/Simple/chat/Client_i.cpp index 5467c3de9ff..268da16eaeb 100644 --- a/TAO/examples/Simple/chat/Client_i.cpp +++ b/TAO/examples/Simple/chat/Client_i.cpp @@ -22,6 +22,8 @@ #include "tao/ORB_Core.h" #include "ace/Read_Buffer.h" #include "ace/Get_Opt.h" +#include "ace/OS_NS_fcntl.h" +#include "ace/OS_NS_unistd.h" Client_i::Client_i () : ior_file_name_ ("chat.ior"), |