diff options
111 files changed, 254 insertions, 212 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 199c2f18633..b475e4c7644 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,9 +1,210 @@ +Mon Sep 13 09:27:13 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + * DevGuideExamples/AMH_AMI/inner_i.cpp: + + * examples/Advanced/ch_12/icp.h: + + * examples/Advanced/ch_18/icp.h: + + * examples/Advanced/ch_21/icp.h: + + * examples/Advanced/ch_8_and_10/icp.h: + + * examples/CSD_Strategy/ThreadPool/Foo_i.cpp: + + * examples/CSD_Strategy/ThreadPool2/FooServantList.cpp: + * examples/CSD_Strategy/ThreadPool2/Foo_i.cpp: + + * examples/CSD_Strategy/ThreadPool4/ClientTask.cpp: + * examples/CSD_Strategy/ThreadPool4/Foo_i.cpp: + + * examples/CSD_Strategy/ThreadPool5/ClientTask.cpp: + * examples/CSD_Strategy/ThreadPool5/FooServantList.cpp: + * examples/CSD_Strategy/ThreadPool5/Foo_i.cpp: + + * examples/CSD_Strategy/ThreadPool6/Foo_i.cpp: + + * examples/Callback_Quoter/Consumer_Handler.cpp: + * examples/Callback_Quoter/Supplier_Timer_Handler.cpp: + + * examples/Kokyu_dsrt_schedulers/Task_Stats.cpp: + * examples/Kokyu_dsrt_schedulers/utils.h: + + * examples/Logging/Logging_Service_i.h: + + * examples/Persistent_Grid/Grid_i.h: + + * examples/RTCORBA/Activity/Task_Stats.cpp: + + * examples/RTScheduling/Task_Stats.cpp: + + * examples/Simple/bank/AccountManager_i.h: + + * examples/Simulator/Event_Supplier/DOVE_Supplier.h: + + * interop-tests/wchar/wchar_reference.h: + + * orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingMessenger.cpp: + + * orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp: + + * orbsvcs/ImplRepo_Service/tao_imr_i.cpp: + + * orbsvcs/Naming_Service/NT_Naming_Server.cpp: + * orbsvcs/Naming_Service/NT_Naming_Service.h: + + * orbsvcs/Notify_Service/NT_Notify_Server.cpp: + * orbsvcs/Notify_Service/NT_Notify_Service.h: + + * orbsvcs/PSS/PSDL_l.cpp: + + * orbsvcs/Trading_Service/Trading_Service.cpp: + + * orbsvcs/examples/LoadBalancing/server.cpp: + + * orbsvcs/examples/Notify/Federation/Agent/Agent.cpp: + + * orbsvcs/examples/Notify/Federation/Gate/Gate.h: + + * orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp: + + * orbsvcs/orbsvcs/AV/AVStreams_i.h: + * orbsvcs/orbsvcs/AV/QoS_UDP.h: + + * orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h: + * orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h: + + * orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h: + + * orbsvcs/orbsvcs/Notify/Random_File.cpp: + + * orbsvcs/orbsvcs/Sched/Config_Scheduler.h: + + * orbsvcs/orbsvcs/Scheduler_Factory.cpp: + + * orbsvcs/orbsvcs/Time/TAO_UTO.cpp: + + * orbsvcs/performance-tests/RTEvent/lib/Client_Options.cpp: + + * orbsvcs/tests/Bug_2248_Regression/client.cpp: + + * orbsvcs/tests/Bug_2800_Regression/nsmain.cpp: + + * orbsvcs/tests/Bug_3673_Regression/nsmain.cpp: + + * orbsvcs/tests/COIOP_Naming_Test/Hello.h: + + * orbsvcs/tests/Concurrency/CC_test_utils.cpp: + * orbsvcs/tests/Concurrency/CC_tests.cpp: + + * orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp: + * orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp: + + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp: + + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.cpp: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/client.cpp: + + * orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp: + + * orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp: + + * orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp: + + * orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp: + + * orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp: + + * orbsvcs/tests/Notify/lib/Task_Stats.cpp: + + * orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp: + + * performance-tests/CSD_Strategy/TestApps/ServerApp.cpp: + + * performance-tests/CSD_Strategy/TestInf/AppHelper.h: + + * performance-tests/CSD_Strategy/TestServant/Foo_i.cpp: + + * tests/Bug_2677_Regression/server.cpp: + + * tests/Bug_2936_Regression/bug2936.cpp: + + * tests/Bug_3251_Regression/server.cpp: + + * tests/Bug_3531_Regression/client.cpp: + * tests/Bug_3531_Regression/test_i.cpp: + + * tests/Bug_3542_Regression/server.cpp: + + * tests/Bug_3647_Regression/Backend_Impl.cpp: + + * tests/Bug_3766_Regression/client.cpp: + * tests/Bug_3766_Regression/server.cpp: + + * tests/Bug_3812_Regression/Bug_3812_Regression.cpp: + + * tests/Bug_3853_Regression/Hello_i.cpp: + * tests/Bug_3853_Regression/client.cpp: + + * tests/COIOP/Hello.h: + + * tests/CSD_Strategy_Tests/Broken/ServerApp.cpp: + + * tests/CSD_Strategy_Tests/TP_Common/AppHelper.h: + + * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp: + * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp: + * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp: + + * tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp: + + * tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp: + + * tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp: + + * tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp: + + * tests/Collocation_Exception_Test/Hello.h: + + * tests/Collocation_Oneway_Tests/Hello.h: + + * tests/Collocation_Tests/Hello.h: + + * tests/DII_Collocation_Tests/oneway/Hello.h: + + * tests/DII_Collocation_Tests/twoway/Hello.h: + + * tests/DynAny_Test/test_wrapper.cpp: + + * tests/File_IO/client.cpp: + + * tests/ForwardOnceUponException/client.cpp: + + * tests/Hang_Shutdown/client.cpp: + + * tests/Nested_Event_Loop/client.cpp: + + * tests/Nested_Upcall_Crash/Clock_Ticks.h: + + * tests/ORB_Local_Config/Bug_2612/Test.cpp: + + * tests/POA/Bug_2511_Regression/server.cpp: + + * tests/POA/Default_Servant2/client.cpp: + + * tests/POA/Explicit_Activation/Alt_Resources/Alt_Resource_Factory.h: + + * tests/ZIOP/client.cpp: + Mon Sep 13 07:46:21 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> - * Makefile.am: - Removed, configure is too experimental to be used for TAO. If - someone really wants to use configure we need to fix the MPC - generator and the configure script and really perform testing + * Makefile.am: + Removed, configure is too experimental to be used for TAO. If + someone really wants to use configure we need to fix the MPC + generator and the configure script and really perform testing Thu Sep 9 18:29:21 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> diff --git a/TAO/DevGuideExamples/AMH_AMI/inner_i.cpp b/TAO/DevGuideExamples/AMH_AMI/inner_i.cpp index c1c696ecbc2..067d6d1555c 100644 --- a/TAO/DevGuideExamples/AMH_AMI/inner_i.cpp +++ b/TAO/DevGuideExamples/AMH_AMI/inner_i.cpp @@ -1,15 +1,7 @@ -#include "amh_ami_pch.h" /* -*- C++ -*- $Id$ */ - -// ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* -// TAO and the TAO IDL Compiler have been developed by the Center for -// Distributed Object Computing at Washington University, St. Louis. -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html +#include "amh_ami_pch.h" #include "inner_i.h" -#include "ace/OS.h" Inner_i::Inner_i (int d) : divisor_ (d) diff --git a/TAO/examples/Advanced/ch_12/icp.h b/TAO/examples/Advanced/ch_12/icp.h index fc080d49823..30bc0bc75dd 100644 --- a/TAO/examples/Advanced/ch_12/icp.h +++ b/TAO/examples/Advanced/ch_12/icp.h @@ -22,8 +22,6 @@ #ifndef _ICP_H #define _ICP_H -#include "ace/OS.h" - extern "C" { int ICP_online (unsigned long id); // Add device diff --git a/TAO/examples/Advanced/ch_18/icp.h b/TAO/examples/Advanced/ch_18/icp.h index fb2d9d182de..121198509ba 100644 --- a/TAO/examples/Advanced/ch_18/icp.h +++ b/TAO/examples/Advanced/ch_18/icp.h @@ -20,8 +20,6 @@ #ifndef _ICP_H #define _ICP_H -#include "ace/OS.h" - extern "C" { int ICP_online(unsigned long id); // Add device int ICP_offline(unsigned long id); // Remove device diff --git a/TAO/examples/Advanced/ch_21/icp.h b/TAO/examples/Advanced/ch_21/icp.h index b93d94193f2..b7198e4ba15 100644 --- a/TAO/examples/Advanced/ch_21/icp.h +++ b/TAO/examples/Advanced/ch_21/icp.h @@ -20,8 +20,6 @@ #ifndef _ICP_H #define _ICP_H -#include "ace/OS.h" - extern "C" { int ICP_online(unsigned long id); // Add device int ICP_offline(unsigned long id); // Remove device diff --git a/TAO/examples/Advanced/ch_8_and_10/icp.h b/TAO/examples/Advanced/ch_8_and_10/icp.h index a884c51d769..08a067de46b 100644 --- a/TAO/examples/Advanced/ch_8_and_10/icp.h +++ b/TAO/examples/Advanced/ch_8_and_10/icp.h @@ -20,8 +20,6 @@ #ifndef _ICP_H #define _ICP_H -#include "ace/OS.h" - extern "C" { int ICP_online(unsigned long id); // Add device int ICP_offline(unsigned long id); // Remove device @@ -32,7 +30,7 @@ extern "C" { size_t len ); int ICP_set( // Set attribute - unsigned long id, + unsigned long id, const char * attr, const void * value ); diff --git a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp index 83ecc32166d..ab94d4f520a 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp @@ -1,7 +1,6 @@ // $Id$ #include "Foo_i.h" #include "OrbShutdownTask.h" -#include "ace/OS.h" Foo_i::Foo_i(unsigned num_clients) : value_(0), diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp index e6ebbaa4369..ad87e0cc2e1 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp @@ -2,8 +2,6 @@ #include "FooServantList.h" #include "Foo_i.h" #include "OrbShutdownTask.h" -#include "ace/OS.h" - FooServantList::FooServantList(const ACE_TCHAR* prefix, unsigned num_servants, diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp index 95a768fc0c7..8b86406037e 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp @@ -1,7 +1,6 @@ // $Id$ #include "Foo_i.h" #include "FooServantList.h" -#include "ace/OS.h" Foo_i::Foo_i(const ACE_TCHAR* servant_name,FooServantList* mgr) : value_(0), diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp index 637f5b9b587..361116f7eea 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp @@ -12,8 +12,6 @@ #include "ClientTask.h" #include "ace/SString.h" -#include "ace/OS.h" - ClientTask::ClientTask(Foo_ptr foo, Callback_ptr callback) diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp index 4e1c687bc54..8271798514e 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp @@ -1,7 +1,6 @@ // $Id$ #include "Foo_i.h" #include "OrbShutdownTask.h" -#include "ace/OS.h" Foo_i::Foo_i(const char* servant_name) : value_(0), diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp index e168976bd08..c175728a4f5 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp @@ -12,8 +12,6 @@ #include "ClientTask.h" #include "ace/SString.h" -#include "ace/OS.h" - ClientTask::ClientTask(CORBA::ORB_ptr orb, Foo_ptr foo, diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp index b6243b22ab6..68d48b8db81 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp @@ -4,8 +4,6 @@ #include "Callback_i.h" #include "ClientTask.h" #include "OrbShutdownTask.h" -#include "ace/OS.h" - FooServantList::FooServantList(const ACE_TCHAR* prefix, unsigned num_servants, diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp index dfcf34799a5..74f53da07f8 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp @@ -1,7 +1,6 @@ // $Id$ #include "Foo_i.h" #include "FooServantList.h" -#include "ace/OS.h" Foo_i::Foo_i(const char* servant_name,FooServantList* mgr) : value_(0), diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp index 336c96d8b53..84807a8b9f0 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp @@ -1,7 +1,6 @@ // $Id$ #include "Foo_i.h" #include "OrbShutdownTask.h" -#include "ace/OS.h" Foo_i::Foo_i(unsigned num_clients) : value_(0), diff --git a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp index 083f0b4cd56..a8d44853b10 100644 --- a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp +++ b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp @@ -26,7 +26,6 @@ #include "ace/Read_Buffer.h" #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" -#include "ace/OS.h" #include "ace/Reactor.h" #include "ace/Event_Handler.h" diff --git a/TAO/examples/Callback_Quoter/Supplier_Timer_Handler.cpp b/TAO/examples/Callback_Quoter/Supplier_Timer_Handler.cpp index 4524c0df352..a8a9ec3bc12 100644 --- a/TAO/examples/Callback_Quoter/Supplier_Timer_Handler.cpp +++ b/TAO/examples/Callback_Quoter/Supplier_Timer_Handler.cpp @@ -16,7 +16,6 @@ // // =========================================================== -#include "ace/OS.h" #include "ace/ACE.h" #include "Supplier_Timer_Handler.h" diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp index 9665a90cf2a..b8f16aa561d 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp @@ -1,6 +1,5 @@ //$Id$ #include "Task_Stats.h" -#include "ace/OS.h" #include "ace/Log_Msg.h" #if !defined (__ACE_INLINE__) diff --git a/TAO/examples/Kokyu_dsrt_schedulers/utils.h b/TAO/examples/Kokyu_dsrt_schedulers/utils.h index 5650953ea09..7abf410eb2e 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/utils.h +++ b/TAO/examples/Kokyu_dsrt_schedulers/utils.h @@ -1,6 +1,5 @@ //$Id$ -#include "ace/OS.h" #include "tao/RTCORBA/RTCORBA.h" #include "Kokyu_qosC.h" #include "tao/RTScheduling/RTScheduler.h" diff --git a/TAO/examples/Logging/Logging_Service_i.h b/TAO/examples/Logging/Logging_Service_i.h index c30a6eb342b..2f4c1839d90 100644 --- a/TAO/examples/Logging/Logging_Service_i.h +++ b/TAO/examples/Logging/Logging_Service_i.h @@ -30,7 +30,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Log_Msg.h" -#include "ace/OS.h" #include "tao/Utils/ORB_Manager.h" #include "orbsvcs/CosNamingC.h" #include "orbsvcs/Naming/Naming_Client.h" diff --git a/TAO/examples/Persistent_Grid/Grid_i.h b/TAO/examples/Persistent_Grid/Grid_i.h index e2711fa24cf..a8cd5c9847e 100644 --- a/TAO/examples/Persistent_Grid/Grid_i.h +++ b/TAO/examples/Persistent_Grid/Grid_i.h @@ -20,7 +20,6 @@ #define GRID_I_H #include "GridS.h" -#include "ace/OS.h" #include "ace/Memory_Pool.h" #include "ace/Null_Mutex.h" #include "ace/Malloc_T.h" diff --git a/TAO/examples/RTCORBA/Activity/Task_Stats.cpp b/TAO/examples/RTCORBA/Activity/Task_Stats.cpp index c76d8f1a8a8..e4ef6aaa0ea 100644 --- a/TAO/examples/RTCORBA/Activity/Task_Stats.cpp +++ b/TAO/examples/RTCORBA/Activity/Task_Stats.cpp @@ -1,6 +1,5 @@ //$Id$ #include "Task_Stats.h" -#include "ace/OS.h" #include "ace/Log_Msg.h" #if !defined (__ACE_INLINE__) diff --git a/TAO/examples/RTScheduling/Task_Stats.cpp b/TAO/examples/RTScheduling/Task_Stats.cpp index 53398e0c270..9e6763b712d 100644 --- a/TAO/examples/RTScheduling/Task_Stats.cpp +++ b/TAO/examples/RTScheduling/Task_Stats.cpp @@ -1,6 +1,5 @@ //$Id$ #include "Task_Stats.h" -#include "ace/OS.h" #include "ace/Log_Msg.h" #if !defined (__ACE_INLINE__) diff --git a/TAO/examples/Simple/bank/AccountManager_i.h b/TAO/examples/Simple/bank/AccountManager_i.h index 9e502bc6e72..e6a142d4266 100644 --- a/TAO/examples/Simple/bank/AccountManager_i.h +++ b/TAO/examples/Simple/bank/AccountManager_i.h @@ -29,7 +29,6 @@ #include "Account_i.h" #include "ace/Hash_Map_Manager.h" -#include "ace/OS.h" #include "ace/ACE.h" #include "ace/SString.h" #include "ace/Null_Mutex.h" diff --git a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h index 4061b552e55..c1e1e6b7764 100644 --- a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h +++ b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h @@ -13,13 +13,12 @@ // Chris Gill (cdgill@cs.wustl.edu) // ============================================================================ -#include "ace/OS.h" +#include "orbsvcs/RtecEventChannelAdminC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/RtecEventChannelAdminC.h" #include "orbsvcs/RtecEventCommS.h" #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Event_Service_Constants.h" diff --git a/TAO/interop-tests/wchar/wchar_reference.h b/TAO/interop-tests/wchar/wchar_reference.h index 735eb81563f..a99b83fede2 100644 --- a/TAO/interop-tests/wchar/wchar_reference.h +++ b/TAO/interop-tests/wchar/wchar_reference.h @@ -21,8 +21,6 @@ #ifndef WCHAR_REFERENCE_H #define WCHAR_REFERENCE_H -#include "ace/OS.h" - #define NUM_KEYS 1 class wchar_reference diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingMessenger.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingMessenger.cpp index 35c41b37b58..dda5b2b6a36 100644 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingMessenger.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingMessenger.cpp @@ -2,7 +2,6 @@ #include "NamingTask.h" #include "MessengerTask.h" -#include "ace/OS.h" int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp index 585dbb67dd9..5fdadd0840f 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp +++ b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp @@ -1,6 +1,5 @@ /* -*- C++ -*- $Id$ */ -#include "ace/OS.h" #include "ace/Get_Opt.h" #include "MessengerC.h" @@ -103,7 +102,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) argv [0]), -1); break; - case '?': + case '?': default: ACE_ERROR_RETURN ((LM_ERROR, "Usage: %s " diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp index 1d7be573714..fb640f669d6 100644 --- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp @@ -11,7 +11,6 @@ #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" #include "ace/OS_NS_strings.h" -#include "ace/OS.h" TAO_IMR_i::TAO_IMR_i (void) : imr_ (ImplementationRepository::Administration::_nil ()) diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp index f2415410a31..d0623f57192 100644 --- a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp +++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp @@ -20,12 +20,10 @@ // // ============================================================================ -#include "ace/OS.h" +#include "ace/Log_Msg.h" #if !defined (ACE_WIN32) || defined (ACE_LACKS_WIN32_SERVICES) -#include "ace/Log_Msg.h" - int ACE_TMAIN(int, ACE_TCHAR *[]) { diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h index a5c17d7995f..1a6c81d6369 100644 --- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h +++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h @@ -18,11 +18,10 @@ #ifndef TAO_NT_NAMING_SERVICE_H #define TAO_NT_NAMING_SERVICE_H -#include /**/ "ace/OS.h" +#include /**/ "ace/NT_Service.h" #if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES) -#include /**/ "ace/NT_Service.h" #include /**/ "ace/Singleton.h" #include /**/ "ace/Synch.h" #include /**/ "tao/orbconf.h" diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp b/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp index 44e68a9443d..0343052703b 100644 --- a/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp +++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp @@ -21,12 +21,10 @@ // // ============================================================================ -#include "ace/OS.h" +#include "ace/Log_Msg.h" #if !defined (ACE_WIN32) || defined (ACE_LACKS_WIN32_SERVICES) -#include "ace/Log_Msg.h" - int ACE_TMAIN(int, ACE_TCHAR *[]) { diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h index e3b6b8396a1..a2e102a842b 100644 --- a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h +++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h @@ -19,11 +19,10 @@ #ifndef TAO_NT_NOTIFY_SERVICE_H #define TAO_NT_NOTIFY_SERVICE_H -#include /**/ "ace/OS.h" +#include /**/ "ace/NT_Service.h" #if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES) -#include /**/ "ace/NT_Service.h" #include /**/ "ace/Singleton.h" #include /**/ "ace/Synch.h" #include /**/ "tao/orbconf.h" diff --git a/TAO/orbsvcs/PSS/PSDL_l.cpp b/TAO/orbsvcs/PSS/PSDL_l.cpp index b72c0951eb6..64cdccc0e51 100644 --- a/TAO/orbsvcs/PSS/PSDL_l.cpp +++ b/TAO/orbsvcs/PSS/PSDL_l.cpp @@ -25,8 +25,6 @@ #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 5 -#include "ace/OS.h" - #include <stdio.h> #include <errno.h> diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp index 1e7d19231c2..95566172a03 100644 --- a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp +++ b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp @@ -1,11 +1,8 @@ // $Id$ -#include "ace/OS.h" #include "ace/Arg_Shifter.h" #include "Trading_Service.h" - - Trading_Shutdown::Trading_Shutdown (Trading_Service& trader) : trader_ (trader) { diff --git a/TAO/orbsvcs/examples/LoadBalancing/server.cpp b/TAO/orbsvcs/examples/LoadBalancing/server.cpp index 8a0a89b782b..6360ec7f1de 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/server.cpp +++ b/TAO/orbsvcs/examples/LoadBalancing/server.cpp @@ -4,7 +4,6 @@ #include "StockFactory.h" #include "ORBInitializer.h" #include "RPS_Monitor.h" -#include "ace/OS.h" #include "ace/OS_NS_stdlib.h" #include "ace/Get_Opt.h" diff --git a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp index d126b46b3e5..d9b6d99493b 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp +++ b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp @@ -13,8 +13,6 @@ # include <sstream> #endif -#include "ace/OS.h" - #include "tao/corba.h" #include "orbsvcs/CosNotificationC.h" diff --git a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h index b7f3dadc052..01b69e9b5c8 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h +++ b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h @@ -5,7 +5,6 @@ #ifndef GATE_H #define GATE_H -#include "ace/OS.h" #include "ace/INET_Addr.h" #include "ace/UUID.h" diff --git a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp index a09cdc3bc50..df68aecdf2d 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp +++ b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp @@ -2,9 +2,6 @@ // author : Boris Kolpackov <boris@dre.vanderbilt.edu> // cvs-id : $Id$ - -#include "ace/OS.h" - #include "tao/corba.h" #include "orbsvcs/CosNotificationC.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h index 9bc0ba9c98b..35d77b38b22 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h @@ -27,7 +27,6 @@ #include "orbsvcs/Null_MediaCtrlS.h" #include "orbsvcs/AV/FlowSpec_Entry.h" -#include "ace/OS.h" #include "ace/SOCK_Dgram_Mcast.h" #include "ace/ATM_Addr.h" #include "ace/Containers_T.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h index fb5b38ebb37..3f4e6b99a80 100644 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h +++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h @@ -22,7 +22,6 @@ #include "orbsvcs/AV/Protocol_Factory.h" -#include "ace/OS.h" #include "ace/Service_Config.h" #include "ace/QoS/QoS_Session_Factory.h" #include "ace/QoS/QoS_Decorator.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h index 54909fb4e36..bace320d3fc 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h @@ -15,7 +15,6 @@ #include /**/ "ace/pre.h" #include "orbsvcs/FtRtEvent/Utils/ftrtevent_export.h" #include "tao/Versioned_Namespace.h" -#include "ace/OS.h" #include "ace/Log_Msg.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h index a376ea74677..10bdd0834bb 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h @@ -14,7 +14,6 @@ #include "orbsvcs/FtRtEvent/Utils/ftrtevent_export.h" #include "tao/Versioned_Namespace.h" -#include "ace/OS.h" #include "ace/SString.h" #if defined(TAO_EXPORT_MACRO) diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h index eccbb782a3d..b094ba6fa43 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h @@ -30,7 +30,6 @@ #include "ace/SOCK_Connector.h" #include "ace/Connector.h" -#include "ace/OS.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE diff --git a/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp b/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp index 31bb80ab7c3..da226f7ef6f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp @@ -2,7 +2,6 @@ #include "orbsvcs/Notify/Random_File.h" -#include "ace/OS.h" #include "ace/Log_Msg.h" #include "tao/debug.h" //#define DEBUG_LEVEL 9 diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h index 32456a27e09..d5142543382 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h @@ -7,15 +7,13 @@ #include /**/ "ace/pre.h" -#include "ace/OS.h" +#include "orbsvcs/RtecSchedulerS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/RtecSchedulerS.h" #include "orbsvcs/Event_Service_Constants.h" - #include "orbsvcs/Sched/sched_export.h" #if defined (TAO_USES_STRATEGY_SCHEDULER) diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp index 40b81c8c3f7..c8f06d77ffa 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp @@ -1,6 +1,5 @@ // $Id$ -#include "ace/OS.h" #include "ace/Singleton.h" #include "ace/Null_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp index f7336b634b3..2c40eb6e7bf 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp @@ -3,7 +3,6 @@ #include "orbsvcs/Time/TAO_UTO.h" #include "orbsvcs/Time/TAO_TIO.h" -#include "ace/OS.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.cpp index dfd42c0630b..29b268be8ba 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.cpp @@ -9,7 +9,6 @@ #include "Client_Options.h" #include "ace/Log_Msg.h" -#include "ace/OS.h" Client_Options::Client_Options (int &argc, ACE_TCHAR *argv[]) : ior (ACE_TEXT("file://test.ior")) diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp index 9cc9cdb2f6e..0657a8eb0a1 100644 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp @@ -11,7 +11,6 @@ #include "orbsvcs/FaultTolerance/FT_Service_Activate.h" #include "orbsvcs/FaultTolerance/FT_IOGR_Property.h" #include "ace/OS_NS_stdio.h" -#include "ace/OS.h" // Files which have the IOR const ACE_TCHAR *first_ior = 0; diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp index abced085c27..f8b50ad46b5 100644 --- a/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp +++ b/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp @@ -4,7 +4,6 @@ #include "Hello.h" #include "NsShutdown.h" #include "orbsvcs/CosNamingC.h" -#include "ace/OS.h" #include "ace/Get_Opt.h" const ACE_TCHAR *ior_output_file = ACE_TEXT("ns.ior"); diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp b/TAO/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp index abced085c27..f8b50ad46b5 100644 --- a/TAO/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp +++ b/TAO/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp @@ -4,7 +4,6 @@ #include "Hello.h" #include "NsShutdown.h" #include "orbsvcs/CosNamingC.h" -#include "ace/OS.h" #include "ace/Get_Opt.h" const ACE_TCHAR *ior_output_file = ACE_TEXT("ns.ior"); diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h index 556409e5d00..1d5e27d075f 100644 --- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h +++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h @@ -8,8 +8,6 @@ #include "TestS.h" -#include "ace/OS.h" - /// Implement the Test::Hello interface class Hello : public virtual POA_Test::Hello diff --git a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp index 930792d8a14..420a426e7cf 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp @@ -19,11 +19,8 @@ #include "CC_test_utils.h" #include "CC_naming_service.h" -#include "ace/OS.h" #include "ace/Log_Msg.h" - - char *CC_TestUtils::get_lock_mode_name (CosConcurrencyControl::lock_mode mode) { if (mode==CosConcurrencyControl::read) diff --git a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp index ce1cbd5d4fd..02f73ac5907 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp @@ -18,11 +18,8 @@ // ============================================================================ #include "CC_tests.h" -#include "ace/OS.h" #include "ace/Log_Msg.h" - - CC_Test::CC_Test (CC_naming_service *ns) : result (CC_FAIL), naming_service_ (ns) diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp index 4efc786b6a0..a60382930f3 100755 --- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp @@ -3,12 +3,10 @@ #include "tao/AnyTypeCode/Any.h" #include "ace/Get_Opt.h" #include <ace/Task.h> -#include <ace/OS.h> - const ACE_TCHAR *ior_input_file = ACE_TEXT ("file://serverA.ior"); int test_duration_sec = 15; -bool expect_object_not_exist = false; +bool expect_object_not_exist = false; class Client_Task : public ACE_Task_Base { @@ -23,7 +21,7 @@ class Client_Task : public ACE_Task_Base virtual int svc (void) { ACE_Time_Value start = ACE_OS::gettimeofday (); - ACE_Time_Value elapsed; + ACE_Time_Value elapsed; int i = 0; while (elapsed < ACE_Time_Value (test_duration_sec)) { @@ -45,7 +43,7 @@ class Client_Task : public ACE_Task_Base caught_object_not_exist_ = true; ACE_OS::sleep (1); } - catch (const CORBA::Exception & /*ex*/) + catch (const CORBA::Exception & /*ex*/) { //ex._tao_print_exception ("Exception caught:"); communication_failed_ = true; @@ -54,7 +52,7 @@ class Client_Task : public ACE_Task_Base ++i; elapsed = ACE_OS::gettimeofday () - start; } - + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t)Client thread exit \n"))); return 0; } @@ -109,7 +107,7 @@ parse_args (int argc, ACE_TCHAR* argv[]) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); @@ -137,7 +135,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) Client_Task task (test.in ()); task.activate (THR_NEW_LWP | THR_JOINABLE, 1, 1); - + ACE_Time_Value tv(test_duration_sec); orb->run (&tv); @@ -156,7 +154,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t)Client test failed.\n")), 1); } } - catch (const CORBA::Exception &ex) + catch (const CORBA::Exception &ex) { ex._tao_print_exception ("Exception caught by client:"); return 1; diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp index 2049cc94590..78ddaecf9a8 100755 --- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp @@ -4,7 +4,6 @@ #include "tao/ImR_Client/ImR_Client.h" #include <ace/Task.h> #include <ace/Get_Opt.h> -#include <ace/OS.h> const ACE_TCHAR * ior_output_file = ACE_TEXT ("serverB.ior"); // server_notify_delay between resolving RootPOA init ref and create_POA. @@ -35,7 +34,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) argv [0]), -1); } - + return 0; } @@ -64,7 +63,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) rootPOA->the_POAManager (); CORBA::PolicyList policies (5); - policies.length (5); + policies.length (5); // Lifespan policy policies[0] = @@ -131,7 +130,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) rootPOA->destroy (1, 1); orb->destroy (); } - catch (const CORBA::Exception &ex) + catch (const CORBA::Exception &ex) { ex._tao_print_exception ("Exception caught by serverB:"); return 1; diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp index 2a897201d84..d0460e5c566 100755 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp @@ -2,7 +2,6 @@ #include "Basic.h" #include "LB_server.h" -#include "ace/OS.h" extern int pong_delay; diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp index 619fd6688cb..0d6ebf472db 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp @@ -2,7 +2,6 @@ #include "TestC.h" #include "ace/Get_Opt.h" -#include "ace/OS.h" #include "ace/Vector_T.h" const ACE_TCHAR *group_file = ACE_TEXT("group.ior"); diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp index ac22738cf2f..ab54c098a33 100755 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp @@ -3,7 +3,6 @@ #include "LB_server.h" #include "Basic.h" #include "ace/Get_Opt.h" -#include "ace/OS.h" #include "ace/Task.h" const ACE_TCHAR *group_file = ACE_TEXT("group.ior"); diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.cpp index 9f58115f761..7325a046a5b 100755 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.cpp @@ -58,12 +58,9 @@ Factory::create_object ( return obj_._retn (); } -#include <ace/OS.h> - void Factory::delete_object ( - const PortableGroup::GenericFactory::FactoryCreationId & - fcid) + const PortableGroup::GenericFactory::FactoryCreationId & fcid) { ACE_DEBUG ((LM_DEBUG, "(%P|%t)%T delete_object \n")); ACE_OS::sleep (10); diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp index 2f944107d78..90c5aa90e38 100755 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp @@ -1,7 +1,6 @@ // $Id$ #include "Simple.h" -#include "ace/OS.h" extern int pong_delay; diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/client.cpp index fd86fa9214c..11ac9a66692 100755 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/client.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/client.cpp @@ -2,7 +2,6 @@ #include "TestC.h" #include "ace/Get_Opt.h" -#include "ace/OS.h" #include "ace/Vector_T.h" const ACE_TCHAR* group_ior = ACE_TEXT ("file:://group.ior"); diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp index 5088b562343..96990ac6304 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp @@ -1,16 +1,14 @@ // $Id$ #include "common.h" -#include "ace/OS.h" - namespace CosNotifyCommImpl{ - class StructuredPushSupplier: public virtual POA_CosNotifyComm:: StructuredPushSupplier + class StructuredPushSupplier: public virtual POA_CosNotifyComm:: StructuredPushSupplier { public: void disconnect_structured_push_supplier() {}; - void subscription_change( const CosNotification::EventTypeSeq&, + void subscription_change( const CosNotification::EventTypeSeq&, const CosNotification::EventTypeSeq&) {}; @@ -38,7 +36,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CosNotifyChannelAdmin::EventChannel_var ec = get_event_channel(orb.in()); //Instanciating the Supplier - CosNotifyComm::StructuredPushSupplier_var sps = + CosNotifyComm::StructuredPushSupplier_var sps = CosNotifyComm::StructuredPushSupplier::_nil(); @@ -102,17 +100,17 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) event.remainder_of_body <<= ""; std::cout << "Sending a demo event...," << std::endl; - std::cout << "event.header.fixed_header.event_type.domain_name = " - << event.header.fixed_header.event_type.domain_name + std::cout << "event.header.fixed_header.event_type.domain_name = " + << event.header.fixed_header.event_type.domain_name << std::endl; - std::cout << "event.header.fixed_header.event_type.type_name = " + std::cout << "event.header.fixed_header.event_type.type_name = " << event.header.fixed_header.event_type.type_name << std::endl; try{ ppc->push_structured_event(event); - } + } catch (CORBA::SystemException& se) { std::cerr << "System exception occurred during push: " diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp index 5f6a4383598..7d3320078be 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp @@ -1,7 +1,6 @@ // $Id$ #include "ace/ARGV.h" -#include "ace/OS.h" #include "ace/Service_Config.h" #include "ace/Log_Msg.h" diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp index 5ee3773c559..6411254316b 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp @@ -1,17 +1,15 @@ // $Id$ #include "common.h" -#include "ace/OS.h" - namespace CosNotifyCommImpl{ - class StructuredPushSupplier: public virtual POA_CosNotifyComm:: StructuredPushSupplier + class StructuredPushSupplier: public virtual POA_CosNotifyComm:: StructuredPushSupplier { public: void disconnect_structured_push_supplier() { }; - void subscription_change( const CosNotification::EventTypeSeq&, + void subscription_change( const CosNotification::EventTypeSeq&, const CosNotification::EventTypeSeq&) {}; @@ -39,7 +37,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CosNotifyChannelAdmin::EventChannel_var ec = get_event_channel(orb.in()); //Instanciating the Supplier - CosNotifyComm::StructuredPushSupplier_var sps = + CosNotifyComm::StructuredPushSupplier_var sps = CosNotifyComm::StructuredPushSupplier::_nil(); @@ -107,18 +105,18 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) event.remainder_of_body <<= data; std::cout << "Sending a demo event...," << std::endl; - std::cout << "event.header.fixed_header.event_type.domain_name = " - << event.header.fixed_header.event_type.domain_name + std::cout << "event.header.fixed_header.event_type.domain_name = " + << event.header.fixed_header.event_type.domain_name << std::endl; - std::cout << "event.header.fixed_header.event_type.type_name = " + std::cout << "event.header.fixed_header.event_type.type_name = " << event.header.fixed_header.event_type.type_name << std::endl; - std::cout << "event.filterable_data: data=" << data << std::endl; + std::cout << "event.filterable_data: data=" << data << std::endl; try{ ppc->push_structured_event(event); - } + } catch (CORBA::SystemException& se) { std::cerr << "System exception occurred during push: " diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp index 4c74caed6df..a7c028f6052 100644 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp @@ -2,7 +2,6 @@ #include "Notify_Structured_Push_Consumer.h" #include "Notify_Test_Client.h" -#include "ace/OS.h" Notify_Structured_Push_Consumer::Notify_Structured_Push_Consumer ( const char* name, diff --git a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp index 374c542d4c5..918089f3cb5 100644 --- a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp +++ b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp @@ -2,9 +2,6 @@ #include "Filter.h" #include "ace/Get_Opt.h" -#include "ace/OS.h" - - #define NOTIFY_FACTORY_NAME "NotifyEventChannelFactory" #define NAMING_SERVICE_NAME "NameService" diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp index 3669f3987a1..42a82c83796 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp @@ -1,7 +1,6 @@ //$Id$ #include "Task_Stats.h" -#include "ace/OS.h" #include "ace/Log_Msg.h" #if !defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp index f8c152bd297..b8727bcd8c5 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp @@ -5,7 +5,6 @@ #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" #include "ace/Synch.h" -#include "ace/OS.h" #include "ace/Dynamic_Service.h" #include "tao/Strategies/advanced_resource.h" #include "tao/Messaging/Messaging.h" diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp b/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp index def6132f088..21233a9ff7a 100644 --- a/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp +++ b/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp @@ -5,7 +5,6 @@ #include "TestInf/AppShutdown.h" #include "TestInf/TestAppExceptionC.h" #include "TestServant/Foo_ClientEngine.h" -#include "ace/OS.h" #include "ace/Get_Opt.h" #include "ace/Time_Value.h" #include "ace/High_Res_Timer.h" diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h b/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h index 88aa3b38408..f0ab9e023b2 100644 --- a/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h +++ b/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h @@ -6,10 +6,8 @@ #include "TestInf/TestAppExceptionC.h" #include "tao/PortableServer/PortableServer.h" #include "tao/ORB.h" -#include "ace/OS.h" #include "ace/Log_Msg.h" - template <typename T> struct RefHelper { diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp index 195be3b7c02..15fc4cd2002 100644 --- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp +++ b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp @@ -1,12 +1,8 @@ // $Id$ #include "Foo_i.h" #include "TestInf/AppShutdown.h" -#include "ace/OS.h" #include "ace/Time_Value.h" - - - Foo_i::Foo_i() { for (unsigned i = 0; i < 5; i++) diff --git a/TAO/tests/Bug_2677_Regression/server.cpp b/TAO/tests/Bug_2677_Regression/server.cpp index bcfdd64fc62..b2554023954 100644 --- a/TAO/tests/Bug_2677_Regression/server.cpp +++ b/TAO/tests/Bug_2677_Regression/server.cpp @@ -1,5 +1,5 @@ // $Id$ -#include "ace/OS.h" + #include "ace/Service_Config.h" #include "ace/Log_Msg.h" diff --git a/TAO/tests/Bug_2936_Regression/bug2936.cpp b/TAO/tests/Bug_2936_Regression/bug2936.cpp index dd7c7a4790d..17668d194b6 100644 --- a/TAO/tests/Bug_2936_Regression/bug2936.cpp +++ b/TAO/tests/Bug_2936_Regression/bug2936.cpp @@ -1,6 +1,5 @@ // $Id$ -#include "ace/OS.h" #include "ace/Service_Config.h" #include "ace/Log_Msg.h" diff --git a/TAO/tests/Bug_3251_Regression/server.cpp b/TAO/tests/Bug_3251_Regression/server.cpp index 776e96c30b1..42e582784a2 100644 --- a/TAO/tests/Bug_3251_Regression/server.cpp +++ b/TAO/tests/Bug_3251_Regression/server.cpp @@ -1,7 +1,6 @@ // $Id$ #include "ace/ARGV.h" -#include "ace/OS.h" #include "ace/Reactor.h" #include "ace/Signal.h" #include "ace/Service_Config.h" diff --git a/TAO/tests/Bug_3531_Regression/client.cpp b/TAO/tests/Bug_3531_Regression/client.cpp index d154e215aa1..c614d2cab9e 100644 --- a/TAO/tests/Bug_3531_Regression/client.cpp +++ b/TAO/tests/Bug_3531_Regression/client.cpp @@ -2,7 +2,6 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" -#include "ace/OS.h" #include "testS.h" const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); diff --git a/TAO/tests/Bug_3531_Regression/test_i.cpp b/TAO/tests/Bug_3531_Regression/test_i.cpp index f21238259c7..fba6b1837aa 100644 --- a/TAO/tests/Bug_3531_Regression/test_i.cpp +++ b/TAO/tests/Bug_3531_Regression/test_i.cpp @@ -2,7 +2,6 @@ #include "test_i.h" #include "tao/debug.h" -#include "ace/OS.h" #include "tao/ORB_Core.h" #include "tao/LF_Strategy.h" #include "ace/Reactor.h" diff --git a/TAO/tests/Bug_3542_Regression/server.cpp b/TAO/tests/Bug_3542_Regression/server.cpp index f660feaf1f3..88ec7288fe0 100644 --- a/TAO/tests/Bug_3542_Regression/server.cpp +++ b/TAO/tests/Bug_3542_Regression/server.cpp @@ -1,13 +1,11 @@ // $Id$ #include "ace/ARGV.h" -#include "ace/OS.h" #include "ace/Reactor.h" #include "ace/Signal.h" #include "ace/Service_Config.h" #include "ace/Log_Msg.h" - ACE_TCHAR const * const scpc_loadOrb = ACE_DYNAMIC_SERVICE_DIRECTIVE( "testDllOrb", "Bug_3542", diff --git a/TAO/tests/Bug_3647_Regression/Backend_Impl.cpp b/TAO/tests/Bug_3647_Regression/Backend_Impl.cpp index 1ec74f02486..657a24436bf 100644 --- a/TAO/tests/Bug_3647_Regression/Backend_Impl.cpp +++ b/TAO/tests/Bug_3647_Regression/Backend_Impl.cpp @@ -2,7 +2,6 @@ // $Id$ #include "Backend_Impl.h" -#include "ace/OS.h" Bug_3647_Regression::Backend_Impl:: Backend_Impl(CORBA::ORB_ptr orb, bool verbose) diff --git a/TAO/tests/Bug_3766_Regression/client.cpp b/TAO/tests/Bug_3766_Regression/client.cpp index c1690c24f22..0999ff151a5 100644 --- a/TAO/tests/Bug_3766_Regression/client.cpp +++ b/TAO/tests/Bug_3766_Regression/client.cpp @@ -1,7 +1,6 @@ // $Id$ #include "TestC.h" -#include "ace/OS.h" #include "ace/Get_Opt.h" const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); diff --git a/TAO/tests/Bug_3766_Regression/server.cpp b/TAO/tests/Bug_3766_Regression/server.cpp index f724fa9bcf3..899b54790f0 100644 --- a/TAO/tests/Bug_3766_Regression/server.cpp +++ b/TAO/tests/Bug_3766_Regression/server.cpp @@ -1,7 +1,6 @@ // $Id$ #include "TestI.h" -#include "ace/OS.h" #include "ace/Get_Opt.h" const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior"); diff --git a/TAO/tests/Bug_3812_Regression/Bug_3812_Regression.cpp b/TAO/tests/Bug_3812_Regression/Bug_3812_Regression.cpp index 9f4e9291bed..44ba44797f1 100644 --- a/TAO/tests/Bug_3812_Regression/Bug_3812_Regression.cpp +++ b/TAO/tests/Bug_3812_Regression/Bug_3812_Regression.cpp @@ -4,7 +4,6 @@ #include "ace/SString.h" #include "ace/Manual_Event.h" #include "ace/Task.h" -#include "ace/OS.h" #include "tao/Transport_Cache_Manager_T.h" #include "tao/ORB.h" @@ -53,16 +52,16 @@ parse_args (int argc, ACE_TCHAR *argv[]) class Client_Task : public ACE_Task_Base { - public : + public : Client_Task (mock_tdi& tdi, mock_transport& trans) : tdi_ (tdi), trans_ (trans) { } - - + + ~Client_Task () {}; - + void process_listen_point () { this->trans_.purge_entry (); @@ -73,7 +72,7 @@ class Client_Task : public ACE_Task_Base this->trans_.make_idle(); delete x; } - + int svc () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, test_lock); @@ -81,8 +80,8 @@ class Client_Task : public ACE_Task_Base test_condition.signal (); return 0; }; - - + + private: mock_tdi& tdi_; mock_transport& trans_; @@ -118,9 +117,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { ACE_ERROR ((LM_ERROR, "Error activating client task\n")); } - + client_task.wait (); - + orb->destroy (); } diff --git a/TAO/tests/Bug_3853_Regression/Hello_i.cpp b/TAO/tests/Bug_3853_Regression/Hello_i.cpp index b354ffa12c0..c3d07884ff4 100644 --- a/TAO/tests/Bug_3853_Regression/Hello_i.cpp +++ b/TAO/tests/Bug_3853_Regression/Hello_i.cpp @@ -3,7 +3,6 @@ // #include "Hello_i.h" -#include "ace/OS.h" #include <iostream> using namespace std; @@ -30,11 +29,11 @@ void Demo_HelloWorld_i::sayHello ( -void +void Demo_HelloWorld_i::shutdown() { ACE_DEBUG ((LM_DEBUG, "(%P|%t)Demo_HelloWorld_i::shutdown \n")); this->orb_->shutdown (0); } - + diff --git a/TAO/tests/Bug_3853_Regression/client.cpp b/TAO/tests/Bug_3853_Regression/client.cpp index cf192bcfad5..5fe9e1aff4b 100644 --- a/TAO/tests/Bug_3853_Regression/client.cpp +++ b/TAO/tests/Bug_3853_Regression/client.cpp @@ -7,7 +7,6 @@ #include "tao/PI_Server/PI_Server.h" #include "tao/debug.h" #include "ace/Task.h" -#include "ace/OS.h" #include "ace/Get_Opt.h" #include <iostream> diff --git a/TAO/tests/COIOP/Hello.h b/TAO/tests/COIOP/Hello.h index 556409e5d00..1d5e27d075f 100644 --- a/TAO/tests/COIOP/Hello.h +++ b/TAO/tests/COIOP/Hello.h @@ -8,8 +8,6 @@ #include "TestS.h" -#include "ace/OS.h" - /// Implement the Test::Hello interface class Hello : public virtual POA_Test::Hello diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp index 5e37ac5617e..4ca2dc82800 100644 --- a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp +++ b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp @@ -6,7 +6,6 @@ #include "TestAppExceptionC.h" #include "Foo_B_SimpleClientEngine.h" #include "Callback_i.h" -#include "ace/OS.h" #include "ace/Get_Opt.h" // To force static load the service. #include "tao/PI/PI.h" diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h index e3b8a8a84eb..1799f1032f3 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h @@ -6,7 +6,6 @@ #include "TestAppExceptionC.h" #include "tao/PortableServer/PortableServer.h" #include "tao/ORB.h" -#include "ace/OS.h" #include "ace/Log_Msg.h" diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp index f857655fb0c..9d497df00c9 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp @@ -5,7 +5,6 @@ #include "TestAppExceptionC.h" #include "AppHelper.h" #include "ace/Log_Msg.h" -#include "ace/OS.h" const char* ONEWAY_ARG_TEST_STR = "TEST"; diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp index e6075f9cec6..0c41b14b0bc 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp @@ -5,7 +5,6 @@ #include "TestAppExceptionC.h" #include "AppHelper.h" #include "ace/Log_Msg.h" -#include "ace/OS.h" extern const char* ONEWAY_ARG_TEST_STR; diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp index 6cd944f8473..5e90582eff3 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp @@ -1,11 +1,10 @@ // $Id$ + #include "Foo_B_i.h" #include "AppShutdown.h" #include "TestAppExceptionC.h" -#include "ace/OS.h" #include "ace/SString.h" - Foo_B_i::Foo_B_i() : error_count_ (0) { diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp index 285c20bb698..1cd428ddf23 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp @@ -5,7 +5,6 @@ #include "AppShutdown.h" #include "TestAppExceptionC.h" #include "Foo_A_ClientEngine.h" -#include "ace/OS.h" #include "ace/Get_Opt.h" // To force static load the service. #include "tao/PI/PI.h" diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp index 83795c6e49c..87d51f92e3b 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp @@ -7,7 +7,6 @@ #include "Foo_B_ClientEngine.h" #include "Foo_B_ClientEngine.h" #include "Callback_i.h" -#include "ace/OS.h" #include "ace/Get_Opt.h" // To force static load the service. #include "tao/PI/PI.h" diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp index 3614fd0350c..93b84ad02dd 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp @@ -7,7 +7,6 @@ #include "Foo_C_Custom_ClientEngine.h" #include "Foo_C_ClientEngine.h" #include "Foo_C_Statistics.h" -#include "ace/OS.h" #include "ace/Get_Opt.h" // To force static load the service. #include "tao/PI/PI.h" diff --git a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp index 3fbe805145d..74ac6090595 100644 --- a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp +++ b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp @@ -19,7 +19,6 @@ // ============================================================================ #include "WUCS4_UTF16.h" -#include "ace/OS.h" // **************************************************************** @@ -580,7 +579,7 @@ WUCS4_UTF16::write_measured_wchar_array (ACE_OutputCDR & cdr, sbpos += encode_utf16 (& sb[sbpos], x[i]); } #if defined (ACE_ENABLE_SWAP_ON_WRITE) - // NOTE this will rarely be enabled. See the comments in ace/OS.h + // @note this will rarely be enabled. if (cdr.do_byte_swap()) { // note can't use swap_2_array because in-place swaps are not safe :-< diff --git a/TAO/tests/Collocation_Exception_Test/Hello.h b/TAO/tests/Collocation_Exception_Test/Hello.h index 3fef01855b0..4f4b64b9646 100644 --- a/TAO/tests/Collocation_Exception_Test/Hello.h +++ b/TAO/tests/Collocation_Exception_Test/Hello.h @@ -13,8 +13,6 @@ # pragma warning (disable:4250) #endif /* _MSC_VER */ -#include "ace/OS.h" - /// Implement the Test::Hello interface class Hello : public virtual POA_Test::Hello diff --git a/TAO/tests/Collocation_Oneway_Tests/Hello.h b/TAO/tests/Collocation_Oneway_Tests/Hello.h index 8bc4edf7d76..afd234e120e 100644 --- a/TAO/tests/Collocation_Oneway_Tests/Hello.h +++ b/TAO/tests/Collocation_Oneway_Tests/Hello.h @@ -13,8 +13,6 @@ # pragma warning (disable:4250) #endif /* _MSC_VER */ -#include "ace/OS.h" - /// Implement the Test::Hello interface class Hello : public virtual POA_Test::Hello diff --git a/TAO/tests/Collocation_Tests/Hello.h b/TAO/tests/Collocation_Tests/Hello.h index 556409e5d00..1d5e27d075f 100644 --- a/TAO/tests/Collocation_Tests/Hello.h +++ b/TAO/tests/Collocation_Tests/Hello.h @@ -8,8 +8,6 @@ #include "TestS.h" -#include "ace/OS.h" - /// Implement the Test::Hello interface class Hello : public virtual POA_Test::Hello diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Hello.h b/TAO/tests/DII_Collocation_Tests/oneway/Hello.h index 70d46f4813a..e2f9c1c9a8c 100644 --- a/TAO/tests/DII_Collocation_Tests/oneway/Hello.h +++ b/TAO/tests/DII_Collocation_Tests/oneway/Hello.h @@ -8,8 +8,6 @@ #include "TestS.h" -#include "ace/OS.h" - class Test_Simple_Test_i : public virtual POA_Test::Simple_Test { diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Hello.h b/TAO/tests/DII_Collocation_Tests/twoway/Hello.h index 4dae7429cb1..059d4f52de8 100644 --- a/TAO/tests/DII_Collocation_Tests/twoway/Hello.h +++ b/TAO/tests/DII_Collocation_Tests/twoway/Hello.h @@ -8,8 +8,6 @@ #include "TestS.h" -#include "ace/OS.h" - class Test_Simple_Test_i : public virtual POA_Test::Simple_Test { diff --git a/TAO/tests/DynAny_Test/test_wrapper.cpp b/TAO/tests/DynAny_Test/test_wrapper.cpp index e51088848d8..e2e846a0a76 100644 --- a/TAO/tests/DynAny_Test/test_wrapper.cpp +++ b/TAO/tests/DynAny_Test/test_wrapper.cpp @@ -16,7 +16,6 @@ #define TEST_WRAPPER_CPP #include "test_wrapper.h" -#include "ace/OS.h" #include "ace/Log_Msg.h" // Constructor diff --git a/TAO/tests/File_IO/client.cpp b/TAO/tests/File_IO/client.cpp index efe5cecbcc9..46a1552f913 100644 --- a/TAO/tests/File_IO/client.cpp +++ b/TAO/tests/File_IO/client.cpp @@ -19,7 +19,6 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" -#include "ace/OS.h" #include "ace/SString.h" #include "ace/Thread_Manager.h" diff --git a/TAO/tests/ForwardOnceUponException/client.cpp b/TAO/tests/ForwardOnceUponException/client.cpp index 41a4cc13579..a4291dd0bba 100755 --- a/TAO/tests/ForwardOnceUponException/client.cpp +++ b/TAO/tests/ForwardOnceUponException/client.cpp @@ -3,7 +3,6 @@ #include "testC.h" #include "ace/Get_Opt.h" #include "ace/Task.h" -#include "ace/OS.h" #include "ace/streams.h" #include "tao/Invocation_Utils.h" diff --git a/TAO/tests/Hang_Shutdown/client.cpp b/TAO/tests/Hang_Shutdown/client.cpp index 2fcc66b4394..aad47176ea7 100644 --- a/TAO/tests/Hang_Shutdown/client.cpp +++ b/TAO/tests/Hang_Shutdown/client.cpp @@ -2,7 +2,6 @@ #include "TestC.h" #include "ace/Get_Opt.h" -#include "ace/OS.h" #include "ace/Task.h" #include "ace/Profile_Timer.h" diff --git a/TAO/tests/Nested_Event_Loop/client.cpp b/TAO/tests/Nested_Event_Loop/client.cpp index f215dd2833d..4f1a972f14f 100644 --- a/TAO/tests/Nested_Event_Loop/client.cpp +++ b/TAO/tests/Nested_Event_Loop/client.cpp @@ -2,7 +2,6 @@ #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" -#include "ace/OS.h" #include "test_i.h" #include "tao/Strategies/advanced_resource.h" diff --git a/TAO/tests/Nested_Upcall_Crash/Clock_Ticks.h b/TAO/tests/Nested_Upcall_Crash/Clock_Ticks.h index 162dec87a9f..ea090bb72e8 100644 --- a/TAO/tests/Nested_Upcall_Crash/Clock_Ticks.h +++ b/TAO/tests/Nested_Upcall_Crash/Clock_Ticks.h @@ -9,8 +9,6 @@ * */ -#include "ace/OS.h" - namespace Clock_Ticks { /// Return the number of clock ticks per second diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp b/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp index 33d4a2af1ca..87d4d454945 100644 --- a/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp +++ b/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp @@ -5,7 +5,6 @@ * $Id$ */ -#include "ace/OS.h" #include "ace/Service_Config.h" #include "tao/corba.h" diff --git a/TAO/tests/POA/Bug_2511_Regression/server.cpp b/TAO/tests/POA/Bug_2511_Regression/server.cpp index ef75c7a91c7..c0f63a4e5cf 100644 --- a/TAO/tests/POA/Bug_2511_Regression/server.cpp +++ b/TAO/tests/POA/Bug_2511_Regression/server.cpp @@ -18,7 +18,6 @@ //========================================================================= #include "testS.h" -#include "ace/OS.h" #include "tao/PortableServer/ServantLocatorC.h" #include "tao/CDR.h" diff --git a/TAO/tests/POA/Default_Servant2/client.cpp b/TAO/tests/POA/Default_Servant2/client.cpp index d49471dd3b8..8923a4cc648 100644 --- a/TAO/tests/POA/Default_Servant2/client.cpp +++ b/TAO/tests/POA/Default_Servant2/client.cpp @@ -20,7 +20,6 @@ #include "ace/streams.h" #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" -#include "ace/OS.h" #include "ace/SString.h" static const ACE_TCHAR *iorfile = 0; diff --git a/TAO/tests/POA/Explicit_Activation/Alt_Resources/Alt_Resource_Factory.h b/TAO/tests/POA/Explicit_Activation/Alt_Resources/Alt_Resource_Factory.h index f0a316eee8e..898bad28526 100644 --- a/TAO/tests/POA/Explicit_Activation/Alt_Resources/Alt_Resource_Factory.h +++ b/TAO/tests/POA/Explicit_Activation/Alt_Resources/Alt_Resource_Factory.h @@ -7,8 +7,6 @@ #ifndef Alt_Resource_Factory_EXPORT_H #define Alt_Resource_Factory_EXPORT_H -#include "ace/OS.h" - #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ diff --git a/TAO/tests/ZIOP/client.cpp b/TAO/tests/ZIOP/client.cpp index 9621ac3857e..7418e29bb87 100644 --- a/TAO/tests/ZIOP/client.cpp +++ b/TAO/tests/ZIOP/client.cpp @@ -3,7 +3,6 @@ #include "TestC.h" #include "ace/Get_Opt.h" #include "tao/ZIOP/ZIOP.h" -#include "ace/OS.h" #include "tao/Compression/zlib/ZlibCompressor_Factory.h" #include "tao/Compression/bzip2/Bzip2Compressor_Factory.h" #include "TestCompressor//TestCompressor_Factory.h" |