diff options
277 files changed, 839 insertions, 321 deletions
diff --git a/ChangeLog b/ChangeLog index a5e3dae8ab0..7a02475f16e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +Tue Nov 4 04:55:40 UTC 2003 Don Hinton <dhinton@dresystems.com> + + * ace/CDR_Stream.h: + Removed #include of OS_Memory.h and OS_String.h. + + * ace/Object_Manager.h: + Added #includes needed due to subsetting. + + * performance-tests/SCTP/SOCK_SEQPACK_srv.cpp: + * tests/CDR_Test.cpp: + Added #includes needed due to subsetting. + + * ace/ace.mpc: + Removed commented out Synch.cpp--comments aren't supported. + + * ace/Makefile.ace: + Removed Synch and added new files, e.g., Mutex, etc... + Mon Nov 3 22:11:24 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * ace/config-sunos5.5.h: Added a note about SunCC 5.0. diff --git a/TAO/ChangeLog b/TAO/ChangeLog index ecf9f36fe27..0202738e899 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,278 @@ +Tue Nov 4 04:55:40 UTC 2003 Don Hinton <dhinton@dresystems.com> + + * TAO_IDL/ast/ast_array.cpp: + * TAO_IDL/ast/ast_decl.cpp: + * TAO_IDL/ast/ast_generator.cpp: + * TAO_IDL/ast/ast_root.cpp: + * TAO_IDL/ast/ast_sequence.cpp: + * TAO_IDL/ast/ast_string.cpp: + * TAO_IDL/ast/ast_type.cpp: + * TAO_IDL/be/be_global.cpp: + * TAO_IDL/be/be_helper.cpp: + * TAO_IDL/be/be_interface.cpp: + * TAO_IDL/be/be_predefined_type.cpp: + * TAO_IDL/be/be_sunsoft.cpp: + * TAO_IDL/be/be_visitor_valuetype/arglist.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype.cpp: + * TAO_IDL/be_include/be_codegen.h: + * TAO_IDL/be_include/be_helper.h: + * TAO_IDL/be_include/be_stream_factory.h: + * TAO_IDL/be_include/be_visitor_factory.h: + * TAO_IDL/driver/drv_args.cpp: + * TAO_IDL/driver/drv_preproc.cpp: + * TAO_IDL/fe/fe_lookup.cpp: + * TAO_IDL/fe/y.tab.cpp: + * TAO_IDL/include/ast_attribute.h: + * TAO_IDL/include/ast_union_label.h: + * TAO_IDL/include/idl_global.h: + * TAO_IDL/include/utl_identifier.h: + * TAO_IDL/include/utl_idlist.h: + * TAO_IDL/include/utl_indenter.h: + * TAO_IDL/include/utl_string.h: + * TAO_IDL/include/utl_strlist.h: + * TAO_IDL/util/utl_global.cpp: + * TAO_IDL/util/utl_idlist.cpp: + * TAO_IDL/util/utl_indenter.cpp: + * TAO_IDL/util/utl_list.cpp: + * TAO_IDL/util/utl_scope.cpp: + * TAO_IDL/util/utl_strlist.cpp: + * examples/Callback_Quoter/Consumer_Input_Handler.cpp: + * examples/Callback_Quoter/Supplier_i.cpp: + * examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp: + * examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp: + * examples/Content_Server/AMI_Observer/Callback_i.cpp: + * examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp: + * examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp: + * examples/Content_Server/SMI_Iterator/client.cpp: + * examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp: + * examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp: + * examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp: + * examples/Kokyu_dsrt_schedulers/Task_Stats.h: + * examples/Load_Balancing/Load_Balancer_i.h: + * examples/Load_Balancing/Load_Balancing_Service.cpp: + * examples/Load_Balancing_persistent/Load_Balancing_Service.cpp: + * examples/Logging/Logging_Test_i.cpp: + * examples/Persistent_Grid/Simple_util.cpp: + * examples/PluggableUDP/tests/Basic/UDP_i.h: + * examples/RTCORBA/Activity/Activity.cpp: + * examples/RTCORBA/Activity/Task_Stats.h: + * examples/RTScheduling/Task_Stats.h: + * examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp: + * examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp: + * examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp: + * examples/Simulator/Event_Supplier/DualEC_Sup.cpp: + * examples/Simulator/Event_Supplier/Event_Sup.cpp: + * examples/Simulator/Event_Supplier/Logging_Sup.cpp: + * orbsvcs/Event_Service/Event_Service.cpp: + * orbsvcs/IFR_Service/drv_args_ifr.cpp: + * orbsvcs/IFR_Service/drv_preproc_ifr.cpp: + * orbsvcs/ImplRepo_Service/Options.cpp: + * orbsvcs/ImplRepo_Service/tao_imr_i.cpp: + * orbsvcs/LoadBalancer/LoadManager.cpp: + * orbsvcs/LoadBalancer/LoadMonitor.cpp: + * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp: + * orbsvcs/Scheduling_Service/Scheduling_Service.cpp: + * orbsvcs/Time_Service/Server_i.cpp: + * orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp: + * orbsvcs/examples/RtEC/Kokyu/Service.cpp: + * orbsvcs/examples/RtEC/Simple/Supplier.cpp: + * orbsvcs/orbsvcs/Event_Utilities.cpp: + * orbsvcs/orbsvcs/AV/AVStreams_i.cpp: + * orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp: + * orbsvcs/orbsvcs/AV/RTCP.cpp: + * orbsvcs/orbsvcs/AV/RTCP_Packet.h: + * orbsvcs/orbsvcs/AV/RTP.cpp: + * orbsvcs/orbsvcs/AV/TCP.cpp: + * orbsvcs/orbsvcs/AV/UDP.cpp: + * orbsvcs/orbsvcs/AV/default_resource.cpp: + * orbsvcs/orbsvcs/AV/media_timer.cpp: + * orbsvcs/orbsvcs/AV/media_timer.h: + * orbsvcs/orbsvcs/AV/sfp.cpp: + * orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp: + * orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.cpp: + * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h: + * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.i: + * orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp: + * orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl: + * orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp: + * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp: + * orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp: + * orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp: + * orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp: + * orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp: + * orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp: + * orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp: + * orbsvcs/orbsvcs/Log/Log_i.cpp: + * orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp: + * orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h: + * orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp: + * orbsvcs/orbsvcs/Notify/AdminProperties.h: + * orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp: + * orbsvcs/orbsvcs/Notify/ETCL_Filter.h: + * orbsvcs/orbsvcs/Notify/POA_Helper.cpp: + * orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp: + * orbsvcs/orbsvcs/Notify/Timer_Queue.h: + * orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.cpp: + * orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h: + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp: + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp: + * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp: + * orbsvcs/orbsvcs/Sched/DynSched.cpp: + * orbsvcs/orbsvcs/Sched/DynSched.h: + * orbsvcs/orbsvcs/Sched/SchedEntry.cpp: + * orbsvcs/orbsvcs/Sched/Scheduler.cpp: + * orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp: + * orbsvcs/orbsvcs/Sched/Scheduler_Generic.h: + * orbsvcs/orbsvcs/Time/Timer_Helper.cpp: + * orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp: + * orbsvcs/orbsvcs/Trader/Constraint_y.cpp: + * orbsvcs/orbsvcs/Trader/Interpreter.cpp: + * orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp: + * orbsvcs/orbsvcs/Trader/Trader.cpp: + * orbsvcs/tests/AVStreams/Latency/ping.h: + * orbsvcs/tests/Concurrency/CC_client.cpp: + * orbsvcs/tests/Concurrency/CC_command.cpp: + * orbsvcs/tests/CosEvent/Basic/Random.cpp: + * orbsvcs/tests/EC_Multiple/EC_Multiple.cpp: + * orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp: + * orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp: + * orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp: + * orbsvcs/tests/Event/Basic/Random.cpp: + * orbsvcs/tests/Event/Performance/Connect.cpp: + * orbsvcs/tests/Event/lib/Counting_Supplier.cpp: + * orbsvcs/tests/Event/lib/Supplier.cpp: + * orbsvcs/tests/Notify/Blocking/common.cpp: + * orbsvcs/tests/Notify/Discarding/common.cpp: + * orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp: + * orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp: + * orbsvcs/tests/Notify/Ordering/common.cpp: + * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp: + * orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp: + * orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp: + * orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp: + * orbsvcs/tests/Notify/lib/Task_Stats.h: + * orbsvcs/tests/Notify/performance-tests/Filter/common.cpp: + * orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp: + * orbsvcs/tests/RTCosScheduling/Object1_i.cpp: + * orbsvcs/tests/RTCosScheduling/client.cpp: + * orbsvcs/tests/Time/Client_i.cpp: + * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp: + * performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp: + * performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp: + * performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp: + * performance-tests/Cubit/TAO/MT_Cubit/Globals.h: + * performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp: + * performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp: + * performance-tests/Cubit/TAO/MT_Cubit/client.cpp: + * performance-tests/Cubit/TAO/MT_Cubit/server.cpp: + * performance-tests/Memory/IORsize/Memory_Growth.cpp: + * tao/Acceptor_Registry.cpp: + * tao/Adapter.cpp: + * tao/Any.cpp: + * tao/Any_Basic_Impl.cpp: + * tao/Any_Dual_Impl_T.cpp: + * tao/Any_Impl_T.cpp: + * tao/Asynch_Queued_Message.cpp: + * tao/BoundsC.cpp: + * tao/CDR_Encaps_Codec.cpp: + * tao/CORBALOC_Parser.cpp: + * tao/CORBA_String.cpp: + * tao/CurrentC.cpp: + * tao/Exception.cpp: + * tao/GIOPC.cpp: + * tao/IIOP_Connector.cpp: + * tao/IIOP_Endpoint.cpp: + * tao/IIOP_Factory.cpp: + * tao/IIOP_Lite_Factory.cpp: + * tao/IOP_CodecC.cpp: + * tao/Interceptor_List.cpp: + * tao/MCAST_Parser.cpp: + * tao/ORB.cpp: + * tao/ORBInitInfo.cpp: + * tao/ORB_Core.cpp: + * tao/Object_Ref_Table.cpp: + * tao/PolicyC.cpp: + * tao/PollableC.cpp: + * tao/PortableInterceptorC.cpp: + * tao/Sequence.cpp: + * tao/Service_Context.cpp: + * tao/TAOC.cpp: + * tao/TAO_Singleton_Manager.h: + * tao/Tagged_Components.cpp: + * tao/Typecode.cpp: + * tao/WrongTransactionC.cpp: + * tao/default_resource.cpp: + * tao/operation_details.cpp: + * tao/DynamicAny/DynAny_i.cpp: + * tao/DynamicAny/DynCommon.cpp: + * tao/DynamicInterface/Unknown_User_Exception.cpp: + * tao/IFR_Client/IFR_BaseC.cpp: + * tao/IFR_Client/IFR_BasicC.cpp: + * tao/IFR_Client/IFR_ComponentsC.h: + * tao/IFR_Client/IFR_ExtendedC.cpp: + * tao/IORTable/IORTableC.cpp: + * tao/PortableServer/ImR_LocatorC.cpp: + * tao/PortableServer/ImplRepoC.cpp: + * tao/PortableServer/Key_Adapters.cpp: + * tao/PortableServer/POA.cpp: + * tao/PortableServer/ServerRequestInfo.cpp: + * tao/RTCORBA/Continuous_Priority_Mapping.h: + * tao/RTCORBA/RTCORBAC.cpp: + * tao/RTCORBA/RT_ORB_Loader.cpp: + * tao/RTPortableServer/RTPortableServerC.cpp: + * tao/RTScheduling/Current.cpp: + * tao/RTScheduling/RTSchedulerC.cpp:: + * tao/RTScheduling/Request_Interceptor.cpp: + * tao/Strategies/DIOP_Connector.cpp: + * tao/Strategies/DIOP_Factory.cpp: + * tao/Strategies/SHMIOP_Connector.cpp: + * tao/Strategies/SHMIOP_Factory.cpp: + * tao/Strategies/UIOP_Connector.cpp: + * tao/Strategies/UIOP_Factory.cpp: + * tao/Strategies/UIOP_Lite_Factory.cpp: + * tao/Strategies/advanced_resource.cpp: + * tao/Valuetype/AbstractBase.h: + * tests/Bug_1269_Regression/Server_Timer.cpp: + * tests/Bug_1270_Regression/Server_Timer.cpp: + * tests/Bug_1361_Regression/Echo.cpp: + * tests/CDR/octet_sequence.cpp: + * tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp: + * tests/CodeSets/simple/client.cpp: + * tests/Codec/client.cpp: + * tests/Exposed_Policies/Policy_Verifier.cpp: + * tests/Exposed_Policies/RT_Properties.cpp: + * tests/IDL_Test/main.cpp: + * tests/InterOp-Naming/INS_test_client.cpp: + * tests/MProfile_Forwarding/Servant_Locator.cpp: + * tests/Multiple_Inheritance/client.cpp: + * tests/Multiple_Inheritance/server.cpp: + * tests/Nested_Event_Loop/test_i.cpp: + * tests/Nested_Upcall_Crash/server.cpp: + * tests/OctetSeq/OctetSeq.cpp: + * tests/POA/Etherealization/Etherealization.cpp: + * tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp: + * tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp: + * tests/POA/Persistent_ID/client.cpp: + * tests/Param_Test/bd_wstr_seq.cpp: + * tests/Param_Test/bd_wstring.cpp: + * tests/Param_Test/param_test_i.cpp: + * tests/Param_Test/ub_wstr_seq.cpp: + * tests/Param_Test/ub_wstring.cpp: + * tests/Portable_Interceptors/AMI/Server_Interceptor.cpp: + * tests/Portable_Interceptors/Benchmark/client.cpp: + * tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp: + * tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp: + * tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp: + * tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp: + * tests/Two_Objects/First_i.h: + * utils/IOR-parser/ior-handler.cpp: + * utils/nslist/nsadd.cpp: + * utils/nslist/nsdel.cpp: + Refactored includes and changed remaining instances of + ACE_OS_String to ACE_OS, and added ACE_OS to many instances of + string functions. + Mon Nov 3 22:46:31 2003 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/be/be_codegen.cpp: diff --git a/TAO/TAO_IDL/ast/ast_array.cpp b/TAO/TAO_IDL/ast/ast_array.cpp index f97e03d81b9..8a747842d7f 100644 --- a/TAO/TAO_IDL/ast/ast_array.cpp +++ b/TAO/TAO_IDL/ast/ast_array.cpp @@ -77,6 +77,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "utl_identifier.h" #include "ace/Log_Msg.h" #include "ace/streams.h" +#include "ace/OS_Memory.h" ACE_RCSID (ast, ast_array, diff --git a/TAO/TAO_IDL/ast/ast_decl.cpp b/TAO/TAO_IDL/ast/ast_decl.cpp index 9f1bbb0673c..be869c40929 100644 --- a/TAO/TAO_IDL/ast/ast_decl.cpp +++ b/TAO/TAO_IDL/ast/ast_decl.cpp @@ -88,6 +88,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "utl_identifier.h" #include "utl_scope.h" #include "utl_err.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID (ast, ast_decl, @@ -1312,8 +1313,8 @@ AST_Decl::last_referenced_as (UTL_ScopedName *n) this->last_referenced_as_ = n; if (idl_global->in_main_file () - && ACE_OS_String::strcmp (n->last_component ()->get_string (), - "ParameterMode") == 0) + && ACE_OS::strcmp (n->last_component ()->get_string (), + "ParameterMode") == 0) { ACE_SET_BITS (idl_global->decls_seen_info_, idl_global->decls_seen_masks.parametermode_seen_); diff --git a/TAO/TAO_IDL/ast/ast_generator.cpp b/TAO/TAO_IDL/ast/ast_generator.cpp index a2c1e55191d..aef8463440c 100644 --- a/TAO/TAO_IDL/ast/ast_generator.cpp +++ b/TAO/TAO_IDL/ast/ast_generator.cpp @@ -93,6 +93,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ast_factory.h" #include "utl_identifier.h" #include "nr_extern.h" +#include "ace/OS_NS_wchar.h" #include "ast_generator.h" diff --git a/TAO/TAO_IDL/ast/ast_root.cpp b/TAO/TAO_IDL/ast/ast_root.cpp index 1a7b6abf855..48faea6e113 100644 --- a/TAO/TAO_IDL/ast/ast_root.cpp +++ b/TAO/TAO_IDL/ast/ast_root.cpp @@ -75,6 +75,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ast_array.h" #include "ast_visitor.h" #include "utl_identifier.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_Memory.h" ACE_RCSID (ast, ast_root, diff --git a/TAO/TAO_IDL/ast/ast_sequence.cpp b/TAO/TAO_IDL/ast/ast_sequence.cpp index 1f6b6a04492..9b10c9fe9f8 100644 --- a/TAO/TAO_IDL/ast/ast_sequence.cpp +++ b/TAO/TAO_IDL/ast/ast_sequence.cpp @@ -76,6 +76,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "utl_identifier.h" #include "ace/Log_Msg.h" #include "ace/streams.h" +#include "ace/OS_Memory.h" +#include "ace/OS_NS_string.h" ACE_RCSID (ast, ast_sequence, diff --git a/TAO/TAO_IDL/ast/ast_string.cpp b/TAO/TAO_IDL/ast/ast_string.cpp index 04152fa4921..4db77acd2de 100644 --- a/TAO/TAO_IDL/ast/ast_string.cpp +++ b/TAO/TAO_IDL/ast/ast_string.cpp @@ -73,6 +73,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ast_expression.h" #include "ast_visitor.h" #include "ace/streams.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_string.h" #include "utl_identifier.h" #include "idl_defines.h" #include "global_extern.h" diff --git a/TAO/TAO_IDL/ast/ast_type.cpp b/TAO/TAO_IDL/ast/ast_type.cpp index f102e29c50c..5fe35d36775 100644 --- a/TAO/TAO_IDL/ast/ast_type.cpp +++ b/TAO/TAO_IDL/ast/ast_type.cpp @@ -73,6 +73,9 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "idl_defines.h" #include "nr_extern.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_Memory.h" ACE_RCSID (ast, ast_type, diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp index d5d52e6a8e1..1bdbe44e006 100644 --- a/TAO/TAO_IDL/be/be_global.cpp +++ b/TAO/TAO_IDL/be/be_global.cpp @@ -21,6 +21,7 @@ #include "utl_string.h" #include "global_extern.h" #include "ace/ACE.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID (be, be_global, diff --git a/TAO/TAO_IDL/be/be_helper.cpp b/TAO/TAO_IDL/be/be_helper.cpp index dcc78a32075..ba3ca3dda57 100644 --- a/TAO/TAO_IDL/be/be_helper.cpp +++ b/TAO/TAO_IDL/be/be_helper.cpp @@ -22,6 +22,7 @@ #include "be_helper.h" #include "be_codegen.h" #include "idl_defines.h" +#include "ace/OS_NS_string.h" ACE_RCSID (be, be_helper, diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp index 2287b932d51..58ab7d51aaf 100644 --- a/TAO/TAO_IDL/be/be_interface.cpp +++ b/TAO/TAO_IDL/be/be_interface.cpp @@ -38,6 +38,7 @@ #include "nr_extern.h" #include "ace/Process.h" +#include "ace/OS_NS_time.h" ACE_RCSID (be, be_interface, diff --git a/TAO/TAO_IDL/be/be_predefined_type.cpp b/TAO/TAO_IDL/be/be_predefined_type.cpp index af303cf6cbd..3d155aa2bbb 100644 --- a/TAO/TAO_IDL/be/be_predefined_type.cpp +++ b/TAO/TAO_IDL/be/be_predefined_type.cpp @@ -26,6 +26,7 @@ #include "ace/Log_Msg.h" #include "ace/ACE.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID (be, be_predefined_type, diff --git a/TAO/TAO_IDL/be/be_sunsoft.cpp b/TAO/TAO_IDL/be/be_sunsoft.cpp index 08f6588da15..0345b7cef42 100644 --- a/TAO/TAO_IDL/be/be_sunsoft.cpp +++ b/TAO/TAO_IDL/be/be_sunsoft.cpp @@ -5,6 +5,8 @@ #include "utl_identifier.h" #include "utl_idlist.h" #include "utl_string.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_string.h" ACE_RCSID (be, be_sunsoft, diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp index 8348ddda450..6a42ab4eff7 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp @@ -49,7 +49,7 @@ be_visitor_obv_operation_arglist::is_amh_exception_holder (be_operation *node) if (iface != 0) { - if (ACE_OS_String::strncmp (iface->local_name (), "AMH_", 4) == 0) + if (ACE_OS::strncmp (iface->local_name (), "AMH_", 4) == 0) { const char *last_E = ACE_OS::strrchr (iface->full_name (), 'E'); diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp index 31bc0162f9a..0ea3ead5c8c 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp @@ -988,13 +988,13 @@ be_visitor_valuetype::obv_have_ref_counter (be_valuetype* node) idl_bool be_visitor_valuetype::is_amh_exception_holder (be_valuetype *node) { - if (ACE_OS_String::strncmp (node->local_name (), "AMH_", 4) == 0) + if (ACE_OS::strncmp (node->local_name (), "AMH_", 4) == 0) { const char *last_E = - ACE_OS_String::strrchr (node->full_name (), 'E'); + ACE_OS::strrchr (node->full_name (), 'E'); if (last_E != 0 - && ACE_OS_String::strcmp (last_E, "ExceptionHolder") == 0) + && ACE_OS::strcmp (last_E, "ExceptionHolder") == 0) { return I_TRUE; } diff --git a/TAO/TAO_IDL/be_include/be_codegen.h b/TAO/TAO_IDL/be_include/be_codegen.h index 9d05e3576b7..7c7097833bf 100644 --- a/TAO/TAO_IDL/be_include/be_codegen.h +++ b/TAO/TAO_IDL/be_include/be_codegen.h @@ -20,7 +20,7 @@ #define TAO_BE_CODEGEN_H #include "ace/Singleton.h" -#include "ace/Synch.h" +#include "ace/Synch_Traits.h" #include "TAO_IDL_BE_Export.h" class TAO_Visitor_Factory; diff --git a/TAO/TAO_IDL/be_include/be_helper.h b/TAO/TAO_IDL/be_include/be_helper.h index 11f82584e6c..07866fa960a 100644 --- a/TAO/TAO_IDL/be_include/be_helper.h +++ b/TAO/TAO_IDL/be_include/be_helper.h @@ -24,9 +24,6 @@ #define TAO_BE_OUTSTRM_H #include "ace/CDR_Base.h" -#include "ace/OS.h" - -#include <stdio.h> class Identifier; class UTL_IdList; diff --git a/TAO/TAO_IDL/be_include/be_stream_factory.h b/TAO/TAO_IDL/be_include/be_stream_factory.h index 354d5730835..661342632c5 100644 --- a/TAO/TAO_IDL/be_include/be_stream_factory.h +++ b/TAO/TAO_IDL/be_include/be_stream_factory.h @@ -22,7 +22,7 @@ #define TAO_BE_FACTORY_H #include "ace/Singleton.h" -#include "ace/Synch.h" +#include "ace/Synch_Traits.h" class TAO_OutStream; diff --git a/TAO/TAO_IDL/be_include/be_visitor_factory.h b/TAO/TAO_IDL/be_include/be_visitor_factory.h index 984bc673db2..2aa1f9e61d7 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_factory.h +++ b/TAO/TAO_IDL/be_include/be_visitor_factory.h @@ -21,7 +21,7 @@ #define TAO_BE_VISITOR_FACTORY_H #include "ace/Singleton.h" -#include "ace/Synch.h" +#include "ace/Synch_Traits.h" class be_visitor; class be_visitor_context; diff --git a/TAO/TAO_IDL/driver/drv_args.cpp b/TAO/TAO_IDL/driver/drv_args.cpp index 1cdfbdbca14..050592dd356 100644 --- a/TAO/TAO_IDL/driver/drv_args.cpp +++ b/TAO/TAO_IDL/driver/drv_args.cpp @@ -72,6 +72,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "be_global.h" #include "be_extern.h" #include "ace/Process.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID (driver, drv_args, diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp index c2d4e74ef2a..b0ad60e326f 100644 --- a/TAO/TAO_IDL/driver/drv_preproc.cpp +++ b/TAO/TAO_IDL/driver/drv_preproc.cpp @@ -78,6 +78,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ace/Env_Value_T.h" #include "ace/ARGV.h" #include "ace/streams.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID (driver, drv_preproc, diff --git a/TAO/TAO_IDL/fe/fe_lookup.cpp b/TAO/TAO_IDL/fe/fe_lookup.cpp index 44018b52134..e155f034043 100644 --- a/TAO/TAO_IDL/fe/fe_lookup.cpp +++ b/TAO/TAO_IDL/fe/fe_lookup.cpp @@ -1,7 +1,7 @@ // $Id$ #include "fe_private.h" -#include "ace/OS_String.h" +#include "ace/OS_NS_string.h" /* starting time is 2:40:07 */ /* C++ code produced by gperf version 2.8 (ACE version) */ @@ -183,7 +183,7 @@ TAO_IDL_CPP_Keyword_Table::lookup (const char *str, unsigned int len) { const char *s = wordlist[key].keyword_; - if (*str == *s && !ACE_OS_String::strncmp (str + 1, s + 1, len - 1)) + if (*str == *s && !ACE_OS::strncmp (str + 1, s + 1, len - 1)) return &wordlist[key]; } } diff --git a/TAO/TAO_IDL/fe/y.tab.cpp b/TAO/TAO_IDL/fe/y.tab.cpp index 75f0fae52b1..249b3c241b3 100644 --- a/TAO/TAO_IDL/fe/y.tab.cpp +++ b/TAO/TAO_IDL/fe/y.tab.cpp @@ -3119,8 +3119,8 @@ tao_yyreduce: UTL_ScopedName n (tao_yyvsp[0].idval, 0); - if (ACE_OS_String::strcmp (tao_yyvsp[0].idval->get_string (), - "TypeCode") == 0 + if (ACE_OS::strcmp (tao_yyvsp[0].idval->get_string (), + "TypeCode") == 0 && !idl_global->in_main_file ()) { AST_PredefinedType *pdt = diff --git a/TAO/TAO_IDL/include/ast_attribute.h b/TAO/TAO_IDL/include/ast_attribute.h index 1a8b7ffd8b0..e9c9f420deb 100644 --- a/TAO/TAO_IDL/include/ast_attribute.h +++ b/TAO/TAO_IDL/include/ast_attribute.h @@ -69,7 +69,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ast_field.h" #include "utl_scoped_name.h" -#include "ace/OS.h" class UTL_ExceptList; class UTL_NameList; diff --git a/TAO/TAO_IDL/include/ast_union_label.h b/TAO/TAO_IDL/include/ast_union_label.h index f173ee5b459..2e82037aff9 100644 --- a/TAO/TAO_IDL/include/ast_union_label.h +++ b/TAO/TAO_IDL/include/ast_union_label.h @@ -68,7 +68,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #define _AST_UNION_LABEL_AST_UNION_LABEL_HH #include "TAO_IDL_FE_Export.h" -#include "ace/OS.h" +#include "ace/streams.h" class AST_Expression; class ast_visitor; diff --git a/TAO/TAO_IDL/include/idl_global.h b/TAO/TAO_IDL/include/idl_global.h index b0f1be376bd..f55b3f5528a 100644 --- a/TAO/TAO_IDL/include/idl_global.h +++ b/TAO/TAO_IDL/include/idl_global.h @@ -71,7 +71,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ace/SString.h" #include "ace/Hash_Map_Manager_T.h" #include "ace/Containers_T.h" -#include "ace/Synch_T.h" +#include "ace/Synch_Traits.h" +#include "ace/Null_Mutex.h" #include "idl_bool.h" #include "ast_expression.h" #include "ast_predefined_type.h" diff --git a/TAO/TAO_IDL/include/utl_identifier.h b/TAO/TAO_IDL/include/utl_identifier.h index 5f3cce7d269..5c7a1342027 100644 --- a/TAO/TAO_IDL/include/utl_identifier.h +++ b/TAO/TAO_IDL/include/utl_identifier.h @@ -69,13 +69,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "TAO_IDL_FE_Export.h" #include "idl_bool.h" -#include "ace/OS.h" - -// Needed to recognize ACE_OSTREAM_TYPE, and for BCB it's -// not included in ace/OS.h, so we include it here. -#if defined (__BORLANDC__) -# include "ace/streams.h" -#endif +#include "ace/streams.h" class TAO_IDL_FE_Export Identifier { diff --git a/TAO/TAO_IDL/include/utl_idlist.h b/TAO/TAO_IDL/include/utl_idlist.h index 3c44a2b8b67..9bd9de2021b 100644 --- a/TAO/TAO_IDL/include/utl_idlist.h +++ b/TAO/TAO_IDL/include/utl_idlist.h @@ -76,7 +76,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // public virtual inheritance. #include "utl_list.h" -#include "ace/OS.h" #include "ace/streams.h" class Identifier; diff --git a/TAO/TAO_IDL/include/utl_indenter.h b/TAO/TAO_IDL/include/utl_indenter.h index e43d5d65e27..ba73476d3ef 100644 --- a/TAO/TAO_IDL/include/utl_indenter.h +++ b/TAO/TAO_IDL/include/utl_indenter.h @@ -67,7 +67,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #ifndef _UTL_INDENTER_UTL_INDENTER_HH #define _UTL_INDENTER_UTL_INDENTER_HH -#include "ace/OS.h" #include "ace/streams.h" diff --git a/TAO/TAO_IDL/include/utl_string.h b/TAO/TAO_IDL/include/utl_string.h index 56c7217303f..30641635398 100644 --- a/TAO/TAO_IDL/include/utl_string.h +++ b/TAO/TAO_IDL/include/utl_string.h @@ -69,13 +69,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "TAO_IDL_FE_Export.h" #include "idl_bool.h" -#include "ace/OS.h" - -// Needed to recognize ACE_OSTREAM_TYPE, and for BCB it's -// not included in ace/OS.h, so we include it here. -#if defined (__BORLANDC__) -# include "ace/streams.h" -#endif +#include "ace/streams.h" class TAO_IDL_FE_Export UTL_String { diff --git a/TAO/TAO_IDL/include/utl_strlist.h b/TAO/TAO_IDL/include/utl_strlist.h index deb2c8cee01..c4782d66d98 100644 --- a/TAO/TAO_IDL/include/utl_strlist.h +++ b/TAO/TAO_IDL/include/utl_strlist.h @@ -68,7 +68,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #define _UTL_STRLIST_UTL_STRLIST_HH #include "utl_list.h" -#include "ace/OS.h" #include "ace/streams.h" class UTL_String; diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp index e2f3e37668c..cf192256060 100644 --- a/TAO/TAO_IDL/util/utl_global.cpp +++ b/TAO/TAO_IDL/util/utl_global.cpp @@ -72,6 +72,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "utl_indenter.h" #include "utl_err.h" #include "utl_string.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID (util, utl_global, diff --git a/TAO/TAO_IDL/util/utl_idlist.cpp b/TAO/TAO_IDL/util/utl_idlist.cpp index 92a225ddc5b..bd061252394 100644 --- a/TAO/TAO_IDL/util/utl_idlist.cpp +++ b/TAO/TAO_IDL/util/utl_idlist.cpp @@ -74,7 +74,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "utl_idlist.h" #include "utl_identifier.h" -#include "ace/streams.h" +#include "ace/OS_Memory.h" +#include "ace/OS_NS_string.h" ACE_RCSID (util, utl_idlist, diff --git a/TAO/TAO_IDL/util/utl_indenter.cpp b/TAO/TAO_IDL/util/utl_indenter.cpp index a273cf2fecc..f0df7ad4a0f 100644 --- a/TAO/TAO_IDL/util/utl_indenter.cpp +++ b/TAO/TAO_IDL/util/utl_indenter.cpp @@ -68,7 +68,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // #include "utl_indenter.h" -#include "ace/streams.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID (util, utl_indenter, diff --git a/TAO/TAO_IDL/util/utl_list.cpp b/TAO/TAO_IDL/util/utl_list.cpp index 3fc44127e25..9cdc10ea09b 100644 --- a/TAO/TAO_IDL/util/utl_list.cpp +++ b/TAO/TAO_IDL/util/utl_list.cpp @@ -73,7 +73,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // public virtual inheritance. #include "utl_list.h" -#include "ace/OS.h" +#include "ace/OS_Memory.h" ACE_RCSID (util, utl_list, diff --git a/TAO/TAO_IDL/util/utl_scope.cpp b/TAO/TAO_IDL/util/utl_scope.cpp index ce679804492..ac7c5dde758 100644 --- a/TAO/TAO_IDL/util/utl_scope.cpp +++ b/TAO/TAO_IDL/util/utl_scope.cpp @@ -101,6 +101,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "nr_extern.h" #include "global_extern.h" #include "ace/streams.h" +#include "ace/OS_NS_strings.h" ACE_RCSID (util, utl_scope, @@ -1200,11 +1201,11 @@ UTL_Scope::lookup_pseudo (Identifier *e) idl_bool obj_lookup = I_FALSE; idl_bool vb_lookup = I_FALSE; - if (ACE_OS_String::strcasecmp (name_string, "Object") == 0) + if (ACE_OS::strcasecmp (name_string, "Object") == 0) { obj_lookup = I_TRUE; } - else if (ACE_OS_String::strcasecmp (name_string, "ValueBase") == 0) + else if (ACE_OS::strcasecmp (name_string, "ValueBase") == 0) { vb_lookup = I_TRUE; } @@ -1218,8 +1219,8 @@ UTL_Scope::lookup_pseudo (Identifier *e) UTL_Scope::IK_decls), 0); } - else if (ACE_OS_String::strcasecmp (name_string, "TypeCode") == 0 - || ACE_OS_String::strcasecmp (name_string, "TCKind") == 0) + else if (ACE_OS::strcasecmp (name_string, "TypeCode") == 0 + || ACE_OS::strcasecmp (name_string, "TCKind") == 0) { // Occurrences of "TypeCode" or TCKind in IDL files must be // scoped with "CORBA" so we know we'll be in the CORBA module diff --git a/TAO/TAO_IDL/util/utl_strlist.cpp b/TAO/TAO_IDL/util/utl_strlist.cpp index 81dab84f345..4298de47ad0 100644 --- a/TAO/TAO_IDL/util/utl_strlist.cpp +++ b/TAO/TAO_IDL/util/utl_strlist.cpp @@ -75,6 +75,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "utl_strlist.h" #include "utl_string.h" #include "ace/streams.h" +#include "ace/OS_Memory.h" +#include "ace/OS_NS_string.h" ACE_RCSID (util, utl_strlist, diff --git a/TAO/examples/Callback_Quoter/Consumer_Input_Handler.cpp b/TAO/examples/Callback_Quoter/Consumer_Input_Handler.cpp index a06a4267cf3..a27c762615e 100644 --- a/TAO/examples/Callback_Quoter/Consumer_Input_Handler.cpp +++ b/TAO/examples/Callback_Quoter/Consumer_Input_Handler.cpp @@ -18,7 +18,8 @@ #include "Consumer_Input_Handler.h" #include "ace/Read_Buffer.h" -#include "ace/OS.h" +#include "ace/OS_NS_unistd.h" +#include "ace/os_include/os_ctype.h" Consumer_Input_Handler::Consumer_Input_Handler (Consumer_Handler *consumer_handler) { diff --git a/TAO/examples/Callback_Quoter/Supplier_i.cpp b/TAO/examples/Callback_Quoter/Supplier_i.cpp index 2d3627bf379..dba5236d901 100644 --- a/TAO/examples/Callback_Quoter/Supplier_i.cpp +++ b/TAO/examples/Callback_Quoter/Supplier_i.cpp @@ -20,7 +20,8 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" -#include "ace/OS.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_unistd.h" #include "ace/Reactor.h" // Constructor. diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp index 4f9795c38e5..d91be62615e 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp @@ -6,6 +6,7 @@ #include "Content_Iterator_i.h" #include "Iterator_Factory_i.h" #include "ace/OS_NS_time.h" +#include "ace/OS_NS_strings.h" ACE_RCSID (AMI_Iterator, Iterator_Factory_i, "$Id$") diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp index faa76c5bd5e..df7814ef774 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp @@ -7,6 +7,7 @@ #include "ace/Log_Msg.h" #include "ace/Process_Manager.h" #include "Iterator_Handler.h" +#include "ace/OS_NS_strings.h" ACE_RCSID(AMI_Iterator, Iterator_Handler, "$Id$") diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp index 2f52e21c41c..ad805c1bc48 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp @@ -6,8 +6,8 @@ #include "ace/FILE_Connector.h" #include "ace/Log_Msg.h" #include "ace/Process_Manager.h" -#include "ace/Synch.h" #include "Callback_i.h" +#include "ace/OS_NS_strings.h" ACE_RCSID (AMI_Observer, Callback_i, "$Id$") diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp index e3bb8bce499..7ace45deb14 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp @@ -6,6 +6,7 @@ #include "Push_Iterator_Factory_i.h" #include "Callback_Handler.h" #include "ace/OS_NS_time.h" +#include "ace/OS_NS_strings.h" ACE_RCSID (AMI_Observer, Push_Iterator_Factory_i, "$Id$") diff --git a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp index fb24de1b112..5049ca863f3 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp +++ b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp @@ -6,6 +6,7 @@ #include "Content_Iterator_i.h" #include "Iterator_Factory_i.h" #include "ace/OS_NS_time.h" +#include "ace/OS_NS_strings.h" ACE_RCSID (SMI_Iterator, Iterator_Factory_i, "$Id$") diff --git a/TAO/examples/Content_Server/SMI_Iterator/client.cpp b/TAO/examples/Content_Server/SMI_Iterator/client.cpp index 7c8cb92ce27..c5f1703664e 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/client.cpp +++ b/TAO/examples/Content_Server/SMI_Iterator/client.cpp @@ -7,6 +7,7 @@ #include "ace/Process_Manager.h" #include "orbsvcs/CosNamingC.h" #include "Web_ServerC.h" +#include "ace/OS_NS_strings.h" ACE_RCSID(SMI_Iterator, client, "$Id$") diff --git a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp index 95228d9bf14..836d78c738d 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp @@ -358,7 +358,7 @@ Fixed_Priority_Scheduler::receive_request (PortableInterceptor::ServerRequestInf // Ignore the "_is_a" operation since it may have been invoked // locally on the server side as a side effect of another call, // meaning that the client hasn't added the service context yet. - if (ACE_OS_String::strcmp ("_is_a", operation.in ()) == 0) + if (ACE_OS::strcmp ("_is_a", operation.in ()) == 0) return; IOP::ServiceContext_var sc = diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp index 3a31096f622..8a91336e4fb 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp @@ -343,7 +343,7 @@ MIF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri, // Ignore the "_is_a" operation since it may have been invoked // locally on the server side as a side effect of another call, // meaning that the client hasn't added the service context yet. - if (ACE_OS_String::strcmp ("_is_a", operation.in ()) == 0) + if (ACE_OS::strcmp ("_is_a", operation.in ()) == 0) return; IOP::ServiceContext_var sc = diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp index ad1c3cbe8ab..61497b038cb 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp @@ -358,7 +358,7 @@ MUF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri, // Ignore the "_is_a" operation since it may have been invoked // locally on the server side as a side effect of another call, // meaning that the client hasn't added the service context yet. - if (ACE_OS_String::strcmp ("_is_a", operation.in ()) == 0) + if (ACE_OS::strcmp ("_is_a", operation.in ()) == 0) return; IOP::ServiceContext_var sc = diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.h b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.h index cde29b3037a..f3d7d4a300f 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.h +++ b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.h @@ -13,7 +13,7 @@ #ifndef TASK_STATS_H #define TASK_STATS_H -#include "ace/OS.h" +#include "ace/OS_NS_time.h" #include "ace/Singleton.h" #include "tao/orbconf.h" #include "tao/debug.h" diff --git a/TAO/examples/Load_Balancing/Load_Balancer_i.h b/TAO/examples/Load_Balancing/Load_Balancer_i.h index 55a649c273e..643fbae178e 100644 --- a/TAO/examples/Load_Balancing/Load_Balancer_i.h +++ b/TAO/examples/Load_Balancing/Load_Balancer_i.h @@ -21,6 +21,7 @@ #include "ace/SString.h" #include "ace/Synch.h" #include "ace/Containers.h" +#include "ace/Null_Mutex.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp b/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp index fc4df170ef7..b2369ebe8b4 100644 --- a/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp +++ b/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp @@ -16,6 +16,7 @@ #include "Load_Balancer_i.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/OS_NS_stdio.h" Load_Balancing_Service::Load_Balancing_Service (void) : ior_output_file_ (0) diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp index bfe1cee4852..ec94198bcc1 100755 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp @@ -16,6 +16,7 @@ #include "Load_Balancer_i.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/OS_NS_stdio.h" Load_Balancing_Service::Load_Balancing_Service (void) : ior_output_file_ (0) diff --git a/TAO/examples/Logging/Logging_Test_i.cpp b/TAO/examples/Logging/Logging_Test_i.cpp index 8e47f94d2cf..c1843504ad2 100644 --- a/TAO/examples/Logging/Logging_Test_i.cpp +++ b/TAO/examples/Logging/Logging_Test_i.cpp @@ -6,7 +6,9 @@ #include "tao/debug.h" #include "ace/INET_Addr.h" #include "ace/SOCK_Dgram_Mcast.h" -#include "ace/OS.h" +#include "ace/OS_NS_netdb.h" +#include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_arpa_inet.h" ACE_RCSID(Logger, Logging_Test_i, "$Id$") diff --git a/TAO/examples/Persistent_Grid/Simple_util.cpp b/TAO/examples/Persistent_Grid/Simple_util.cpp index 63d998a3ace..871b1a189ab 100644 --- a/TAO/examples/Persistent_Grid/Simple_util.cpp +++ b/TAO/examples/Persistent_Grid/Simple_util.cpp @@ -6,6 +6,7 @@ # include "tao/debug.h" # include "ace/OS_NS_fcntl.h" # include "ace/OS_NS_unistd.h" +# include "ace/OS_NS_stdio.h" // Constructor. diff --git a/TAO/examples/PluggableUDP/tests/Basic/UDP_i.h b/TAO/examples/PluggableUDP/tests/Basic/UDP_i.h index 3ed48cd85a2..a58b21721cc 100644 --- a/TAO/examples/PluggableUDP/tests/Basic/UDP_i.h +++ b/TAO/examples/PluggableUDP/tests/Basic/UDP_i.h @@ -24,7 +24,7 @@ #include "UDPS.h" #include "ace/Hash_Map_Manager.h" -#include "ace/Synch.h" +#include "ace/Null_Mutex.h" class UDP_i: public POA_UDP { diff --git a/TAO/examples/RTCORBA/Activity/Activity.cpp b/TAO/examples/RTCORBA/Activity/Activity.cpp index be88f435602..cbc21687816 100644 --- a/TAO/examples/RTCORBA/Activity/Activity.cpp +++ b/TAO/examples/RTCORBA/Activity/Activity.cpp @@ -2,7 +2,7 @@ #include "Activity.h" #include "ace/High_Res_Timer.h" -#include "ace/Synch.h" +#include "ace/Barrier.h" #include "ace/Timer_Heap.h" #include "ace/Service_Config.h" #include "ace/Arg_Shifter.h" diff --git a/TAO/examples/RTCORBA/Activity/Task_Stats.h b/TAO/examples/RTCORBA/Activity/Task_Stats.h index a2e26ae21f7..8252c071c89 100644 --- a/TAO/examples/RTCORBA/Activity/Task_Stats.h +++ b/TAO/examples/RTCORBA/Activity/Task_Stats.h @@ -13,7 +13,7 @@ #ifndef TASK_STATS_H #define TASK_STATS_H -#include "ace/OS.h" +#include "ace/OS_NS_time.h" #include "ace/Singleton.h" #include "tao/orbconf.h" #include "tao/debug.h" diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp index caa71cdc51e..6552d80f4df 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp @@ -4,6 +4,7 @@ #include "tao/RTCORBA/Priority_Mapping_Manager.h" #include "tao/RTCORBA/Priority_Mapping.h" #include "ace/High_Res_Timer.h" +#include "ace/OS_NS_errno.h" FP_Task::FP_Task (int importance, diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp index ac676c49ab8..18da5f9a4c2 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp @@ -7,6 +7,7 @@ #include "../Thread_Task.h" #include "../Task_Stats.h" #include "../Synch_i.h" +#include "ace/OS_NS_errno.h" DT_Test::DT_Test (void) { diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp index 10e4418d557..e08bb93e2a6 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp +++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp @@ -1,6 +1,7 @@ //$Id$ #include "MIF_Task.h" #include "test.h" +#include "ace/OS_NS_errno.h" MIF_Task::MIF_Task (int importance, int start_time, diff --git a/TAO/examples/RTScheduling/Task_Stats.h b/TAO/examples/RTScheduling/Task_Stats.h index 7759a2b6783..b32f1041bfc 100644 --- a/TAO/examples/RTScheduling/Task_Stats.h +++ b/TAO/examples/RTScheduling/Task_Stats.h @@ -13,7 +13,7 @@ #ifndef TASK_STATS_H #define TASK_STATS_H -#include "ace/OS.h" +#include "ace/OS_NS_time.h" #include "ace/Singleton.h" #include "tao/orbconf.h" #include "tao/debug.h" diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp index 02f7f607d2a..64597a89f24 100644 --- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp @@ -35,9 +35,7 @@ #include "ace/Get_Opt.h" #include "ace/Sched_Params.h" -#include "ace/OS.h" - -#include <limits.h> +#include "ace/OS_NS_errno.h" ACE_RCSID (Event_Supplier, DualEC_Sup, diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp index 80b0273729c..29055b7c345 100644 --- a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp @@ -29,9 +29,10 @@ #include "ace/Get_Opt.h" #include "ace/Sched_Params.h" -#include "ace/OS.h" +#include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_stdio.h" -#include <limits.h> +#include "ace/os_include/os_ctype.h" ACE_RCSID (Event_Supplier, Event_Sup, @@ -250,13 +251,13 @@ Event_Supplier::insert_event_data (CORBA::Any &data, if ((schedule_iter.next (sched_data)) && (sched_data) && (*sched_data)) { - if ((strcmp((*sched_data)->operation_name, "high_20") == 0) || - (strcmp((*sched_data)->operation_name, "low_20") == 0) || - (strcmp((*sched_data)->operation_name, "high_1") == 0) || - (strcmp((*sched_data)->operation_name, "low_1") == 0)) + if ((ACE_OS::strcmp((*sched_data)->operation_name, "high_20") == 0) || + (ACE_OS::strcmp((*sched_data)->operation_name, "low_20") == 0) || + (ACE_OS::strcmp((*sched_data)->operation_name, "high_1") == 0) || + (ACE_OS::strcmp((*sched_data)->operation_name, "low_1") == 0)) { - if ((strcmp((*sched_data)->operation_name, "high_20") == 0) || - (strcmp((*sched_data)->operation_name, "high_1") == 0)) + if ((ACE_OS::strcmp((*sched_data)->operation_name, "high_20") == 0) || + (ACE_OS::strcmp((*sched_data)->operation_name, "high_1") == 0)) { navigation_.criticality = 1; } @@ -287,13 +288,13 @@ Event_Supplier::insert_event_data (CORBA::Any &data, data <<= navigation_; } - else if ((strcmp((*sched_data)->operation_name, "high_10") == 0) || - (strcmp((*sched_data)->operation_name, "low_10") == 0) || - (strcmp((*sched_data)->operation_name, "high_5") == 0) || - (strcmp((*sched_data)->operation_name, "low_5") == 0)) + else if ((ACE_OS::strcmp((*sched_data)->operation_name, "high_10") == 0) || + (ACE_OS::strcmp((*sched_data)->operation_name, "low_10") == 0) || + (ACE_OS::strcmp((*sched_data)->operation_name, "high_5") == 0) || + (ACE_OS::strcmp((*sched_data)->operation_name, "low_5") == 0)) { - if ((strcmp((*sched_data)->operation_name, "high_10") == 0) || - (strcmp((*sched_data)->operation_name, "high_5") == 0)) + if ((ACE_OS::strcmp((*sched_data)->operation_name, "high_10") == 0) || + (ACE_OS::strcmp((*sched_data)->operation_name, "high_5") == 0)) { weapons_.criticality = 1; } @@ -304,19 +305,19 @@ Event_Supplier::insert_event_data (CORBA::Any &data, weapons_.number_of_weapons = 2; weapons_.weapon1_identifier = CORBA::string_alloc (30); - strcpy (weapons_.weapon1_identifier.inout (),"Photon Torpedoes"); + ACE_OS::strcpy (weapons_.weapon1_identifier.inout (),"Photon Torpedoes"); weapons_.weapon1_status =(ACE_OS::rand() % 4) == 0 ? 0 : 1 ; weapons_.weapon2_identifier = CORBA::string_alloc (30); - strcpy (weapons_.weapon2_identifier.inout (),"Quantum Torpedoes"); + ACE_OS::strcpy (weapons_.weapon2_identifier.inout (),"Quantum Torpedoes"); weapons_.weapon2_status = (ACE_OS::rand() % 4) == 0 ? 0 : 1; weapons_.weapon3_identifier = CORBA::string_alloc (1); - strcpy (weapons_.weapon3_identifier.inout (), ""); + ACE_OS::strcpy (weapons_.weapon3_identifier.inout (), ""); weapons_.weapon3_status = 0; weapons_.weapon4_identifier = CORBA::string_alloc (1); - strcpy (weapons_.weapon4_identifier.inout (), ""); + ACE_OS::strcpy (weapons_.weapon4_identifier.inout (), ""); weapons_.weapon4_status = 0; weapons_.weapon5_identifier = CORBA::string_alloc (1); - strcpy (weapons_.weapon5_identifier.inout (), ""); + ACE_OS::strcpy (weapons_.weapon5_identifier.inout (), ""); weapons_.weapon5_status = 0; weapons_.utilization = (*sched_data)->utilitzation; weapons_.overhead = (*sched_data)->overhead; diff --git a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp index a18a0426af9..632c3937526 100644 --- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp @@ -33,9 +33,10 @@ #include "ace/Get_Opt.h" #include "ace/Sched_Params.h" -#include "ace/OS.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_unistd.h" -#include <limits.h> +#include "ace/os_include/os_ctype.h" ACE_RCSID (Event_Supplier, Logging_Sup, @@ -263,13 +264,13 @@ Logging_Supplier::insert_event_data (CORBA::Any &data, if ((schedule_iter.next (sched_data)) && (sched_data) && (*sched_data)) { - if ((strcmp((*sched_data)->operation_name, "high_20") == 0) || - (strcmp((*sched_data)->operation_name, "low_20") == 0) || - (strcmp((*sched_data)->operation_name, "high_1") == 0) || - (strcmp((*sched_data)->operation_name, "low_1") == 0)) + if ((ACE_OS::strcmp((*sched_data)->operation_name, "high_20") == 0) || + (ACE_OS::strcmp((*sched_data)->operation_name, "low_20") == 0) || + (ACE_OS::strcmp((*sched_data)->operation_name, "high_1") == 0) || + (ACE_OS::strcmp((*sched_data)->operation_name, "low_1") == 0)) { - if ((strcmp((*sched_data)->operation_name, "high_20") == 0) || - (strcmp((*sched_data)->operation_name, "high_1") == 0)) + if ((ACE_OS::strcmp((*sched_data)->operation_name, "high_20") == 0) || + (ACE_OS::strcmp((*sched_data)->operation_name, "high_1") == 0)) { navigation_.criticality = 1; } @@ -278,8 +279,8 @@ Logging_Supplier::insert_event_data (CORBA::Any &data, navigation_.criticality = 0; } - if ((strcmp((*sched_data)->operation_name, "high_20") == 0) || - (strcmp((*sched_data)->operation_name, "low_20") == 0)) + if ((ACE_OS::strcmp((*sched_data)->operation_name, "high_20") == 0) || + (ACE_OS::strcmp((*sched_data)->operation_name, "low_20") == 0)) { navigation_.deadline_time = TWENTY_HZ_PERIOD; } @@ -309,13 +310,13 @@ Logging_Supplier::insert_event_data (CORBA::Any &data, data <<= navigation_; } - else if ((strcmp((*sched_data)->operation_name, "high_10") == 0) || - (strcmp((*sched_data)->operation_name, "low_10") == 0) || - (strcmp((*sched_data)->operation_name, "high_5") == 0) || - (strcmp((*sched_data)->operation_name, "low_5") == 0)) + else if ((ACE_OS::strcmp((*sched_data)->operation_name, "high_10") == 0) || + (ACE_OS::strcmp((*sched_data)->operation_name, "low_10") == 0) || + (ACE_OS::strcmp((*sched_data)->operation_name, "high_5") == 0) || + (ACE_OS::strcmp((*sched_data)->operation_name, "low_5") == 0)) { - if ((strcmp((*sched_data)->operation_name, "high_10") == 0) || - (strcmp((*sched_data)->operation_name, "high_5") == 0)) + if ((ACE_OS::strcmp((*sched_data)->operation_name, "high_10") == 0) || + (ACE_OS::strcmp((*sched_data)->operation_name, "high_5") == 0)) { weapons_.criticality = 1; } @@ -324,8 +325,8 @@ Logging_Supplier::insert_event_data (CORBA::Any &data, weapons_.criticality = 0; } - if ((strcmp((*sched_data)->operation_name, "high_10") == 0) || - (strcmp((*sched_data)->operation_name, "low_10") == 0)) + if ((ACE_OS::strcmp((*sched_data)->operation_name, "high_10") == 0) || + (ACE_OS::strcmp((*sched_data)->operation_name, "low_10") == 0)) { weapons_.deadline_time = TEN_HZ_PERIOD; } @@ -337,19 +338,19 @@ Logging_Supplier::insert_event_data (CORBA::Any &data, weapons_.number_of_weapons = 2; weapons_.weapon1_identifier = CORBA::string_alloc (30); - strcpy (weapons_.weapon1_identifier.inout (),"Photon Torpedoes"); + ACE_OS::strcpy (weapons_.weapon1_identifier.inout (),"Photon Torpedoes"); weapons_.weapon1_status =(ACE_OS::rand() % 4) == 0 ? 0 : 1 ; weapons_.weapon2_identifier = CORBA::string_alloc (30); - strcpy (weapons_.weapon2_identifier.inout (),"Quantum Torpedoes"); + ACE_OS::strcpy (weapons_.weapon2_identifier.inout (),"Quantum Torpedoes"); weapons_.weapon2_status = (ACE_OS::rand() % 4) == 0 ? 0 : 1; weapons_.weapon3_identifier = CORBA::string_alloc (1); - strcpy (weapons_.weapon3_identifier.inout (), ""); + ACE_OS::strcpy (weapons_.weapon3_identifier.inout (), ""); weapons_.weapon3_status = 0; weapons_.weapon4_identifier = CORBA::string_alloc (1); - strcpy (weapons_.weapon4_identifier.inout (), ""); + ACE_OS::strcpy (weapons_.weapon4_identifier.inout (), ""); weapons_.weapon4_status = 0; weapons_.weapon5_identifier = CORBA::string_alloc (1); - strcpy (weapons_.weapon5_identifier.inout (), ""); + ACE_OS::strcpy (weapons_.weapon5_identifier.inout (), ""); weapons_.weapon5_status = 0; weapons_.utilization = 0.0; weapons_.overhead = 0.0; diff --git a/TAO/orbsvcs/Event_Service/Event_Service.cpp b/TAO/orbsvcs/Event_Service/Event_Service.cpp index 09846e7afd8..88068232fdf 100644 --- a/TAO/orbsvcs/Event_Service/Event_Service.cpp +++ b/TAO/orbsvcs/Event_Service/Event_Service.cpp @@ -17,6 +17,7 @@ #include "orbsvcs/Event/EC_Event_Channel.h" #include "tao/BiDir_GIOP/BiDirGIOP.h" +#include "ace/OS_NS_strings.h" ACE_RCSID(Event_Service, Event_Service, "$Id$") diff --git a/TAO/orbsvcs/IFR_Service/drv_args_ifr.cpp b/TAO/orbsvcs/IFR_Service/drv_args_ifr.cpp index a34fa15e5d9..c715934ccb4 100644 --- a/TAO/orbsvcs/IFR_Service/drv_args_ifr.cpp +++ b/TAO/orbsvcs/IFR_Service/drv_args_ifr.cpp @@ -6,6 +6,7 @@ #include "drv_extern_ifr.h" #include "be_extern.h" #include "ace/Process.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID (IFR_Service, drv_args_ifr, diff --git a/TAO/orbsvcs/IFR_Service/drv_preproc_ifr.cpp b/TAO/orbsvcs/IFR_Service/drv_preproc_ifr.cpp index 978ad02a973..a118e2bcff5 100644 --- a/TAO/orbsvcs/IFR_Service/drv_preproc_ifr.cpp +++ b/TAO/orbsvcs/IFR_Service/drv_preproc_ifr.cpp @@ -80,6 +80,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ace/Env_Value_T.h" #include "ace/ARGV.h" #include "ace/streams.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID (IFR_Service, drv_preproc_ifr, diff --git a/TAO/orbsvcs/ImplRepo_Service/Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Options.cpp index 427d3eadc8c..b754fb55363 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Options.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Options.cpp @@ -13,7 +13,7 @@ #include "tao/Strategies/advanced_resource.h" #include "ace/Arg_Shifter.h" #include "ace/ARGV.h" - +#include "ace/OS_NS_strings.h" ACE_RCSID (ImplRepo_Service, Options, diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp index bc60d0548e4..1d4c3aebee8 100644 --- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp @@ -9,6 +9,7 @@ #include "ace/Read_Buffer.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_netdb.h" +#include "ace/OS_NS_strings.h" // How many servers should we get at once? const size_t IR_LIST_CHUNK = 10; @@ -366,7 +367,7 @@ TAO_IMR_Op_Add::parse (int argc, ACE_TCHAR **argv) ACE_Get_Opt get_opts (argc, argv, "hc:w:a:e:l:"); this->server_name_ = argv[1]; - if (ACE_OS_String::strlen(this->server_name_.c_str()) < 1) + if (ACE_OS::strlen(this->server_name_.c_str()) < 1) { ACE_ERROR_RETURN ((LM_ERROR, "Server name <%s> must be at least one character long!\n", diff --git a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp index d2157681d22..c98e8e5c298 100644 --- a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp +++ b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp @@ -6,6 +6,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_main.h" +#include "ace/OS_NS_strings.h" #if defined (linux) && defined (ACE_HAS_THREADS) # include "ace/Signal.h" diff --git a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp index 89a4b3e0af1..d20dac005fe 100644 --- a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp +++ b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp @@ -8,6 +8,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_main.h" +#include "ace/OS_NS_strings.h" ACE_RCSID (LoadBalancer, diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp index 21a28c9e63f..15e4ada0344 100644 --- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp @@ -9,6 +9,7 @@ #include "orbsvcs/Event/EC_Default_Factory.h" #include "orbsvcs/Event/EC_Event_Channel.h" #include "ace/OS_main.h" +#include "ace/OS_NS_strings.h" ACE_RCSID (RTEvent_Logging_Service, RTEvent_Logging_Service, diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp index 88cd01f829b..376efed5b3b 100644 --- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp +++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp @@ -7,6 +7,8 @@ #include "ace/Argv_Type_Converter.h" #include "orbsvcs/CosNamingC.h" #include "ace/OS_main.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_strings.h" ACE_RCSID(Scheduling_Service, Scheduling_Service, "$Id$") diff --git a/TAO/orbsvcs/Time_Service/Server_i.cpp b/TAO/orbsvcs/Time_Service/Server_i.cpp index a752e41287e..ad5e0bf71c6 100644 --- a/TAO/orbsvcs/Time_Service/Server_i.cpp +++ b/TAO/orbsvcs/Time_Service/Server_i.cpp @@ -6,6 +6,7 @@ #include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_string.h" ACE_RCSID(Time_Service, Server_i, "$Id$") @@ -239,8 +240,8 @@ Server_i::register_server (void) CosNaming::Name server_name (server_context_name); server_name.length (2); - strcpy (server_mc_name, "Server:"); - strcat (server_mc_name, host_name); + ACE_OS::strcpy (server_mc_name, "Server:"); + ACE_OS::strcat (server_mc_name, host_name); server_name[1].id = CORBA::string_dup (server_mc_name); // Bind the compound name (ServerContext(Server:<hostname>)) diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp index aefa1693c0a..3b421034a08 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp @@ -2,6 +2,7 @@ #include "orbsvcs/RtecEventChannelAdminC.h" #include "orbsvcs/Event_Service_Constants.h" #include "ace/OS_main.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID (RTEvent, RTEvent_Supplier, diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp index 44eea79510d..8b60e9def69 100644 --- a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp @@ -18,6 +18,8 @@ #include "ace/Sched_Params.h" #include "ace/Auto_Ptr.h" #include "ace/SString.h" +#include "ace/OS_NS_strings.h" +#include "ace/Thread.h" ACE_RCSID(EC_Examples, Service, "$Id$") diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp index 2b675d94f14..3157a3b7ec4 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp @@ -4,6 +4,7 @@ #include "orbsvcs/RtecEventChannelAdminC.h" #include "orbsvcs/Event_Service_Constants.h" #include "orbsvcs/CosNamingC.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(EC_Examples, Supplier, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp index e3f6e6f3c69..2b34a7824c3 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp @@ -22,6 +22,7 @@ #include "tao/debug.h" #include "tao/ORB_Core.h" #include "tao/Any.h" +#include "ace/OS_NS_arpa_inet.h" #if !defined (__ACE_INLINE__) #include "AVStreams_i.i" diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp index e765fbdfe43..f29715633bf 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp @@ -10,6 +10,7 @@ #include "tao/debug.h" #include "tao/PortableServer/ORB_Manager.h" +#include "ace/OS_NS_strings.h" #if !defined (__ACE_INLINE__) #include "FlowSpec_Entry.i" diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp index 072a1b58518..a9a8236c777 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp @@ -41,7 +41,8 @@ #include "md5.h" #include "RTCP_Packet.h" - +#include "ace/OS_NS_time.h" +#include "ace/OS_NS_strings.h" int TAO_AV_RTCP_Callback::receive_control_frame (ACE_Message_Block *data, diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h index 60e14841a73..e2fd18dcc64 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h @@ -5,7 +5,7 @@ #include /**/ "ace/pre.h" -#include "ace/OS.h" +#include "ace/Basic_Types.h" /** * @struct RTCP_Common_Header diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp index 3e96c026318..7d75cdedf6a 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp @@ -39,6 +39,8 @@ #include "Nil.h" #include "tao/debug.h" +#include "ace/OS_NS_arpa_inet.h" +#include "ace/OS_NS_strings.h" // RTP_Packet diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp index 6fa0e085f92..b36a2785a7e 100644 --- a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp @@ -4,6 +4,7 @@ #include "AVStreams_i.h" #include "tao/debug.h" +#include "ace/OS_NS_strings.h" //------------------------------------------------------------ // TAO_AV_TCP_Transport @@ -635,9 +636,9 @@ int TAO_AV_TCP_Flow_Handler::open (void * /*arg*/) { +#if defined (TCP_NODELAY) int nodelay = 1; -#if defined (TCP_NODELAY) if (this->peer ().set_option (IPPROTO_TCP, TCP_NODELAY, (void *) &nodelay, diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp index 7e1a0b2b945..7b3fcc320f2 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp @@ -5,6 +5,7 @@ #include "MCast.h" #include "tao/debug.h" +#include "ace/OS_NS_strings.h" #if !defined (__ACE_INLINE__) #include "UDP.i" @@ -683,7 +684,7 @@ TAO_AV_UDP_Connector::connect (TAO_FlowSpec_Entry *entry, char buf [BUFSIZ]; ACE_CString addr_str (local_addr->get_host_name ()); addr_str += ":"; - addr_str += ACE_OS_String::itoa (local_addr->get_port_number () + 1, buf, 10); + addr_str += ACE_OS::itoa (local_addr->get_port_number () + 1, buf, 10); ACE_NEW_RETURN (local_control_addr, ACE_INET_Addr (addr_str.c_str ()), -1); diff --git a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp index 6d9dbf02c3a..e29c8e154ce 100644 --- a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp @@ -4,6 +4,7 @@ #include "tao/ORB_Core.h" #include "tao/debug.h" +#include "ace/OS_NS_strings.h" TAO_AV_Default_Resource_Factory::TAO_AV_Default_Resource_Factory (void) { diff --git a/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp b/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp index 902352b6b1b..098515b27d5 100644 --- a/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp @@ -38,9 +38,9 @@ static const char rcsid[] = */ #include "media_timer.h" -// FUZZ: disable check_for_math_include -#include <math.h> - +#include "ace/Time_Value.h" +#include "ace/OS_NS_sys_time.h" +#include "ace/OS_NS_stdlib.h" MediaTimer* MediaTimer::instance_; diff --git a/TAO/orbsvcs/orbsvcs/AV/media_timer.h b/TAO/orbsvcs/orbsvcs/AV/media_timer.h index 9248093e61a..408ecb7136b 100644 --- a/TAO/orbsvcs/orbsvcs/AV/media_timer.h +++ b/TAO/orbsvcs/orbsvcs/AV/media_timer.h @@ -39,7 +39,7 @@ #define TAO_AV_MEDIA_TIMER_H #include /**/ "ace/pre.h" -#include "ace/OS.h" +#include "ace/Basic_Types.h" //long random (void); class MediaTimer diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp index 787ffcbaa62..0e778f961b7 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp @@ -4,6 +4,7 @@ #include "ace/ARGV.h" #include "tao/debug.h" +#include "ace/OS_NS_strings.h" // default arguments to pass to use for the ORB const char *TAO_SFP_Base::TAO_SFP_ORB_ARGUMENTS = "-ORBobjrefstyle URL"; diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp index 470c7ce93f6..5ab30c57eb0 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp @@ -18,6 +18,7 @@ // ============================================================================ #include "CC_Lock.h" +#include "ace/Log_Msg.h" ACE_RCSID (Concurrency, CC_Lock, diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp index a2988e610e5..87fff75616e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp @@ -22,6 +22,7 @@ #include "ace/Arg_Shifter.h" #include "ace/Sched_Params.h" +#include "ace/OS_NS_strings.h" #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) #include "CEC_TypedConsumerAdmin.h" diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.cpp index 426bbef0655..5446ebe6eca 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.cpp @@ -3,6 +3,8 @@ #include "ETCL_Interpreter.h" #include "ETCL_Constraint.h" +#include "ace/Guard_T.h" +#include "ace/Thread_Mutex.h" ACE_RCSID(ETCL, ETCL_Interpreter, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h index e938ac2ae9b..abdebd55529 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h @@ -24,6 +24,7 @@ #include "ace/Hash_Map_Manager.h" #include "ace/INET_Addr.h" +#include "ace/Null_Mutex.h" /** * @class TAO_ECG_CDR_Processor diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.i b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.i index b8c0c73e4ba..59eeae30034 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.i +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.i @@ -1,5 +1,7 @@ // $Id$ +#include "ace/Null_Mutex.h" + ACE_INLINE TAO_ECG_CDR_Message_Sender::TAO_ECG_CDR_Message_Sender (CORBA::Boolean crc) : endpoint_rptr_ () diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp index 750d892304e..fe1f9aa8da7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp @@ -14,6 +14,7 @@ #include "ace/Dynamic_Service.h" #include "ace/Arg_Shifter.h" #include "tao/ORB_Core.h" +#include "ace/OS_NS_strings.h" #if ! defined (__ACE_INLINE__) #include "ECG_Mcast_Gateway.i" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl index 56b33d213db..bc7e81f477a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl @@ -1,5 +1,8 @@ +/* -*- C++ -*- */ // $Id$ +#include "ace/Null_Mutex.h" + ACE_INLINE TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> TAO_ECG_UDP_Sender::create (CORBA::Boolean crc) { diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp index 6ece9deb3a5..61adaf515d7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp @@ -31,6 +31,7 @@ #include "ace/Arg_Shifter.h" #include "ace/Sched_Params.h" +#include "ace/OS_NS_strings.h" #if ! defined (__ACE_INLINE__) #include "EC_Default_Factory.i" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp index c180026b352..eb368de2dbb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp @@ -12,6 +12,7 @@ #include "ECG_Reactive_ConsumerEC_Control.h" #include "ECG_Reconnect_ConsumerEC_Control.h" #include "EC_Gateway_IIOP.h" +#include "ace/OS_NS_strings.h" #if !defined (__ACE_INLINE__) #include "EC_Gateway_IIOP_Factory.i" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp index e30cfbe09a0..62d433eb367 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp @@ -9,6 +9,7 @@ #include "ace/Arg_Shifter.h" #include "ace/Sched_Params.h" +#include "ace/OS_NS_strings.h" #if ! defined (__ACE_INLINE__) #include "EC_Kokyu_Factory.i" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp index f7f6a6e5169..c0490f4cf17 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp @@ -8,6 +8,7 @@ #include "EC_Disjunction_Filter.h" #include "EC_Timeout_Filter.h" #include "EC_Event_Channel_Base.h" +#include "ace/OS_NS_stdio.h" #if ! defined (__ACE_INLINE__) #include "EC_Kokyu_Filter_Builder.i" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp index 214e22aa4ce..0199dec1957 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp @@ -9,6 +9,7 @@ #include "ace/Arg_Shifter.h" #include "ace/Sched_Params.h" +#include "ace/OS_NS_strings.h" #if ! defined (__ACE_INLINE__) #include "EC_Sched_Factory.i" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp index 9011189c522..6b2815e4897 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp @@ -8,6 +8,7 @@ #include "EC_Disjunction_Filter.h" #include "EC_Timeout_Filter.h" #include "EC_Event_Channel_Base.h" +#include "ace/OS_NS_stdio.h" #if ! defined (__ACE_INLINE__) #include "EC_Sched_Filter_Builder.i" diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp index 4b61e0e0542..b6771dfac03 100644 --- a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp +++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp @@ -1,6 +1,8 @@ // $Id$ #include "orbsvcs/Event_Utilities.h" +#include "ace/Log_Msg.h" +#include "ace/OS_NS_stdio.h" #if !defined (__ACE_INLINE__) #include "orbsvcs/Event_Utilities.i" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp index 51f604ef5d4..052001b11fa 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp @@ -3,6 +3,7 @@ #include "tao/ORB_Constants.h" #include "tao/ORBInitializer_Registry.h" +#include "ace/OS_NS_strings.h" ACE_RCSID (LoadBalancing, LB_Component, diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp index d4f5b0332e7..b056fc7622b 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp @@ -7,6 +7,7 @@ ACE_RCSID (LoadBalancing, #include "tao/debug.h" +#include "ace/OS_NS_strings.h" // The number of different object groups to support. diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp index 2dac4d201f3..0917d813c5b 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp @@ -6,7 +6,7 @@ #include "orbsvcs/Time_Utilities.h" #include "tao/debug.h" - +#include "ace/OS_NS_stdio.h" ACE_RCSID (Log, Log_i, diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp index ebcc4575345..b5387ff1c72 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp @@ -410,7 +410,7 @@ TAO_Naming_Context::to_url_validate_and_compute_size ( const char *sn ACE_ENV_ARG_DECL) { - size_t addr_len = ACE_OS_String::strlen (addr); + size_t addr_len = ACE_OS::strlen (addr); // Check for invalid address if (addr_len == 0) diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h index dc3394d73ab..f113da90784 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h @@ -18,6 +18,7 @@ #include "orbsvcs/CosNamingS.h" #include "naming_export.h" +#include "ace/Null_Mutex.h" class TAO_Naming_Context_Impl; diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp index d222ea5c80c..88e6db290ab 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp @@ -15,6 +15,7 @@ #include "ace/Auto_Ptr.h" #include "Transient_Naming_Context.h" #include "Bindings_Iterator_T.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID(Naming, Transient_Naming_Context, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h index 61c455338ee..dada530013a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h +++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h @@ -22,6 +22,7 @@ #include "ace/Atomic_Op.h" #include "ace/Refcounted_Auto_Ptr.h" +#include "ace/Condition_Thread_Mutex.h" #include "tao/orbconf.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp index 55acfa6f5dc..06f1da252e4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp @@ -19,6 +19,7 @@ ACE_RCSID (Notify, #include "QoSProperties.h" #include "tao/debug.h" +#include "ace/Null_Condition.h" TAO_Notify_Buffering_Strategy::TAO_Notify_Buffering_Strategy ( TAO_Notify_Message_Queue& msg_queue, diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h index 82da06e143b..d3056151c25 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h @@ -24,6 +24,7 @@ #include "ace/Atomic_Op.h" #include "orbsvcs/CosNotifyFilterS.h" #include "Notify_Constraint_Interpreter.h" +#include "ace/Null_Mutex.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp index 0358e88b59a..fd0182a8dfc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp @@ -26,7 +26,7 @@ TAO_Notify_POA_Helper::get_unique_id (void) static TAO_Notify_ID_Factory poa_id_factory; char buf[32]; - ACE_OS_String::itoa (poa_id_factory.id (), buf, 10); + ACE_OS::itoa (poa_id_factory.id (), buf, 10); return ACE_CString (buf); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.cpp index eb8985f6554..73bd444b95d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.cpp @@ -2,6 +2,7 @@ #include "Batch_Buffering_Strategy.h" #include "../Method_Request_Event.h" +#include "ace/Null_Condition.h" #if ! defined (__ACE_INLINE__) #include "Batch_Buffering_Strategy.inl" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h index 8063ef6f8d7..297d35f5b80 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h @@ -26,6 +26,7 @@ #include "../Consumer.h" #include "../AdminProperties.h" #include "Batch_Buffering_Strategy.h" +#include "ace/Null_Condition.h" class TAO_Notify_ProxySupplier; class TAO_Notify_QoSProperties; diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp index fd55554a028..a234e7882d6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp @@ -12,6 +12,7 @@ ACE_RCSID(Notify, TAO_Notify_ThreadPool_Task, "$Id$") #include "tao/ORB_Core.h" #include "Properties.h" #include "Timer_Queue.h" +#include "ace/OS_NS_errno.h" TAO_Notify_ThreadPool_Task::TAO_Notify_ThreadPool_Task (void) : buffering_strategy_ (0), shutdown_ (0), timer_ (0) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h index 6b604f25e15..d080e94ea38 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h @@ -23,6 +23,7 @@ #include "ace/Timer_Queue.h" #include "ace/Timer_Heap.h" +#include "ace/Recursive_Thread_Mutex.h" /** * @class TAO_Notify_Timer_Queue diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp index 75c69f9e388..52e225f76a3 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp @@ -13,6 +13,7 @@ #include "tao/Protocols_Hooks.h" #include "UIPMC_Profile.h" +#include "ace/OS_NS_strings.h" ACE_RCSID (tao, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp index a521ed66824..ba2accd9ff2 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp @@ -5,6 +5,7 @@ #include "UIPMC_Factory.h" #include "UIPMC_Acceptor.h" #include "UIPMC_Connector.h" +#include "ace/OS_NS_strings.h" ACE_RCSID (PortableGroup, UIPMC_Factory, diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp index e6bd45686f5..39c80f49402 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp @@ -11,6 +11,8 @@ //============================================================================= #include "RTCosScheduling_PCP_Manager.h" +#include "ace/Condition_Thread_Mutex.h" +#include "ace/Thread.h" #if !defined (__ACE_INLINE__) #include "RTCosScheduling_PCP_Manager.i" @@ -428,14 +430,14 @@ PCP_Manager_Factory::PCP_Manager_Factory(char *shared_file) /// Get the temporary directory if (ACE::get_temp_dir (temp_file, - MAXPATHLEN - ACE_OS_String::strlen(shared_file)) + MAXPATHLEN - ACE_OS::strlen(shared_file)) == -1) ACE_ERROR ((LM_ERROR, "Temporary path too long\n")); ACE_TRY_CHECK; /// Add the filename to the end - ACE_OS_String::strcat (temp_file, shared_file); + ACE_OS::strcat (temp_file, shared_file); /// Store in the global variable. this->shm_key_ = temp_file; diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp index 542f2738c90..1e8d81e53bd 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp @@ -19,6 +19,7 @@ #include "DynSched.h" #include "ace/Basic_Types.h" #include "ace/Sched_Params.h" +#include "ace/OS_NS_stdio.h" #if ! defined (__ACE_INLINE__) #include "DynSched.i" diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h index 215361f2090..d3cfadfab4e 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h +++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h @@ -33,6 +33,7 @@ #include "ace/SString.h" #include "SchedEntry.h" #include "sched_export.h" +#include "ace/Recursive_Thread_Mutex.h" class TAO_RTSched_Export ACE_DynScheduler // = TITLE diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp index 402678f13de..6c300c402bf 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp @@ -18,6 +18,7 @@ #include "SchedEntry.h" #include "ace/SString.h" +#include "ace/OS_NS_stdio.h" #if ! defined (__ACE_INLINE__) #include "SchedEntry.i" diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp index c9cdd4192ac..f7b44f4249f 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp @@ -19,6 +19,7 @@ #include "ace/Sched_Params.h" #include "orbsvcs/Time_Utilities.h" #include "Scheduler.h" +#include "ace/OS_NS_stdio.h" #if ! defined (__ACE_INLINE__) #include "Scheduler.i" diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp index 7153d0a4d73..f3a3877c13e 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp @@ -19,6 +19,7 @@ #include "ace/Sched_Params.h" #include "Scheduler_Generic.h" +#include "ace/OS_NS_stdio.h" #if ! defined (__ACE_INLINE__) #include "Scheduler_Generic.i" diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h index 2a3c09226c4..7c039ca4002 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h @@ -23,6 +23,8 @@ #include "Scheduler.h" #include "ace/Unbounded_Set.h" +#include "ace/Synch_Traits.h" +#include "ace/Recursive_Thread_Mutex.h" class TAO_RTSched_Export Scheduler_Generic : public ACE_Scheduler // = TITLE diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp index 66bd6f22243..0d6f880263a 100644 --- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp @@ -3,7 +3,7 @@ #include "tao/debug.h" -#include "ace/OS.h" +#include "ace/OS_NS_time.h" ACE_RCSID (Time, diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp index 1edbebeaed7..c34fb9e0a91 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp @@ -4,6 +4,7 @@ #include "Constraint_Visitors.h" #include "tao/Managed_Types.h" +#include "ace/OS_NS_string.h" ACE_RCSID (Trader, Constraint_Nodes, diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp index 55406876dfd..5bb6486c5c2 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp @@ -13,7 +13,7 @@ // // ======================================================================== -#include "ace/OS.h" +#include "ace/OS_NS_string.h" #include "Constraint_Interpreter.h" #include "Constraint_Nodes.h" @@ -279,7 +279,7 @@ char * yyreds[] = #define YYRECOVERING() (!!yyerrflag) #define YYNEW(type) malloc(sizeof(type) * yynewmax) #define YYCOPY(to, from, type) \ - (type *) memcpy(to, (char *) from, yynewmax * sizeof(type)) + (type *) ACE_OS::memcpy(to, (char *) from, yynewmax * sizeof(type)) #define YYENLARGE( from, type) \ (type *) realloc((char *) from, yynewmax * sizeof(type)) #ifndef YYDEBUG diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp index 44a07b258d1..8205067b623 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp @@ -1,6 +1,7 @@ // $Id$ #include "Interpreter.h" +#include "ace/OS_NS_string.h" TAO_SYNCH_MUTEX TAO_Interpreter::parserMutex__; diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp index e1ba06d18dd..0df1e67b258 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp @@ -2,6 +2,7 @@ #include "Interpreter_Utils.h" #include "ace/ACE.h" +#include "ace/OS_NS_string.h" // = Methods to deal with ACE_Hash_Map_Manager. diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp index 5a0db26616c..0d4ad659c02 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp @@ -4,6 +4,8 @@ #include "Offer_Iterators_T.h" #include "ace/Thread_Mutex.h" #include "ace/RW_Thread_Mutex.h" +#include "ace/OS_NS_strings.h" +#include "ace/os_include/os_ctype.h" // The following #include is needed only for the instantiation pragmas. #include "Trader_Interfaces.h" diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.h b/TAO/orbsvcs/tests/AVStreams/Latency/ping.h index 698d95b1180..88e6fc31b97 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.h +++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.h @@ -19,6 +19,7 @@ #include "orbsvcs/AV/AVStreams_i.h" #include "orbsvcs/AV/Policy.h" #include "orbsvcs/AV/Flows_T.h" +#include "ace/OS_NS_time.h" class Ping_Recv_Callback : public TAO_AV_Callback { diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp index 04695ae8b56..e06135526c4 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp @@ -25,6 +25,7 @@ #include "ace/Read_Buffer.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" +#include "ace/os_include/os_ctype.h" ACE_RCSID(Concurrency, CC_client, "$Id$") diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp index 4de63e67cbe..b26b31e4c79 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp @@ -19,10 +19,9 @@ #include "CC_test_utils.h" #include "CC_naming_service.h" #include "ace/ACE.h" -#include "ace/OS.h" #include "ace/Process.h" #include "orbsvcs/CosConcurrencyControlC.h" -#include <stdio.h> +#include "ace/OS_NS_stdio.h" ACE_RCSID(Concurrency, CC_command, "$Id$") diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp index ec6ffd9effb..7d9019d5bba 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp @@ -4,6 +4,7 @@ #include "orbsvcs/CosEvent/CEC_EventChannel.h" #include "orbsvcs/CosEvent/CEC_Default_Factory.h" #include "ace/Arg_Shifter.h" +#include "ace/OS_NS_strings.h" ACE_RCSID(CEC_Tests, Random, "$Id$") diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp index c43b71cb4ca..ad32b062a54 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp @@ -20,6 +20,8 @@ #include "ace/Get_Opt.h" #include "ace/Auto_Ptr.h" #include "ace/Sched_Params.h" +#include "ace/OS_NS_errno.h" +#include "ace/OS_NS_strings.h" #if defined (sun) # include <sys/lwp.h> /* for _lwp_self */ diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp index be3e75e7ed8..6de28a3c6d7 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp @@ -14,6 +14,7 @@ #include "ace/Auto_Ptr.h" #include "ace/Sched_Params.h" #include "ace/OS_NS_errno.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(EC_Throughput, ECT_Consumer_Driver, "$Id$") diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp index 701da7d3d15..0bb6d9422af 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp @@ -14,6 +14,7 @@ #include "ace/Auto_Ptr.h" #include "ace/Sched_Params.h" #include "ace/OS_NS_errno.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(EC_Throughput, ECT_Supplier_Driver, "$Id$") diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp index d6a03203c50..fd2ffe3273b 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp @@ -20,6 +20,8 @@ #include "ace/Auto_Ptr.h" #include "ace/Sched_Params.h" #include "ace/High_Res_Timer.h" +#include "ace/OS_NS_strings.h" +#include "ace/OS_NS_errno.h" ACE_RCSID(EC_Throughput, ECT_Throughput, "$Id$") diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.cpp b/TAO/orbsvcs/tests/Event/Basic/Random.cpp index 967f69b7edd..6217f46081e 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Random.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Random.cpp @@ -6,6 +6,7 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Time_Utilities.h" #include "ace/Arg_Shifter.h" +#include "ace/OS_NS_strings.h" ACE_RCSID(EC_Tests, Random, "$Id$") diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp index bc3dc16a191..087bf7f3831 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp @@ -6,6 +6,7 @@ #include "orbsvcs/Event/EC_Event_Channel.h" #include "ace/Arg_Shifter.h" #include "ace/High_Res_Timer.h" +#include "ace/OS_NS_strings.h" ACE_RCSID(EC_Tests_Performance, Connect, "$Id$") diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp index 0c9d83d8fcb..838f3b35e7c 100644 --- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp @@ -2,6 +2,7 @@ #include "Counting_Supplier.h" #include "orbsvcs/Event_Utilities.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(EC_Tests, EC_Count_Supplier, "$Id$") diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp index 0eb220e760a..8424216bd5c 100644 --- a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp @@ -5,6 +5,7 @@ #include "orbsvcs/Event_Utilities.h" #include "tao/debug.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(EC_Tests, EC_Supplier, "$Id$") diff --git a/TAO/orbsvcs/tests/Notify/Blocking/common.cpp b/TAO/orbsvcs/tests/Notify/Blocking/common.cpp index 1caccdbb3df..c88d7dc082d 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/common.cpp +++ b/TAO/orbsvcs/tests/Notify/Blocking/common.cpp @@ -5,6 +5,7 @@ #include "orbsvcs/CosNotifyCommC.h" #include "orbsvcs/CosNamingC.h" #include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_string.h" const char* @@ -36,12 +37,12 @@ Any_String (const CORBA::Any& any) } else if (any >>= str) { - ACE_OS_String::strcpy (out, str); + ACE_OS::strcpy (out, str); } else if (any >>= ull) { #if defined (ACE_LACKS_LONGLONG_T) - ACE_OS_String::strcpy (out, ull.as_string (out)); + ACE_OS::strcpy (out, ull.as_string (out)); #else double temp = # if defined (ACE_CONFIG_WIN32_H) @@ -55,7 +56,7 @@ Any_String (const CORBA::Any& any) } else { - ACE_OS_String::strcpy (out, "Unsupported Any Type"); + ACE_OS::strcpy (out, "Unsupported Any Type"); } return out; diff --git a/TAO/orbsvcs/tests/Notify/Discarding/common.cpp b/TAO/orbsvcs/tests/Notify/Discarding/common.cpp index 1caccdbb3df..c88d7dc082d 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/common.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/common.cpp @@ -5,6 +5,7 @@ #include "orbsvcs/CosNotifyCommC.h" #include "orbsvcs/CosNamingC.h" #include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_string.h" const char* @@ -36,12 +37,12 @@ Any_String (const CORBA::Any& any) } else if (any >>= str) { - ACE_OS_String::strcpy (out, str); + ACE_OS::strcpy (out, str); } else if (any >>= ull) { #if defined (ACE_LACKS_LONGLONG_T) - ACE_OS_String::strcpy (out, ull.as_string (out)); + ACE_OS::strcpy (out, ull.as_string (out)); #else double temp = # if defined (ACE_CONFIG_WIN32_H) @@ -55,7 +56,7 @@ Any_String (const CORBA::Any& any) } else { - ACE_OS_String::strcpy (out, "Unsupported Any Type"); + ACE_OS::strcpy (out, "Unsupported Any Type"); } return out; diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp index aff5df0cad2..495f48ce04f 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp @@ -196,10 +196,10 @@ int main (int argc, char* argv[]) // before we start receiving events. ACE_stat buf; char ior_file[PATH_MAX]; - const char* filepart = ACE_OS_String::strstr (ior, "file://"); + const char* filepart = ACE_OS::strstr (ior, "file://"); if (filepart != 0) { - ACE_OS_String::strcpy (ior_file, filepart + 7); + ACE_OS::strcpy (ior_file, filepart + 7); while (ACE_OS::stat (ior_file, &buf) == 0) { ACE_OS::sleep (1); diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp index 0ab02f6757a..2942fc5ed3f 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp @@ -189,10 +189,10 @@ int main (int argc, char* argv[]) // before we start receiving events. ACE_stat buf; char ior_file[PATH_MAX]; - const char* filepart = ACE_OS_String::strstr (ior, "file://"); + const char* filepart = ACE_OS::strstr (ior, "file://"); if (filepart != 0) { - ACE_OS_String::strcpy (ior_file, filepart + 7); + ACE_OS::strcpy (ior_file, filepart + 7); while (ACE_OS::stat (ior_file, &buf) == 0) { ACE_OS::sleep (1); diff --git a/TAO/orbsvcs/tests/Notify/Ordering/common.cpp b/TAO/orbsvcs/tests/Notify/Ordering/common.cpp index 1caccdbb3df..27cb6382507 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/common.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/common.cpp @@ -36,12 +36,12 @@ Any_String (const CORBA::Any& any) } else if (any >>= str) { - ACE_OS_String::strcpy (out, str); + ACE_OS::strcpy (out, str); } else if (any >>= ull) { #if defined (ACE_LACKS_LONGLONG_T) - ACE_OS_String::strcpy (out, ull.as_string (out)); + ACE_OS::strcpy (out, ull.as_string (out)); #else double temp = # if defined (ACE_CONFIG_WIN32_H) @@ -55,7 +55,7 @@ Any_String (const CORBA::Any& any) } else { - ACE_OS_String::strcpy (out, "Unsupported Any Type"); + ACE_OS::strcpy (out, "Unsupported Any Type"); } return out; diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp index 1caccdbb3df..27cb6382507 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp @@ -36,12 +36,12 @@ Any_String (const CORBA::Any& any) } else if (any >>= str) { - ACE_OS_String::strcpy (out, str); + ACE_OS::strcpy (out, str); } else if (any >>= ull) { #if defined (ACE_LACKS_LONGLONG_T) - ACE_OS_String::strcpy (out, ull.as_string (out)); + ACE_OS::strcpy (out, ull.as_string (out)); #else double temp = # if defined (ACE_CONFIG_WIN32_H) @@ -55,7 +55,7 @@ Any_String (const CORBA::Any& any) } else { - ACE_OS_String::strcpy (out, "Unsupported Any Type"); + ACE_OS::strcpy (out, "Unsupported Any Type"); } return out; diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp index 1caccdbb3df..27cb6382507 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp @@ -36,12 +36,12 @@ Any_String (const CORBA::Any& any) } else if (any >>= str) { - ACE_OS_String::strcpy (out, str); + ACE_OS::strcpy (out, str); } else if (any >>= ull) { #if defined (ACE_LACKS_LONGLONG_T) - ACE_OS_String::strcpy (out, ull.as_string (out)); + ACE_OS::strcpy (out, ull.as_string (out)); #else double temp = # if defined (ACE_CONFIG_WIN32_H) @@ -55,7 +55,7 @@ Any_String (const CORBA::Any& any) } else { - ACE_OS_String::strcpy (out, "Unsupported Any Type"); + ACE_OS::strcpy (out, "Unsupported Any Type"); } return out; diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp index 61d82d51eff..e018c1114ab 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp @@ -49,12 +49,12 @@ Any_String (const CORBA::Any& any) } else if (any >>= str) { - ACE_OS_String::strcpy (out, str); + ACE_OS::strcpy (out, str); } else if (any >>= ull) { #if defined (ACE_LACKS_LONGLONG_T) - ACE_OS_String::strcpy (out, ull.as_string (out)); + ACE_OS::strcpy (out, ull.as_string (out)); #else // @@@@ (JP) Need to cast to signed int64 to cast to // double on Win32, but this hack may not fly on @@ -65,7 +65,7 @@ Any_String (const CORBA::Any& any) } else { - ACE_OS_String::strcpy (out, "Unsupported Any Type"); + ACE_OS::strcpy (out, "Unsupported Any Type"); } return out; diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp index b25876d1f83..d2706a70453 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp @@ -113,12 +113,12 @@ Any_String (const CORBA::Any& any) } else if (any >>= str) { - ACE_OS_String::strcpy (out, str); + ACE_OS::strcpy (out, str); } else if (any >>= ull) { #if defined (ACE_LACKS_LONGLONG_T) - ACE_OS_String::strcpy (out, ull.as_string (out)); + ACE_OS::strcpy (out, ull.as_string (out)); #else double temp = # if defined (ACE_CONFIG_WIN32_H) @@ -132,7 +132,7 @@ Any_String (const CORBA::Any& any) } else { - ACE_OS_String::strcpy (out, "Unsupported Any Type"); + ACE_OS::strcpy (out, "Unsupported Any Type"); } return out; diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h index c0a92bbdabd..cc4d7190887 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h +++ b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h @@ -13,7 +13,7 @@ #ifndef TASK_STATS_H #define TASK_STATS_H -#include "ace/OS.h" +#include "ace/OS_NS_time.h" #include "ace/Singleton.h" #include "tao/orbconf.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp index 1caccdbb3df..c88d7dc082d 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp @@ -5,6 +5,7 @@ #include "orbsvcs/CosNotifyCommC.h" #include "orbsvcs/CosNamingC.h" #include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_string.h" const char* @@ -36,12 +37,12 @@ Any_String (const CORBA::Any& any) } else if (any >>= str) { - ACE_OS_String::strcpy (out, str); + ACE_OS::strcpy (out, str); } else if (any >>= ull) { #if defined (ACE_LACKS_LONGLONG_T) - ACE_OS_String::strcpy (out, ull.as_string (out)); + ACE_OS::strcpy (out, ull.as_string (out)); #else double temp = # if defined (ACE_CONFIG_WIN32_H) @@ -55,7 +56,7 @@ Any_String (const CORBA::Any& any) } else { - ACE_OS_String::strcpy (out, "Unsupported Any Type"); + ACE_OS::strcpy (out, "Unsupported Any Type"); } return out; diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp index 6d2869f0609..6b9ee00d231 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp @@ -3,8 +3,7 @@ #include "RedGreen_Test.h" #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" -#include "ace/Synch.h" -#include "ace/OS.h" +#include "ace/OS_NS_unistd.h" #include "orbsvcs/Time_Utilities.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.cpp b/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.cpp index 83d4b3f516d..9b78e32dd27 100644 --- a/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.cpp +++ b/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.cpp @@ -59,7 +59,7 @@ void Object1_impl::method1(const char* activity, - if (strcmp(activity,"Client1") == 0) + if (ACE_OS::strcmp(activity,"Client1") == 0) { ACE_OS::sleep(5); } @@ -77,7 +77,7 @@ void Object1_impl::method1(const char* activity, ACE::timestamp(date_and_time, time_size), activity); ACE_DEBUG((LM_DEBUG,"%s",buf2)); - ACE_OS_String::strcat(buf,buf2); - output = ACE_OS_String::strdup(buf); + ACE_OS::strcat(buf,buf2); + output = ACE_OS::strdup(buf); } diff --git a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp index 0f89c467e59..a75adb276d0 100644 --- a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp +++ b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp @@ -275,7 +275,7 @@ int svc(void) { ACE_DEBUG ((LM_DEBUG, "%s", buf)); - ACE_OS_String::strcat(client_output_, buf); + ACE_OS::strcat(client_output_, buf); do_work(before_); ACE_TRY_CHECK; @@ -289,11 +289,11 @@ int svc(void) { ACE_DEBUG ((LM_DEBUG, "%s", buf)); - ACE_OS_String::strcat(client_output_, buf); - serv_output_ = ACE_OS_String::strdup(""); + ACE_OS::strcat(client_output_, buf); + serv_output_ = ACE_OS::strdup(""); object1->method1 (activity_, remote_, serv_output_.inout()); - ACE_OS_String::strcat(client_output_, serv_output_.in()); + ACE_OS::strcat(client_output_, serv_output_.in()); ACE_OS::sprintf(buf, @@ -304,7 +304,7 @@ int svc(void) { ACE_DEBUG ((LM_DEBUG, "%s", buf)); - ACE_OS_String::strcat(client_output_, buf); + ACE_OS::strcat(client_output_, buf); do_work(after_); @@ -317,7 +317,7 @@ int svc(void) { ACE_DEBUG ((LM_DEBUG, "%s", buf)); - ACE_OS_String::strcat(client_output_, buf); + ACE_OS::strcat(client_output_, buf); } @@ -333,7 +333,7 @@ int svc(void) { activity_)); object1->method1 (activity_, remote_, serv_output_.inout()); - ACE_OS_String::strcat(client_output_,serv_output_.in()); + ACE_OS::strcat(client_output_,serv_output_.in()); /// Finished with remote call ACE_DEBUG ((LM_DEBUG, "%T\t%s\tClient\tDone with method1\n", diff --git a/TAO/orbsvcs/tests/Time/Client_i.cpp b/TAO/orbsvcs/tests/Time/Client_i.cpp index 46bc4dd1d3e..97bef9c2b92 100644 --- a/TAO/orbsvcs/tests/Time/Client_i.cpp +++ b/TAO/orbsvcs/tests/Time/Client_i.cpp @@ -6,7 +6,7 @@ #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" -#include "ace/OS.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(Time_Service, Client_i, "$Id$") @@ -346,8 +346,8 @@ Client_i::obtain_initial_references (void) CosNaming::Name clerk_name; clerk_name.length (2); clerk_name[0].id = CORBA::string_dup ("ClerkContext"); - strcpy (name, "Clerk:"); - strcat (name, host_name); + ACE_OS::strcpy (name, "Clerk:"); + ACE_OS::strcat (name, host_name); clerk_name[1].id = CORBA::string_dup (name); ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp index 52db188302d..8ca25d34fa0 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp @@ -12,6 +12,7 @@ #include "ace/OS_NS_fcntl.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_strings.h" ACE_RCSID(IDL_Cubit, Cubit_Client, "Cubit_Client.cpp,v 1.31 1999/08/04 07:15:14 nanbor Exp") diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp index aef78ddc350..f8664e9c2b2 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp @@ -5,7 +5,7 @@ #include "tao/Strategies/advanced_resource.h" -#include "ace/Synch.h" +#include "ace/Barrier.h" #include "ace/Get_Opt.h" #include "ace/ARGV.h" #include "ace/Thread_Manager.h" diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp index 25363f792a3..2fb15abdc38 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp @@ -4,6 +4,7 @@ #include "Globals.h" #include "Cubit_Task.h" #include "tao/TAO_Internal.h" +#include "ace/Barrier.h" Cubit_Task::Cubit_Task (void) { diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp index 06ac6b5d481..607dc2e63a9 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp @@ -2,6 +2,9 @@ #include "Globals.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_errno.h" +#include "ace/Null_Mutex.h" Globals::Globals (void) : thr_create_flags (0), diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h index 0d5d4a656c0..089c7984ad8 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h @@ -21,16 +21,16 @@ // // ============================================================================ -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Get_Opt.h" -#include "ace/Synch_T.h" #include "ace/Sched_Params.h" #include "ace/Singleton.h" +#include "ace/Condition_Thread_Mutex.h" #include "tao/orbconf.h" @@ -104,6 +104,8 @@ argv = force_argv; // A constant to avoid the utility thread blocking the machine and to // bound its number of computations. +class ACE_Barrier; + class Globals { // = TITLE diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp index e2506fc31fa..0f79cc7403b 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp @@ -4,6 +4,9 @@ #include "Timer.h" #include "ace/Stats.h" #include "tao/TAO_Internal.h" +#include "ace/Barrier.h" +#include "ace/Thread_Semaphore.h" +#include "ace/OS_NS_unistd.h" #if defined (ACE_HAS_QUANTIFY) # include "quantify.h" diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp index e88af4ae191..98564ca9266 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp @@ -2,6 +2,7 @@ #include "Util_Thread.h" #include "ace/ACE.h" +#include "ace/Barrier.h" ACE_RCSID(MT_Cubit, Util_Thread, "$Id$") diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp index 5700981f8af..328b61e16db 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp @@ -11,6 +11,7 @@ #include "server.h" #include "client.h" #include "Globals.h" +#include "ace/Barrier.h" #if defined (ACE_HAS_QUANTIFY) # include "quantify.h" diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp index ba1d14ddc75..3f248e6dbe7 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp @@ -26,6 +26,7 @@ #include "ace/Sched_Params.h" #include "tao/Strategies/advanced_resource.h" #include "ace/streams.h" +#include "ace/Barrier.h" #if defined (ACE_HAS_QUANTIFY) # include "quantify.h" diff --git a/TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp b/TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp index 17e9deb7cb6..fd523b90fe6 100644 --- a/TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp +++ b/TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp @@ -2,7 +2,7 @@ // $Id$ // #include "Memory_Growth.h" -#include "ace/Synch.h" +#include "ace/Manual_Event.h" ACE_RCSID (IORSize, Memory_Growth, diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp index af47b871385..f8a35ff990f 100644 --- a/TAO/tao/Acceptor_Registry.cpp +++ b/TAO/tao/Acceptor_Registry.cpp @@ -180,11 +180,11 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core, // remaining number of endpoints in the current endpoint // specification. const char *ep_end = - ep->c_str () + ACE_OS_String::strlen (ep->c_str ()); + ep->c_str () + ACE_OS::strlen (ep->c_str ()); - for (const char *e = ACE_OS_String::strchr (ep->c_str (), ','); + for (const char *e = ACE_OS::strchr (ep->c_str (), ','); e != 0 && e != ep_end; - e = ACE_OS_String::strchr (e, ',')) + e = ACE_OS::strchr (e, ',')) { ++acceptor_count; ++e; diff --git a/TAO/tao/Adapter.cpp b/TAO/tao/Adapter.cpp index 8d328395e00..08a9bb5d6aa 100644 --- a/TAO/tao/Adapter.cpp +++ b/TAO/tao/Adapter.cpp @@ -4,6 +4,7 @@ #include "debug.h" #include "ace/Dynamic_Service.h" +#include "ace/OS_NS_string.h" #if !defined (__ACE_INLINE__) # include "Adapter.i" diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp index 7d6c434a130..348e7db7eca 100644 --- a/TAO/tao/Any.cpp +++ b/TAO/tao/Any.cpp @@ -9,6 +9,9 @@ #include "tao/Typecode.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_wchar.h" +#include "ace/OS_Memory.h" #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \ || defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) diff --git a/TAO/tao/Any_Basic_Impl.cpp b/TAO/tao/Any_Basic_Impl.cpp index 9fd652ac32b..9f4c1ebf52a 100644 --- a/TAO/tao/Any_Basic_Impl.cpp +++ b/TAO/tao/Any_Basic_Impl.cpp @@ -6,6 +6,7 @@ #include "tao/CDR.h" #include "ace/Auto_Ptr.h" +#include "ace/OS_NS_string.h" ACE_RCSID (tao, Any_Basic_Impl, diff --git a/TAO/tao/Any_Dual_Impl_T.cpp b/TAO/tao/Any_Dual_Impl_T.cpp index 23994423c55..727d27f5f6d 100644 --- a/TAO/tao/Any_Dual_Impl_T.cpp +++ b/TAO/tao/Any_Dual_Impl_T.cpp @@ -13,6 +13,7 @@ #include "ace/CORBA_macros.h" #include "ace/Auto_Ptr.h" +#include "ace/OS_Memory.h" #if !defined (__ACE_INLINE__) # include "tao/Any_Dual_Impl_T.inl" diff --git a/TAO/tao/Any_Impl_T.cpp b/TAO/tao/Any_Impl_T.cpp index 4c9fecf04f2..8353bac4844 100644 --- a/TAO/tao/Any_Impl_T.cpp +++ b/TAO/tao/Any_Impl_T.cpp @@ -12,6 +12,7 @@ #include "ace/CORBA_macros.h" #include "ace/Auto_Ptr.h" +#include "ace/OS_Memory.h" #if !defined (__ACE_INLINE__) # include "tao/Any_Impl_T.inl" diff --git a/TAO/tao/Asynch_Queued_Message.cpp b/TAO/tao/Asynch_Queued_Message.cpp index aa706565e59..70a03a2f040 100644 --- a/TAO/tao/Asynch_Queued_Message.cpp +++ b/TAO/tao/Asynch_Queued_Message.cpp @@ -2,7 +2,7 @@ #include "debug.h" #include "ace/OS_Memory.h" -#include "ace/OS_String.h" +#include "ace/OS_NS_string.h" #include "ace/os_include/sys/os_uio.h" #include "ace/Log_Msg.h" #include "ace/Message_Block.h" @@ -27,9 +27,9 @@ TAO_Asynch_Queued_Message:: i != 0; i = i->cont ()) { - ACE_OS_String::memcpy (this->buffer_ + copy_offset, - i->rd_ptr (), - i->length ()); + ACE_OS::memcpy (this->buffer_ + copy_offset, + i->rd_ptr (), + i->length ()); copy_offset += i->length (); } } @@ -112,9 +112,9 @@ TAO_Asynch_Queued_Message::clone (ACE_Allocator *alloc) char[sz], 0); - ACE_OS_String::memcpy (buf, - this->buffer_ + this->offset_, - sz); + ACE_OS::memcpy (buf, + this->buffer_ + this->offset_, + sz); TAO_Asynch_Queued_Message *qm = 0; diff --git a/TAO/tao/BoundsC.cpp b/TAO/tao/BoundsC.cpp index e54ef21558f..77fd5b3c3dc 100644 --- a/TAO/tao/BoundsC.cpp +++ b/TAO/tao/BoundsC.cpp @@ -32,6 +32,7 @@ #include "BoundsC.h" #include "tao/Any_Dual_Impl_T.h" #include "tao/Typecode.h" +#include "ace/OS_NS_string.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig diff --git a/TAO/tao/CDR_Encaps_Codec.cpp b/TAO/tao/CDR_Encaps_Codec.cpp index fd773ab3c83..c76e10f576a 100644 --- a/TAO/tao/CDR_Encaps_Codec.cpp +++ b/TAO/tao/CDR_Encaps_Codec.cpp @@ -12,6 +12,7 @@ #include "Marshal.h" #include "Any_Unknown_IDL_Type.h" #include "ORB_Constants.h" +#include "ace/OS_NS_string.h" ACE_RCSID (TAO_CodecFactory, CDR_Encaps_Codec, @@ -76,7 +77,7 @@ TAO_CDR_Encaps_Codec::encode (const CORBA::Any & data i = i->cont ()) { size_t len = i->length (); - ACE_OS_String::memcpy (buf, i->rd_ptr (), len); + ACE_OS::memcpy (buf, i->rd_ptr (), len); buf += len; } @@ -217,9 +218,9 @@ TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data i = i->cont ()) { size_t len = i->length (); - ACE_OS_String::memcpy (buf, - i->rd_ptr (), - len); + ACE_OS::memcpy (buf, + i->rd_ptr (), + len); buf += len; } diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp index 0fc69580e78..423836b125f 100644 --- a/TAO/tao/CORBALOC_Parser.cpp +++ b/TAO/tao/CORBALOC_Parser.cpp @@ -3,6 +3,7 @@ #include "Stub.h" #include "Connector_Registry.h" #include "tao/debug.h" +#include "ace/OS_NS_strings.h" #if !defined(__ACE_INLINE__) #include "CORBALOC_Parser.i" diff --git a/TAO/tao/CORBA_String.cpp b/TAO/tao/CORBA_String.cpp index 6c173d9e436..089c0b2076f 100644 --- a/TAO/tao/CORBA_String.cpp +++ b/TAO/tao/CORBA_String.cpp @@ -1,7 +1,8 @@ #include "CORBA_String.h" #include "Managed_Types.h" -#include "ace/OS.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_wchar.h" #include "ace/OS_Memory.h" #include "ace/streams.h" @@ -22,7 +23,7 @@ CORBA::string_dup (const char *str) return 0; } - size_t len = ACE_OS_String::strlen (str); + size_t len = ACE_OS::strlen (str); // This allocates an extra byte for the '\0'; char * copy = CORBA::string_alloc (ACE_static_cast (CORBA::ULong, len)); @@ -33,9 +34,9 @@ CORBA::string_dup (const char *str) return 0; } - ACE_OS_String::memcpy (copy, - str, - len + 1); + ACE_OS::memcpy (copy, + str, + len + 1); return copy; } @@ -69,7 +70,7 @@ CORBA::wstring_dup (const WChar *const str) return 0; } - CORBA::WChar* retval = CORBA::wstring_alloc (ACE_OS_String::strlen (str)); + CORBA::WChar* retval = CORBA::wstring_alloc (ACE_OS::strlen (str)); // The wscpy() below assumes that the destination is a valid buffer. if (retval == 0) @@ -267,7 +268,7 @@ operator>> (istream &is, CORBA::String_out &so) ostream & operator<< (ostream &os, const CORBA::WString_var &wsv) { - const CORBA::ULong len = ACE_OS_String::strlen (wsv.in ()); + const CORBA::ULong len = ACE_OS::strlen (wsv.in ()); for (CORBA::ULong i = 0; i < len; ++i) { @@ -306,7 +307,7 @@ ostream & operator<< (ostream &os, CORBA::WString_out &wso) { CORBA::WChar *tmp = wso.ptr (); - const CORBA::ULong len = ACE_OS_String::strlen (tmp); + const CORBA::ULong len = ACE_OS::strlen (tmp); for (CORBA::ULong i = 0; i < len; ++i) { diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp index 57a00cffbe7..1fdd0dc8dbc 100644 --- a/TAO/tao/CurrentC.cpp +++ b/TAO/tao/CurrentC.cpp @@ -41,6 +41,8 @@ #include "CurrentC.i" #endif /* !defined INLINE */ +#include "ace/OS_NS_string.h" + // TAO_IDL - Generated from // be/be_visitor_arg_traits.cpp:60 diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp index 4f33aae44df..4b329b9b6d1 100644 --- a/TAO/tao/DynamicAny/DynAny_i.cpp +++ b/TAO/tao/DynamicAny/DynAny_i.cpp @@ -4,6 +4,7 @@ #include "DynAny_i.h" #include "DynAnyFactory.h" #include "tao/Any_Unknown_IDL_Type.h" +#include "ace/OS_NS_wchar.h" ACE_RCSID (DynamicAny, DynAny_i, diff --git a/TAO/tao/DynamicAny/DynCommon.cpp b/TAO/tao/DynamicAny/DynCommon.cpp index f014c5b999f..ef43460ba89 100644 --- a/TAO/tao/DynamicAny/DynCommon.cpp +++ b/TAO/tao/DynamicAny/DynCommon.cpp @@ -10,6 +10,7 @@ #include "DynStruct_i.h" #include "DynUnion_i.h" #include "tao/Any_Unknown_IDL_Type.h" +#include "ace/OS_NS_wchar.h" ACE_RCSID (DynamicAny, DynCommon, diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp index 8d8e5f1c0c1..1e06bf14085 100644 --- a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp +++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp @@ -5,6 +5,8 @@ #include "tao/Any.h" #include "tao/Environment.h" #include "tao/TC_Constants_Forward.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_Memory.h" ACE_RCSID (DynamicInterface, Unknown_User_Exception, @@ -51,8 +53,8 @@ int CORBA::UnknownUserException::_is_a (const char *interface_id) const { return - ((ACE_OS_String::strcmp (interface_id, - "IDL:omg.org/CORBA/UnknownUserException:1.0") + ((ACE_OS::strcmp (interface_id, + "IDL:omg.org/CORBA/UnknownUserException:1.0") == 0) || UserException::_is_a (interface_id)); } diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp index a565085eeb3..0b4ab273d0e 100644 --- a/TAO/tao/Exception.cpp +++ b/TAO/tao/Exception.cpp @@ -143,8 +143,8 @@ CORBA::Exception::_type (void) const int CORBA::Exception::_is_a (const char* repository_id) const { - return ACE_OS_String::strcmp (repository_id, - "IDL:omg.org/CORBA/Exception:1.0") == 0; + return ACE_OS::strcmp (repository_id, + "IDL:omg.org/CORBA/Exception:1.0") == 0; } @@ -219,8 +219,8 @@ CORBA::UserException::operator= (const CORBA::UserException &src) int CORBA::UserException::_is_a (const char* interface_id) const { - return ACE_OS_String::strcmp (interface_id, - "IDL:omg.org/CORBA/UserException:1.0") == 0 + return ACE_OS::strcmp (interface_id, + "IDL:omg.org/CORBA/UserException:1.0") == 0 || this->Exception::_is_a (interface_id); } @@ -319,9 +319,9 @@ CORBA::SystemException::operator= (const CORBA::SystemException &src) int CORBA::SystemException::_is_a (const char* interface_id) const { - return ((ACE_OS_String::strcmp (interface_id, this->_rep_id ()) == 0) || - (ACE_OS_String::strcmp (interface_id, - "IDL:omg.org/CORBA/SystemException:1.0") == 0) + return ((ACE_OS::strcmp (interface_id, this->_rep_id ()) == 0) || + (ACE_OS::strcmp (interface_id, + "IDL:omg.org/CORBA/SystemException:1.0") == 0) || this->Exception::_is_a (interface_id)); } @@ -619,7 +619,7 @@ CORBA::SystemException::_info (void) const // 7 bits of some other errno. ACE_OS::sprintf (unknown_errno, "low 7 bits of errno: %3u %s", - minor_code, ACE_OS_String::strerror(minor_code)); + minor_code, ACE_OS::strerror(minor_code)); errno_indication = unknown_errno; } @@ -1024,14 +1024,14 @@ TAO_Exceptions::make_standard_typecode (CORBA::TypeCode_ptr &tcp, char * full_id = CORBA::string_alloc (sizeof prefix + ACE_static_cast (CORBA::ULong, - ACE_OS_String::strlen (name)) + ACE_OS::strlen (name)) + sizeof suffix); CORBA::String_var safe_full_id = full_id; - ACE_OS_String::strcpy (full_id, prefix); - ACE_OS_String::strcat (full_id, name); - ACE_OS_String::strcat (full_id, suffix); + ACE_OS::strcpy (full_id, prefix); + ACE_OS::strcat (full_id, name); + ACE_OS::strcat (full_id, suffix); CORBA::Boolean result = stream.write_octet (TAO_ENCAP_BYTE_ORDER) == 0 || stream.write_string (full_id) == 0 @@ -1223,7 +1223,7 @@ TAO_Exceptions::create_system_exception (const char *id i < array_sz; ++i) { - if (ACE_OS_String::strcmp (id, repo_id_array[i]) == 0) + if (ACE_OS::strcmp (id, repo_id_array[i]) == 0) return (*(excp_array[i])) (); } diff --git a/TAO/tao/GIOPC.cpp b/TAO/tao/GIOPC.cpp index c1915fee9a9..33b4a182df4 100644 --- a/TAO/tao/GIOPC.cpp +++ b/TAO/tao/GIOPC.cpp @@ -31,6 +31,7 @@ #include "GIOPC.h" #include "Typecode.h" +#include "ace/OS_NS_string.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig diff --git a/TAO/tao/IFR_Client/IFR_BaseC.cpp b/TAO/tao/IFR_Client/IFR_BaseC.cpp index 44703652ea0..d08e518e395 100644 --- a/TAO/tao/IFR_Client/IFR_BaseC.cpp +++ b/TAO/tao/IFR_Client/IFR_BaseC.cpp @@ -41,6 +41,7 @@ #include "tao/Special_Basic_Arguments.h" #include "tao/UB_String_Arguments.h" #include "tao/Var_Size_Argument_T.h" +#include "ace/OS_NS_string.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig diff --git a/TAO/tao/IFR_Client/IFR_BasicC.cpp b/TAO/tao/IFR_Client/IFR_BasicC.cpp index f21afbc88a7..74dd43ae954 100644 --- a/TAO/tao/IFR_Client/IFR_BasicC.cpp +++ b/TAO/tao/IFR_Client/IFR_BasicC.cpp @@ -41,6 +41,7 @@ #include "tao/Special_Basic_Arguments.h" #include "tao/UB_String_Arguments.h" #include "tao/Var_Size_Argument_T.h" +#include "ace/OS_NS_string.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.h b/TAO/tao/IFR_Client/IFR_ComponentsC.h index 5a4dc479948..254686170c9 100644 --- a/TAO/tao/IFR_Client/IFR_ComponentsC.h +++ b/TAO/tao/IFR_Client/IFR_ComponentsC.h @@ -49,6 +49,7 @@ #include "tao/Seq_Var_T.h" #include "tao/Seq_Out_T.h" #include "tao/VarOut_T.h" +#include "ace/OS_NS_string.h" #include "IFR_ExtendedC.h" diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp index f8cdcf5ffaf..286874300c2 100644 --- a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp +++ b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp @@ -40,6 +40,7 @@ #include "tao/Special_Basic_Arguments.h" #include "tao/UB_String_Arguments.h" #include "tao/Var_Size_Argument_T.h" +#include "ace/OS_NS_string.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp index ac9bfe23d9a..39e3aa883c6 100644 --- a/TAO/tao/IIOP_Connector.cpp +++ b/TAO/tao/IIOP_Connector.cpp @@ -8,6 +8,7 @@ #include "Thread_Lane_Resources.h" #include "Transport.h" #include "Wait_Strategy.h" +#include "ace/OS_NS_strings.h" //#include "ace/Strategies_T.h" diff --git a/TAO/tao/IIOP_Endpoint.cpp b/TAO/tao/IIOP_Endpoint.cpp index 2b0294deccd..d8cd507b1a7 100644 --- a/TAO/tao/IIOP_Endpoint.cpp +++ b/TAO/tao/IIOP_Endpoint.cpp @@ -4,6 +4,8 @@ #include "ace/Log_Msg.h" #include "ace/Guard_T.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_strings.h" ACE_RCSID (tao, IIOP_Endpoint, diff --git a/TAO/tao/IIOP_Factory.cpp b/TAO/tao/IIOP_Factory.cpp index 16624f8eb23..22fbd982b04 100644 --- a/TAO/tao/IIOP_Factory.cpp +++ b/TAO/tao/IIOP_Factory.cpp @@ -1,6 +1,7 @@ #include "IIOP_Factory.h" #include "IIOP_Acceptor.h" #include "IIOP_Connector.h" +#include "ace/OS_NS_strings.h" ACE_RCSID (tao, IIOP_Factory, diff --git a/TAO/tao/IIOP_Lite_Factory.cpp b/TAO/tao/IIOP_Lite_Factory.cpp index 1dd6ddf34ea..2dcdec29eb6 100644 --- a/TAO/tao/IIOP_Lite_Factory.cpp +++ b/TAO/tao/IIOP_Lite_Factory.cpp @@ -3,6 +3,7 @@ #include "tao/IIOP_Lite_Factory.h" #include "tao/IIOP_Acceptor.h" #include "tao/IIOP_Connector.h" +#include "ace/OS_NS_strings.h" ACE_RCSID (tao, IIOP_Factory, diff --git a/TAO/tao/IOP_CodecC.cpp b/TAO/tao/IOP_CodecC.cpp index 869454b87ed..a5d5f72bc73 100644 --- a/TAO/tao/IOP_CodecC.cpp +++ b/TAO/tao/IOP_CodecC.cpp @@ -36,6 +36,7 @@ #include "tao/Fixed_Size_Argument_T.h" #include "tao/Var_Size_Argument_T.h" #include "tao/Typecode.h" +#include "ace/OS_NS_string.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig diff --git a/TAO/tao/IORTable/IORTableC.cpp b/TAO/tao/IORTable/IORTableC.cpp index bcad9d2add2..518f3887079 100644 --- a/TAO/tao/IORTable/IORTableC.cpp +++ b/TAO/tao/IORTable/IORTableC.cpp @@ -36,6 +36,7 @@ #include "tao/Basic_Arguments.h" #include "tao/Object_Argument_T.h" #include "tao/UB_String_Arguments.h" +#include "ace/OS_NS_string.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig diff --git a/TAO/tao/Interceptor_List.cpp b/TAO/tao/Interceptor_List.cpp index 8ee4ad3ea79..eff319a309d 100644 --- a/TAO/tao/Interceptor_List.cpp +++ b/TAO/tao/Interceptor_List.cpp @@ -4,6 +4,8 @@ #include "tao/Interceptor_List.h" #include "tao/ORB_Constants.h" +#include "ace/os_include/os_stddef.h" +#include "ace/OS_NS_string.h" #if !defined (__ACE_INLINE__) # include "tao/Interceptor_List.inl" @@ -41,7 +43,7 @@ TAO_Interceptor_List::add_interceptor_i ( const size_t old_len = this->length (); - if (ACE_OS_String::strlen (name.in ()) != 0) + if (ACE_OS::strlen (name.in ()) != 0) { // @@ This simple search algorithm isn't the greatest thing // in the world, but since we only register interceptors @@ -63,8 +65,8 @@ TAO_Interceptor_List::add_interceptor_i ( CORBA::String_var existing_name = this->interceptor (i)->name (); - if (ACE_OS_String::strcmp (existing_name.in (), - name.in ()) == 0) + if (ACE_OS::strcmp (existing_name.in (), + name.in ()) == 0) { ACE_THROW_RETURN (PortableInterceptor::ORBInitInfo::DuplicateName (), diff --git a/TAO/tao/MCAST_Parser.cpp b/TAO/tao/MCAST_Parser.cpp index 759e7e19113..c5920d67530 100644 --- a/TAO/tao/MCAST_Parser.cpp +++ b/TAO/tao/MCAST_Parser.cpp @@ -7,6 +7,7 @@ #include "ace/SOCK_Acceptor.h" #include "ace/SOCK_Dgram.h" +#include "ace/OS_NS_strings.h" #if !defined(__ACE_INLINE__) #include "MCAST_Parser.i" @@ -394,7 +395,7 @@ TAO_MCAST_Parser::assign_to_variables (const char * &mcast_name) } - ACE_OS_String::itoa (trial_port, default_port, 10); + ACE_OS::itoa (trial_port, default_port, 10); this->mcast_port_ = (const char *) default_port; } diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index 812201accfc..6a119ce8fa5 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -34,7 +34,7 @@ ACE_RCSID (tao, #include "ace/Arg_Shifter.h" #include "ace/Reactor.h" #include "ace/Argv_Type_Converter.h" - +#include "ace/OS_NS_strings.h" #if !defined (__ACE_INLINE__) # include "ORB.i" @@ -1059,9 +1059,9 @@ CORBA::ORB::resolve_service (TAO_MCAST_SERVICEID mcast_service_id char port_char[256]; - ACE_OS_String::itoa (port, - port_char, - 10); + ACE_OS::itoa (port, + port_char, + 10); CORBA::String_var port_ptr = CORBA::string_alloc (ACE_static_cast (CORBA::ULong, diff --git a/TAO/tao/ORBInitInfo.cpp b/TAO/tao/ORBInitInfo.cpp index e424388a38d..a6fd03a656b 100644 --- a/TAO/tao/ORBInitInfo.cpp +++ b/TAO/tao/ORBInitInfo.cpp @@ -147,7 +147,7 @@ TAO_ORBInitInfo::register_initial_reference ( if (id == 0) ACE_THROW (PortableInterceptor::ORBInitInfo::InvalidName ()); - else if (ACE_OS_String::strlen (id) == 0) + else if (ACE_OS::strlen (id) == 0) ACE_THROW (PortableInterceptor::ORBInitInfo::InvalidName ()); @@ -170,7 +170,7 @@ TAO_ORBInitInfo::resolve_initial_references ( if (id == 0) ACE_THROW_RETURN (PortableInterceptor::ORBInitInfo::InvalidName (), CORBA::Object::_nil ()); - else if (ACE_OS_String::strlen (id) == 0) + else if (ACE_OS::strlen (id) == 0) ACE_THROW_RETURN (PortableInterceptor::ORBInitInfo::InvalidName (), CORBA::Object::_nil ()); diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 18f629bad93..f404c3bf814 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -37,6 +37,7 @@ #include "ace/Arg_Shifter.h" #include "ace/Argv_Type_Converter.h" #include "ace/streams.h" +#include "ace/OS_NS_strings.h" #if !defined (__ACE_INLINE__) # include "ORB_Core.i" @@ -954,9 +955,9 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) { char ns_port_char[256]; - ACE_OS_String::itoa (ns_port, - ns_port_char, - 10); + ACE_OS::itoa (ns_port, + ns_port_char, + 10); CORBA::String_var ns_port_ptr = CORBA::string_alloc (ACE_static_cast (CORBA::ULong, diff --git a/TAO/tao/Object_Ref_Table.cpp b/TAO/tao/Object_Ref_Table.cpp index af3503a9fef..481afa2a4a4 100644 --- a/TAO/tao/Object_Ref_Table.cpp +++ b/TAO/tao/Object_Ref_Table.cpp @@ -3,6 +3,7 @@ #include "Environment.h" #include "debug.h" #include "ORB_Constants.h" +#include "ace/OS_NS_string.h" ACE_RCSID (tao, Object_Ref_Table, @@ -28,7 +29,7 @@ TAO_Object_Ref_Table::register_initial_reference ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL) { - if (id == 0 || ACE_OS_String::strlen (id) == 0) + if (id == 0 || ACE_OS::strlen (id) == 0) { ACE_THROW (CORBA::ORB::InvalidName ()); } diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp index 63a434fec6d..21b0cefe55f 100644 --- a/TAO/tao/PolicyC.cpp +++ b/TAO/tao/PolicyC.cpp @@ -37,6 +37,7 @@ #include "tao/Any_Dual_Impl_T.h" #include "tao/Basic_Arguments.h" #include "tao/Var_Size_Argument_T.h" +#include "ace/OS_NS_string.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp index abde9255d7c..4e814ff87d9 100644 --- a/TAO/tao/PollableC.cpp +++ b/TAO/tao/PollableC.cpp @@ -30,7 +30,7 @@ #include "PollableC.h" -#include "ace/OS.h" +#include "ace/OS_NS_string.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp index aadbf2f7bfa..ba148a3e1ea 100644 --- a/TAO/tao/PortableInterceptorC.cpp +++ b/TAO/tao/PortableInterceptorC.cpp @@ -34,6 +34,7 @@ #include "Any_Impl_T.h" #include "Any_Dual_Impl_T.h" #include "tao/Typecode.h" +#include "ace/OS_NS_string.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig diff --git a/TAO/tao/PortableServer/ImR_LocatorC.cpp b/TAO/tao/PortableServer/ImR_LocatorC.cpp index d41dd7fc1d1..9f5feda7e35 100644 --- a/TAO/tao/PortableServer/ImR_LocatorC.cpp +++ b/TAO/tao/PortableServer/ImR_LocatorC.cpp @@ -40,6 +40,7 @@ #include "tao/Object_Argument_T.h" #include "tao/UB_String_Arguments.h" #include "tao/Typecode.h" +#include "ace/OS_NS_string.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig diff --git a/TAO/tao/PortableServer/ImplRepoC.cpp b/TAO/tao/PortableServer/ImplRepoC.cpp index 009bcdf7f22..d9c4246868e 100644 --- a/TAO/tao/PortableServer/ImplRepoC.cpp +++ b/TAO/tao/PortableServer/ImplRepoC.cpp @@ -42,6 +42,7 @@ #include "tao/UB_String_Arguments.h" #include "tao/Var_Size_Argument_T.h" #include "tao/Typecode.h" +#include "ace/OS_NS_string.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig diff --git a/TAO/tao/PortableServer/Key_Adapters.cpp b/TAO/tao/PortableServer/Key_Adapters.cpp index 0e0ce539c3a..ba8d96e1f34 100644 --- a/TAO/tao/PortableServer/Key_Adapters.cpp +++ b/TAO/tao/PortableServer/Key_Adapters.cpp @@ -3,6 +3,7 @@ #include "Key_Adapters.h" #include "ace/ACE.h" +#include "ace/OS_NS_string.h" #if !defined (__ACE_INLINE__) # include "Key_Adapters.i" diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp index e671e2a82d2..5904430ab4e 100644 --- a/TAO/tao/PortableServer/POA.cpp +++ b/TAO/tao/PortableServer/POA.cpp @@ -31,6 +31,7 @@ ACE_RCSID (PortableServer, #include "tao/debug.h" #include "tao/IORInterceptor/IORInterceptor_List.h" #include "Default_Acceptor_Filter.h" +#include "ace/OS_NS_wchar.h" #include "PortableGroup_Hooks.h" diff --git a/TAO/tao/PortableServer/ServerRequestInfo.cpp b/TAO/tao/PortableServer/ServerRequestInfo.cpp index 771b7c59eff..d52dc59278b 100644 --- a/TAO/tao/PortableServer/ServerRequestInfo.cpp +++ b/TAO/tao/PortableServer/ServerRequestInfo.cpp @@ -371,7 +371,7 @@ TAO_ServerRequestInfo::object_id (ACE_ENV_SINGLE_ARG_DECL) CORBA::ULong len = id.length (); obj_id->length (len); CORBA::Octet *buffer = obj_id->get_buffer (); - ACE_OS_String::memcpy (buffer, id.get_buffer (), len); + ACE_OS::memcpy (buffer, id.get_buffer (), len); return obj_id._retn (); } diff --git a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h index 1921d38f0cc..f4cdc20ee7e 100644 --- a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h +++ b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h @@ -24,8 +24,6 @@ #include "rtcorba_export.h" #include "Priority_Mapping.h" -#include "ace/OS.h" - /** * @class TAO_Continuous_Priority_Mapping * diff --git a/TAO/tao/RTCORBA/RTCORBAC.cpp b/TAO/tao/RTCORBA/RTCORBAC.cpp index 6de61886ea0..b564728cece 100644 --- a/TAO/tao/RTCORBA/RTCORBAC.cpp +++ b/TAO/tao/RTCORBA/RTCORBAC.cpp @@ -34,6 +34,7 @@ #include "tao/Any_Impl_T.h" #include "tao/Any_Dual_Impl_T.h" #include "tao/Any_Basic_Impl_T.h" +#include "ace/OS_NS_string.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp index cc7bf866d63..7d3847cecac 100644 --- a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp +++ b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp @@ -7,6 +7,7 @@ #include "tao/debug.h" #include "tao/ORB_Constants.h" #include "tao/ORBInitializer_Registry.h" +#include "ace/OS_NS_strings.h" ACE_RCSID (RTCORBA, RT_ORB_Loader, diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.cpp b/TAO/tao/RTPortableServer/RTPortableServerC.cpp index 5baa6731678..571d86729a6 100644 --- a/TAO/tao/RTPortableServer/RTPortableServerC.cpp +++ b/TAO/tao/RTPortableServer/RTPortableServerC.cpp @@ -42,6 +42,7 @@ #include "tao/UB_String_Arguments.h" #include "tao/Var_Size_Argument_T.h" #include "tao/Typecode.h" +#include "ace/OS_NS_string.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp index e19a5e2b94f..c7c27c99389 100644 --- a/TAO/tao/RTScheduling/Current.cpp +++ b/TAO/tao/RTScheduling/Current.cpp @@ -6,7 +6,7 @@ #include "tao/ORB_Core.h" #include "tao/TSS_Resources.h" #include "ace/ACE.h" - +#include "ace/OS_NS_errno.h" ACE_RCSID (RTScheduling, Current, diff --git a/TAO/tao/RTScheduling/RTSchedulerC.cpp b/TAO/tao/RTScheduling/RTSchedulerC.cpp index ca4a2e151fe..a8aa8f6c185 100644 --- a/TAO/tao/RTScheduling/RTSchedulerC.cpp +++ b/TAO/tao/RTScheduling/RTSchedulerC.cpp @@ -31,6 +31,7 @@ #include "RTScheduler.h" #include "tao/Typecode.h" +#include "ace/OS_NS_string.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig diff --git a/TAO/tao/RTScheduling/Request_Interceptor.cpp b/TAO/tao/RTScheduling/Request_Interceptor.cpp index cd5fb5ed4ad..adf013c0f12 100644 --- a/TAO/tao/RTScheduling/Request_Interceptor.cpp +++ b/TAO/tao/RTScheduling/Request_Interceptor.cpp @@ -8,6 +8,7 @@ #include "tao/Any.h" #include "tao/Typecode.h" #include "tao/ORB_Constants.h" +#include "ace/OS_NS_string.h" ACE_RCSID (RTScheduling, Request_Interceptor, @@ -206,7 +207,7 @@ Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_pt // If the remote host threw a THREAD_CANCELLED // exception, make sure to take the appropriate // local action. - if (ACE_OS_String::strstr (id, "CORBA::THREAD_CANCELLED") == 0) + if (ACE_OS::strstr (id, "CORBA::THREAD_CANCELLED") == 0) { // Perform the necessary cleanup as the // thread was cancelled. diff --git a/TAO/tao/Sequence.cpp b/TAO/tao/Sequence.cpp index 7012dd70044..25e49847c75 100644 --- a/TAO/tao/Sequence.cpp +++ b/TAO/tao/Sequence.cpp @@ -2,16 +2,16 @@ #include "Sequence.h" +#if !defined (__ACE_INLINE__) +#include "tao/Sequence.i" +#endif /* __ACE_INLINE__ */ + #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) # include "ace/Message_Block.h" #endif /* (TAO_NO_COPY_OCTET_SEQUENCES == 1) */ #include "ace/Log_Msg.h" -#include "ace/OS_String.h" - -#if !defined (__ACE_INLINE__) -#include "tao/Sequence.i" -#endif /* __ACE_INLINE__ */ +#include "ace/OS_NS_string.h" ACE_RCSID (tao, Sequence, @@ -704,9 +704,9 @@ TAO_Unbounded_Sequence<CORBA::Octet>::TAO_Unbounded_Sequence ( #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) if (rhs.mb_ == 0) { - ACE_OS_String::memcpy (tmp1, - tmp2, - this->length_); + ACE_OS::memcpy (tmp1, + tmp2, + this->length_); } else { @@ -714,9 +714,9 @@ TAO_Unbounded_Sequence<CORBA::Octet>::TAO_Unbounded_Sequence ( for (const ACE_Message_Block *i = rhs.mb_; i != 0; i = i->cont ()) { - ACE_OS_String::memcpy (tmp1 + offset, - i->rd_ptr (), - i->length ()); + ACE_OS::memcpy (tmp1 + offset, + i->rd_ptr (), + i->length ()); offset += i->length (); } @@ -790,9 +790,9 @@ TAO_Unbounded_Sequence<CORBA::Octet>::operator= ( // tmp1[i] = tmp2[i]; if (rhs.mb_ == 0) { - ACE_OS_String::memcpy (tmp1, - tmp2, - this->length_); + ACE_OS::memcpy (tmp1, + tmp2, + this->length_); } else { @@ -800,9 +800,9 @@ TAO_Unbounded_Sequence<CORBA::Octet>::operator= ( for (const ACE_Message_Block *i = rhs.mb_; i != 0; i = i->cont ()) { - ACE_OS_String::memcpy (tmp1 + offset, - i->rd_ptr (), - i->length ()); + ACE_OS::memcpy (tmp1 + offset, + i->rd_ptr (), + i->length ()); offset += i->length (); } } @@ -902,7 +902,7 @@ TAO_Unbounded_Sequence<CORBA::Octet>::get_buffer (CORBA::Boolean orphan) // buffer comes from a CDR stream. // result = TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (this->length_); - ACE_OS_String::memcpy (result, this->buffer_, this->length_); + ACE_OS::memcpy (result, this->buffer_, this->length_); } else if (this->release_ != 0) { diff --git a/TAO/tao/Service_Context.cpp b/TAO/tao/Service_Context.cpp index 8ae56ed54cd..3d24b561d92 100644 --- a/TAO/tao/Service_Context.cpp +++ b/TAO/tao/Service_Context.cpp @@ -4,12 +4,12 @@ #include "tao/Service_Context.h" -#include "ace/OS_String.h" - #if !defined (__ACE_INLINE__) # include "tao/Service_Context.inl" #endif /* ! __ACE_INLINE__ */ +#include "ace/OS_NS_string.h" + ACE_RCSID (tao, Service_Context, "$Id$") @@ -30,7 +30,7 @@ TAO_Service_Context::set_context_i (IOP::ServiceId id, i != 0; i = i->cont ()) { - ACE_OS_String::memcpy (buf, i->rd_ptr (), i->length ()); + ACE_OS::memcpy (buf, i->rd_ptr (), i->length ()); buf += i->length (); } @@ -50,7 +50,7 @@ TAO_Service_Context::set_context_i (IOP::ServiceContext &context, i != 0; i = i->cont ()) { - ACE_OS_String::memcpy (buf, i->rd_ptr (), i->length ()); + ACE_OS::memcpy (buf, i->rd_ptr (), i->length ()); buf += i->length (); } } diff --git a/TAO/tao/Strategies/DIOP_Connector.cpp b/TAO/tao/Strategies/DIOP_Connector.cpp index 50bc2d6375c..a7556ca8c88 100644 --- a/TAO/tao/Strategies/DIOP_Connector.cpp +++ b/TAO/tao/Strategies/DIOP_Connector.cpp @@ -12,6 +12,7 @@ #include "tao/Environment.h" #include "tao/Base_Transport_Property.h" #include "tao/Protocols_Hooks.h" +#include "ace/OS_NS_strings.h" #include "DIOP_Profile.h" diff --git a/TAO/tao/Strategies/DIOP_Factory.cpp b/TAO/tao/Strategies/DIOP_Factory.cpp index 5fdad1c1bc4..e38a62a6925 100644 --- a/TAO/tao/Strategies/DIOP_Factory.cpp +++ b/TAO/tao/Strategies/DIOP_Factory.cpp @@ -6,6 +6,7 @@ #include "DIOP_Acceptor.h" #include "DIOP_Connector.h" +#include "ace/OS_NS_strings.h" ACE_RCSID(TAO_Strategies, DIOP_Factory, "$Id$") diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp index 3d1f53b70f5..b8c1aa11b2a 100644 --- a/TAO/tao/Strategies/SHMIOP_Connector.cpp +++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp @@ -15,6 +15,7 @@ #include "tao/Transport_Cache_Manager.h" #include "tao/Thread_Lane_Resources.h" #include "tao/Blocked_Connect_Strategy.h" +#include "ace/OS_NS_strings.h" ACE_RCSID (Strategies, SHMIOP_Connector, diff --git a/TAO/tao/Strategies/SHMIOP_Factory.cpp b/TAO/tao/Strategies/SHMIOP_Factory.cpp index 1fca55ba6c1..188fa76ff99 100644 --- a/TAO/tao/Strategies/SHMIOP_Factory.cpp +++ b/TAO/tao/Strategies/SHMIOP_Factory.cpp @@ -8,6 +8,7 @@ #include "SHMIOP_Connector.h" #include "ace/Arg_Shifter.h" #include "ace/Argv_Type_Converter.h" +#include "ace/OS_NS_strings.h" ACE_RCSID(Strategies, SHMIOP_Factory, "$Id$") diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp index 5ffc549a80c..fe21b22e61f 100644 --- a/TAO/tao/Strategies/UIOP_Connector.cpp +++ b/TAO/tao/Strategies/UIOP_Connector.cpp @@ -11,6 +11,8 @@ #include "tao/Transport_Cache_Manager.h" #include "tao/Thread_Lane_Resources.h" #include "tao/Connect_Strategy.h" +#include "ace/OS_NS_strings.h" + ACE_RCSID(Strategies, UIOP_Connector, "$Id$") diff --git a/TAO/tao/Strategies/UIOP_Factory.cpp b/TAO/tao/Strategies/UIOP_Factory.cpp index 622b2400621..f2d125aec26 100644 --- a/TAO/tao/Strategies/UIOP_Factory.cpp +++ b/TAO/tao/Strategies/UIOP_Factory.cpp @@ -7,6 +7,7 @@ #include "UIOP_Acceptor.h" #include "UIOP_Connector.h" +#include "ace/OS_NS_strings.h" ACE_RCSID(Strategies, UIOP_Factory, "$Id$") diff --git a/TAO/tao/Strategies/UIOP_Lite_Factory.cpp b/TAO/tao/Strategies/UIOP_Lite_Factory.cpp index a7806c842d4..01d015ce1fb 100644 --- a/TAO/tao/Strategies/UIOP_Lite_Factory.cpp +++ b/TAO/tao/Strategies/UIOP_Lite_Factory.cpp @@ -8,6 +8,7 @@ #include "UIOP_Acceptor.h" #include "UIOP_Connector.h" #include "ace/Dynamic_Service.h" +#include "ace/OS_NS_strings.h" ACE_RCSID(Strategies, UIOP_Lite_Factory, "$Id$") diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp index 10db357ae2a..88c1b2ab71f 100644 --- a/TAO/tao/Strategies/advanced_resource.cpp +++ b/TAO/tao/Strategies/advanced_resource.cpp @@ -37,6 +37,7 @@ #include "ace/Memory_Pool.h" #include "ace/Null_Mutex.h" #include "ace/Malloc.h" +#include "ace/OS_NS_strings.h" ACE_RCSID(Strategies, advanced_resource, "$Id$") diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp index 9646dc6a4b5..309e9c7dc97 100644 --- a/TAO/tao/TAOC.cpp +++ b/TAO/tao/TAOC.cpp @@ -34,6 +34,7 @@ #include "tao/Any_Dual_Impl_T.h" #include "tao/Fixed_Size_Argument_T.h" #include "tao/Typecode.h" +#include "ace/OS_NS_string.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig diff --git a/TAO/tao/TAO_Singleton_Manager.h b/TAO/tao/TAO_Singleton_Manager.h index d0ef711e441..891a31ebf0e 100644 --- a/TAO/tao/TAO_Singleton_Manager.h +++ b/TAO/tao/TAO_Singleton_Manager.h @@ -18,7 +18,7 @@ #define TAO_SINGLETON_MANAGER_H #include /**/ "ace/pre.h" -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -26,6 +26,7 @@ #include "tao/TAO_Export.h" #include "tao/orbconf.h" +#include "ace/Object_Manager_Base.h" #if defined (ACE_HAS_EXCEPTIONS) typedef void (*TAO_unexpected_handler)(void); diff --git a/TAO/tao/Tagged_Components.cpp b/TAO/tao/Tagged_Components.cpp index 9a969cc4820..f386beb90b3 100644 --- a/TAO/tao/Tagged_Components.cpp +++ b/TAO/tao/Tagged_Components.cpp @@ -2,12 +2,12 @@ #include "tao/Tagged_Components.h" -#include "ace/OS_String.h" - #if !defined (__ACE_INLINE__) # include "tao/Tagged_Components.i" #endif /* ! __ACE_INLINE__ */ +#include "ace/OS_NS_string.h" + ACE_RCSID (tao, Tagged_Components, "$Id$") @@ -85,7 +85,7 @@ TAO_Tagged_Components::set_component_i (IOP::ComponentId tag, i != 0; i = i->cont ()) { - ACE_OS_String::memcpy (buf, i->rd_ptr (), i->length ()); + ACE_OS::memcpy (buf, i->rd_ptr (), i->length ()); buf += i->length (); } diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp index 806b6889a4b..c2d517689f7 100644 --- a/TAO/tao/Typecode.cpp +++ b/TAO/tao/Typecode.cpp @@ -22,6 +22,7 @@ #include "ORB_Constants.h" #include "ace/Null_Mutex.h" +#include "ace/OS_NS_string.h" #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \ || defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) diff --git a/TAO/tao/Valuetype/AbstractBase.h b/TAO/tao/Valuetype/AbstractBase.h index c26f2682b11..9a490b17b42 100644 --- a/TAO/tao/Valuetype/AbstractBase.h +++ b/TAO/tao/Valuetype/AbstractBase.h @@ -23,7 +23,6 @@ #include "tao/Pseudo_VarOut_T.h" #include "ace/CORBA_macros.h" -#include "ace/OS.h" #include "tao/Object_Argument_T.h" #include "tao/Arg_Traits_T.h" #include "tao/Objref_VarOut_T.h" diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp index 7b99ac66af6..5bee4c88703 100644 --- a/TAO/tao/WrongTransactionC.cpp +++ b/TAO/tao/WrongTransactionC.cpp @@ -44,6 +44,8 @@ #include "WrongTransactionC.i" #endif /* !defined INLINE */ +#include "ace/OS_NS_string.h" + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:59 @@ -92,8 +94,8 @@ void CORBA::WrongTransaction::_tao_any_destructor (void *_tao_void_pointer) CORBA::WrongTransaction * CORBA::WrongTransaction::_downcast (CORBA::Exception *_tao_excp) { - if (!ACE_OS_String::strcmp ("IDL:omg.org/CORBA/WrongTransaction:1.0", - _tao_excp->_rep_id ())) + if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/WrongTransaction:1.0", + _tao_excp->_rep_id ())) { return ACE_dynamic_cast (WrongTransaction *, _tao_excp); } diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp index 5aa9b0202d9..6c053e555ba 100644 --- a/TAO/tao/default_resource.cpp +++ b/TAO/tao/default_resource.cpp @@ -17,6 +17,7 @@ #include "ace/Dynamic_Service.h" #include "ace/Malloc.h" #include "ace/Codeset_Registry.h" +#include "ace/OS_NS_strings.h" #if !defined (__ACE_INLINE__) # include "tao/default_resource.i" @@ -174,8 +175,8 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) ncs) == 0) { char **endPtr =0; - ncs = ACE_OS_String::strtoul(ACE_TEXT_ALWAYS_CHAR(argv[curarg]), - endPtr, 0); + ncs = ACE_OS::strtoul(ACE_TEXT_ALWAYS_CHAR(argv[curarg]), + endPtr, 0); } // Validate the CodesetId if (ACE_Codeset_Registry::get_max_bytes(ncs) == 0) @@ -200,8 +201,8 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) ncs) == 0) { char **endPtr = 0; - ncs = ACE_OS_String::strtoul(ACE_TEXT_ALWAYS_CHAR(argv[curarg]), - endPtr, 0); + ncs = ACE_OS::strtoul(ACE_TEXT_ALWAYS_CHAR(argv[curarg]), + endPtr, 0); } // Validate the CodesetId int mb = ACE_Codeset_Registry::get_max_bytes(ncs); diff --git a/TAO/tao/operation_details.cpp b/TAO/tao/operation_details.cpp index 74928091a36..6aa3fab038f 100644 --- a/TAO/tao/operation_details.cpp +++ b/TAO/tao/operation_details.cpp @@ -5,6 +5,7 @@ #include "ORB_Constants.h" #include "DynamicC.h" #include "Exception_Data.h" +#include "ace/OS_NS_string.h" #if !defined (__ACE_INLINE__) # include "tao/operation_details.i" diff --git a/TAO/tests/Bug_1269_Regression/Server_Timer.cpp b/TAO/tests/Bug_1269_Regression/Server_Timer.cpp index 858ef4d973c..66fbce3ae34 100644 --- a/TAO/tests/Bug_1269_Regression/Server_Timer.cpp +++ b/TAO/tests/Bug_1269_Regression/Server_Timer.cpp @@ -8,6 +8,7 @@ */ #include "Server_Timer.h" #include "ace/Reactor.h" +#include "ace/OS_NS_string.h" ACE_RCSID(Bug_1269_Regression, Server_Timer, "$Id$") diff --git a/TAO/tests/Bug_1270_Regression/Server_Timer.cpp b/TAO/tests/Bug_1270_Regression/Server_Timer.cpp index f9a0fb57173..7deb4156030 100644 --- a/TAO/tests/Bug_1270_Regression/Server_Timer.cpp +++ b/TAO/tests/Bug_1270_Regression/Server_Timer.cpp @@ -8,6 +8,7 @@ */ #include "Server_Timer.h" #include "ace/Reactor.h" +#include "ace/OS_NS_string.h" ACE_RCSID(Bug_1270_Regression, Server_Timer, "$Id$") diff --git a/TAO/tests/Bug_1361_Regression/Echo.cpp b/TAO/tests/Bug_1361_Regression/Echo.cpp index fa28f4babab..1c6905db23c 100644 --- a/TAO/tests/Bug_1361_Regression/Echo.cpp +++ b/TAO/tests/Bug_1361_Regression/Echo.cpp @@ -8,6 +8,7 @@ */ #include "Echo.h" #include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_string.h" ACE_RCSID(Bug_1270_Regression, Echo, "$Id$") diff --git a/TAO/tests/CDR/octet_sequence.cpp b/TAO/tests/CDR/octet_sequence.cpp index 7f61ca79240..905bee48f55 100644 --- a/TAO/tests/CDR/octet_sequence.cpp +++ b/TAO/tests/CDR/octet_sequence.cpp @@ -21,6 +21,7 @@ #include "ace/Log_Msg.h" #include "tao/CDR.h" +#include "ace/OS_NS_string.h" ACE_Message_Block * m1; ACE_Message_Block * m2; @@ -44,13 +45,13 @@ int main(int, char*[]) // setup mb's char buf[1024]; m1=new ACE_Message_Block(1024); - memset(buf,'1',512); + ACE_OS::memset(buf,'1',512); m1->copy(buf,512); m2=new ACE_Message_Block(1024); - memset(buf,'2',512); + ACE_OS::memset(buf,'2',512); m2->copy(buf,512); m3=new ACE_Message_Block(1024); - memset(buf,'3',512); + ACE_OS::memset(buf,'3',512); m3->copy(buf,512); m1->cont(m2); diff --git a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp index 764c1e03080..32962cfb721 100644 --- a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp +++ b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp @@ -19,7 +19,8 @@ // ============================================================================ #include "Char_IBM1047_ISO8859_Translator.h" -#include "ace/OS.h" +#include "ace/OS_Memory.h" +#include "ace/OS_NS_string.h" ACE_RCSID (IBM1047_ISO8859, Char_IBM1047_ISO8859_Translator, diff --git a/TAO/tests/CodeSets/simple/client.cpp b/TAO/tests/CodeSets/simple/client.cpp index 9d913ebb792..d4c0a9ebaf3 100644 --- a/TAO/tests/CodeSets/simple/client.cpp +++ b/TAO/tests/CodeSets/simple/client.cpp @@ -20,6 +20,7 @@ #include "simpleC.h" #include "ace/ace_wchar.h" #include "ace/streams.h" +#include "ace/OS_NS_string.h" wchar_t * make_wstring (const char *str) diff --git a/TAO/tests/Codec/client.cpp b/TAO/tests/Codec/client.cpp index 957febf140f..a5048d39e31 100644 --- a/TAO/tests/Codec/client.cpp +++ b/TAO/tests/Codec/client.cpp @@ -2,6 +2,7 @@ #include "tao/IOP_CodecC.h" #include "testC.h" +#include "ace/OS_NS_string.h" #include "ace/Log_Msg.h" @@ -40,7 +41,7 @@ verify_data (Foo::Bar *original, Foo::Bar *extracted) if (original->A != extracted->A || original->B != extracted->B || original->C != extracted->C - || ACE_OS_String::strcmp (original->D, extracted->D) != 0) + || ACE_OS::strcmp (original->D, extracted->D) != 0) return -1; return 0; diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp index ca2c68986ce..e25f3e59174 100644 --- a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp +++ b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp @@ -5,10 +5,10 @@ ACE_RCSID (tao, Policy_Verifier, "$Id$") Policy_Verifier::Policy_Verifier (void) : priority_bands_ (0) { - ACE_OS_String::strcpy (this->base_object_ref_, - "file://default.ior"); - ACE_OS_String::strcpy (this->overridden_object_ref_, - "file://overridden.ior"); + ACE_OS::strcpy (this->base_object_ref_, + "file://default.ior"); + ACE_OS::strcpy (this->overridden_object_ref_, + "file://overridden.ior"); } Policy_Verifier::~Policy_Verifier (void) @@ -56,8 +56,9 @@ Policy_Verifier::init (int argc, ACE_CHECK; } this->rt_poa_properties_->ior_source (arg); - ACE_OS_String::strcpy (this->base_object_ref_, "file://"); - ACE_OS_String::strcat (this->base_object_ref_, this->rt_poa_properties_->ior_source ()); + ACE_OS::strcpy (this->base_object_ref_, "file://"); + ACE_OS::strcat (this->base_object_ref_, + this->rt_poa_properties_->ior_source ()); } else if ((arg = arg_shifter.get_the_parameter ("-OverriddenIOR"))) { @@ -70,9 +71,9 @@ Policy_Verifier::init (int argc, ACE_CHECK; } this->rt_object_properties_->ior_source (arg); - ACE_OS_String::strcpy (this->overridden_object_ref_, "file://"); - ACE_OS_String::strcat (this->overridden_object_ref_, - this->rt_object_properties_->ior_source ()); + ACE_OS::strcpy (this->overridden_object_ref_, "file://"); + ACE_OS::strcat (this->overridden_object_ref_, + this->rt_object_properties_->ior_source ()); } else { diff --git a/TAO/tests/Exposed_Policies/RT_Properties.cpp b/TAO/tests/Exposed_Policies/RT_Properties.cpp index 2fccfcd2c21..66f11a95871 100644 --- a/TAO/tests/Exposed_Policies/RT_Properties.cpp +++ b/TAO/tests/Exposed_Policies/RT_Properties.cpp @@ -4,14 +4,14 @@ #include "tao/ORB_Constants.h" -#include "ace/OS.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID (ExposedPolicies, RT_Properties, "$Id$") RT_Properties::RT_Properties (void) : priority_ (10) { - ACE_OS_String::strcpy (ior_source_, "poa_default.ior"); + ACE_OS::strcpy (ior_source_, "poa_default.ior"); } RT_Properties::~RT_Properties (void) @@ -39,18 +39,18 @@ RT_Properties::read_from (const char *file_name while (fscanf (fp, "%s", string_field) != EOF ) { - if (ACE_OS_String::strcmp (string_field, "Priority") == 0) + if (ACE_OS::strcmp (string_field, "Priority") == 0) { fscanf (fp, "%d", &int_field); rt_properties->priority (int_field); } - else if (ACE_OS_String::strcmp (string_field, "Priority_Bands") == 0) + else if (ACE_OS::strcmp (string_field, "Priority_Bands") == 0) { fscanf (fp, "%d", &int_field); rt_properties->priority_bands_.length (int_field); } - else if (ACE_OS_String::strcmp (string_field, "Priority_Range") == 0) + else if (ACE_OS::strcmp (string_field, "Priority_Range") == 0) { fscanf (fp, "%d", &int_field); rt_properties->priority_bands_[i].low = int_field; @@ -96,7 +96,7 @@ RT_Properties::ior_source (const char *s) { // @@ Angelo: please use strncpy() for strings like this, otherwise // you could blow the buffer limits! - ACE_OS_String::strcpy (this->ior_source_, s); + ACE_OS::strcpy (this->ior_source_, s); } const char * diff --git a/TAO/tests/IDL_Test/main.cpp b/TAO/tests/IDL_Test/main.cpp index 2d2f179bb67..b0c27c126a5 100644 --- a/TAO/tests/IDL_Test/main.cpp +++ b/TAO/tests/IDL_Test/main.cpp @@ -23,6 +23,7 @@ #include "unionC.h" #include "repo_id_modC.h" #include "ace/streams.h" +#include "ace/OS_NS_string.h" class hello_i : public virtual POA_hello { diff --git a/TAO/tests/InterOp-Naming/INS_test_client.cpp b/TAO/tests/InterOp-Naming/INS_test_client.cpp index 0c64fd44f8c..ffc40b2331e 100644 --- a/TAO/tests/InterOp-Naming/INS_test_client.cpp +++ b/TAO/tests/InterOp-Naming/INS_test_client.cpp @@ -6,6 +6,7 @@ #include "tao/ObjectIdListC.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_string.h" int main (int argc, char *argv[]) diff --git a/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp b/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp index a59983833ac..fc690fa5cf4 100755 --- a/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp +++ b/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp @@ -21,6 +21,7 @@ #include "Servant_Locator.h" #include "ace/Log_Msg.h" #include "testC.h" +#include "ace/OS_NS_string.h" ACE_RCSID(Forwarding, Servant_Locator, "$Id$") diff --git a/TAO/tests/Multiple_Inheritance/client.cpp b/TAO/tests/Multiple_Inheritance/client.cpp index 3fd4d75f900..266531a239f 100644 --- a/TAO/tests/Multiple_Inheritance/client.cpp +++ b/TAO/tests/Multiple_Inheritance/client.cpp @@ -21,6 +21,7 @@ #include "Multiple_InheritanceC.h" #include "ace/OS_NS_fcntl.h" #include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_string.h" ACE_RCSID(Multiple_Inheritance, client, "$Id$") diff --git a/TAO/tests/Multiple_Inheritance/server.cpp b/TAO/tests/Multiple_Inheritance/server.cpp index 82275fda3db..d8d5862c1e5 100644 --- a/TAO/tests/Multiple_Inheritance/server.cpp +++ b/TAO/tests/Multiple_Inheritance/server.cpp @@ -4,6 +4,7 @@ #include "Multiple_Inheritance_i.h" #include "tao/PortableServer/ORB_Manager.h" #include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_string.h" ACE_RCSID(Multiple_Inheritance, server, "$Id$") diff --git a/TAO/tests/Nested_Event_Loop/test_i.cpp b/TAO/tests/Nested_Event_Loop/test_i.cpp index e75585b0e46..7b27990c225 100644 --- a/TAO/tests/Nested_Event_Loop/test_i.cpp +++ b/TAO/tests/Nested_Event_Loop/test_i.cpp @@ -1,6 +1,7 @@ // $Id$ #include "test_i.h" +#include "ace/OS_NS_string.h" ACE_RCSID(Nested_Event_Loop, test_i, "$Id$") diff --git a/TAO/tests/Nested_Upcall_Crash/server.cpp b/TAO/tests/Nested_Upcall_Crash/server.cpp index 0415222178e..7bb6378f697 100644 --- a/TAO/tests/Nested_Upcall_Crash/server.cpp +++ b/TAO/tests/Nested_Upcall_Crash/server.cpp @@ -6,6 +6,7 @@ #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" #include "ace/Reactor.h" +#include "ace/OS_NS_time.h" ACE_RCSID (Nested_Upcall_Crash, server, diff --git a/TAO/tests/OctetSeq/OctetSeq.cpp b/TAO/tests/OctetSeq/OctetSeq.cpp index 59f14c05510..a4d88f2ed6b 100644 --- a/TAO/tests/OctetSeq/OctetSeq.cpp +++ b/TAO/tests/OctetSeq/OctetSeq.cpp @@ -23,6 +23,7 @@ #include "tao/ORB.h" #include "testC.h" +#include "ace/OS_NS_string.h" ACE_RCSID(OctetSeq, OctetSeq, "$Id$") diff --git a/TAO/tests/POA/Etherealization/Etherealization.cpp b/TAO/tests/POA/Etherealization/Etherealization.cpp index bfdc9e5be22..032f8d296f4 100644 --- a/TAO/tests/POA/Etherealization/Etherealization.cpp +++ b/TAO/tests/POA/Etherealization/Etherealization.cpp @@ -18,6 +18,7 @@ //========================================================================= #include "testS.h" +#include "ace/OS_NS_string.h" class test_i : public POA_test { diff --git a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp index cd8dcb804b9..bbb7bf82c46 100644 --- a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp +++ b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp @@ -19,7 +19,7 @@ #include "testS.h" #include "ace/Task.h" -#include "ace/Synch.h" +#include "ace/Auto_Event.h" class test_i : public virtual PortableServer::RefCountServantBase, public virtual POA_test diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp index 44dce02d329..b002bf8bd81 100644 --- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp +++ b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp @@ -19,7 +19,7 @@ #include "testS.h" #include "ace/Task.h" -#include "ace/Synch.h" +#include "ace/Auto_Event.h" class test_i : public virtual PortableServer::RefCountServantBase, public virtual POA_test diff --git a/TAO/tests/POA/Persistent_ID/client.cpp b/TAO/tests/POA/Persistent_ID/client.cpp index f0a4b6e6ec3..45519fdd154 100644 --- a/TAO/tests/POA/Persistent_ID/client.cpp +++ b/TAO/tests/POA/Persistent_ID/client.cpp @@ -16,6 +16,7 @@ #include "ace/Get_Opt.h" #include "testC.h" +#include "ace/OS_NS_string.h" ACE_RCSID(Generic_Servant, client, "$Id$") diff --git a/TAO/tests/Param_Test/bd_wstr_seq.cpp b/TAO/tests/Param_Test/bd_wstr_seq.cpp index b2c26af2c47..16d32473b03 100644 --- a/TAO/tests/Param_Test/bd_wstr_seq.cpp +++ b/TAO/tests/Param_Test/bd_wstr_seq.cpp @@ -18,6 +18,7 @@ #include "helper.h" #include "bd_wstr_seq.h" +#include "ace/OS_NS_wchar.h" ACE_RCSID (Param_Test, bd_wstr_seq, diff --git a/TAO/tests/Param_Test/bd_wstring.cpp b/TAO/tests/Param_Test/bd_wstring.cpp index 8854d1ea9bc..30689ff028c 100644 --- a/TAO/tests/Param_Test/bd_wstring.cpp +++ b/TAO/tests/Param_Test/bd_wstring.cpp @@ -18,6 +18,7 @@ #include "helper.h" #include "bd_wstring.h" +#include "ace/OS_NS_wchar.h" ACE_RCSID (Param_Test, bd_wstring, diff --git a/TAO/tests/Param_Test/param_test_i.cpp b/TAO/tests/Param_Test/param_test_i.cpp index a8ed5b88db3..c315721df6e 100644 --- a/TAO/tests/Param_Test/param_test_i.cpp +++ b/TAO/tests/Param_Test/param_test_i.cpp @@ -17,6 +17,8 @@ #include "tao/debug.h" #include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_wchar.h" +#include "ace/OS_NS_string.h" ACE_RCSID (Param_Test, param_test_i, diff --git a/TAO/tests/Param_Test/ub_wstr_seq.cpp b/TAO/tests/Param_Test/ub_wstr_seq.cpp index 8c0f1eba65c..445bb7ccbe0 100644 --- a/TAO/tests/Param_Test/ub_wstr_seq.cpp +++ b/TAO/tests/Param_Test/ub_wstr_seq.cpp @@ -18,6 +18,7 @@ #include "helper.h" #include "ub_wstr_seq.h" +#include "ace/OS_NS_wchar.h" ACE_RCSID (Param_Test, ub_wstr_seq, diff --git a/TAO/tests/Param_Test/ub_wstring.cpp b/TAO/tests/Param_Test/ub_wstring.cpp index b6cd67b170e..a74134ff06b 100644 --- a/TAO/tests/Param_Test/ub_wstring.cpp +++ b/TAO/tests/Param_Test/ub_wstring.cpp @@ -18,6 +18,7 @@ #include "helper.h" #include "ub_wstring.h" +#include "ace/OS_NS_wchar.h" ACE_RCSID (Param_Test, ub_wstring, diff --git a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp index 57882fb3e5c..a19b0405ed9 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp @@ -44,7 +44,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - if (ACE_OS_String::strcmp ("_is_a", operation.in ()) == 0) + if (ACE_OS::strcmp ("_is_a", operation.in ()) == 0) return; IOP::ServiceId id = ::service_id; diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp index 461eaa858e4..e86d9770f89 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp @@ -10,7 +10,7 @@ #include "tao/ORBInitializer_Registry.h" #include "ace/Get_Opt.h" -#include "ace/OS.h" +#include "ace/OS_NS_errno.h" ACE_RCSID (Benchmark, client, diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp index 1cf893163f4..19951a86292 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp @@ -38,7 +38,7 @@ Client_ORBInitializer::post_init ( // Extract the last forward reference from the argument list. CORBA::ULong args_len = args->length (); for (CORBA::ULong i = 0; i < args_len; ++i) - if (ACE_OS_String::strcmp ("-k", args[i].in ()) == 0 + if (ACE_OS::strcmp ("-k", args[i].in ()) == 0 && i < (args_len - 1)) forward_str = args[i + 1]; diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp index ae29b961025..b77c719710e 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp @@ -33,7 +33,7 @@ Client_Request_Interceptor::send_request ( "%s.send_request", this->name_.in ())); - if (ACE_OS_String::strcmp ("CLIENT B", this->name_.in ()) == 0) + if (ACE_OS::strcmp ("CLIENT B", this->name_.in ()) == 0) { // Determine which test scenario we are in Dynamic::ParameterList_var paramlist = @@ -115,7 +115,7 @@ Client_Request_Interceptor::receive_reply ( "%s.receive_reply", this->name_.in ())); - if (ACE_OS_String::strcmp ("CLIENT B", this->name_.in ()) == 0) + if (ACE_OS::strcmp ("CLIENT B", this->name_.in ()) == 0) { // Determine which test scenario we are in Dynamic::ParameterList_var paramlist = @@ -175,7 +175,7 @@ Client_Request_Interceptor::receive_exception ( "%s.receive_exception", this->name_.in ())); - if (ACE_OS_String::strcmp ("CLIENT B", this->name_.in ()) == 0) + if (ACE_OS::strcmp ("CLIENT B", this->name_.in ()) == 0) { // Determine which test scenario we are in Dynamic::ParameterList_var paramlist = @@ -202,7 +202,7 @@ Client_Request_Interceptor::receive_exception ( id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - if (ACE_OS_String::strcmp (id, "IDL:Test/X:1.0") == 0) + if (ACE_OS::strcmp (id, "IDL:Test/X:1.0") == 0) { // We can only throw a CORBA::SystemException or a // PortableInteceptor::ForwardRequest exception due @@ -268,5 +268,5 @@ Client_Request_Interceptor::client_side_test ( CORBA::String_var op = info->operation (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - return ACE_OS_String::strcmp (op.in (), "client_test") == 0 ? 1 : 0; + return ACE_OS::strcmp (op.in (), "client_test") == 0 ? 1 : 0; } diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp index 23db2e7471f..b92f595614f 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp @@ -36,7 +36,7 @@ Server_Request_Interceptor::receive_request_service_contexts ( "%s.receive_request_service_contexts", this->name_.in ())); - if (ACE_OS_String::strcmp ("SERVER B", this->name_.in ()) == 0) + if (ACE_OS::strcmp ("SERVER B", this->name_.in ()) == 0) { this->scenario_++; @@ -104,7 +104,7 @@ Server_Request_Interceptor::send_reply ( "%s.send_reply", this->name_.in ())); - if (ACE_OS_String::strcmp ("SERVER B", this->name_.in ()) == 0) + if (ACE_OS::strcmp ("SERVER B", this->name_.in ()) == 0) { // Determine which test scenario we are in Dynamic::ParameterList_var paramlist = @@ -164,7 +164,7 @@ Server_Request_Interceptor::send_exception ( "%s.send_exception", this->name_.in ())); - if (ACE_OS_String::strcmp ("SERVER B", this->name_.in ()) == 0) + if (ACE_OS::strcmp ("SERVER B", this->name_.in ()) == 0) { // Determine which test scenario we are in Dynamic::ParameterList_var paramlist = @@ -191,7 +191,7 @@ Server_Request_Interceptor::send_exception ( id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - if (ACE_OS_String::strcmp (id, "IDL:Test/X:1.0") == 0) + if (ACE_OS::strcmp (id, "IDL:Test/X:1.0") == 0) { // We can only throw a CORBA::SystemException or a // PortableInteceptor::ForwardRequest exception due @@ -257,5 +257,5 @@ Server_Request_Interceptor::server_side_test ( CORBA::String_var op = info->operation (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - return ACE_OS_String::strcmp (op.in (), "server_test") == 0 ? 1 : 0; + return ACE_OS::strcmp (op.in (), "server_test") == 0 ? 1 : 0; } diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp index a93b3b2d10d..61b505d3a69 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp @@ -328,7 +328,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( // Ignore the "_is_a" operation since it may have been invoked // locally on the server side as a side effect of another call, // meaning that the client hasn't added the service context yet. - if (ACE_OS_String::strcmp ("_is_a", operation.in ()) == 0) + if (ACE_OS::strcmp ("_is_a", operation.in ()) == 0) return; IOP::ServiceId id = ::service_id; diff --git a/TAO/tests/Two_Objects/First_i.h b/TAO/tests/Two_Objects/First_i.h index 71665113827..9273bf283cb 100644 --- a/TAO/tests/Two_Objects/First_i.h +++ b/TAO/tests/Two_Objects/First_i.h @@ -7,7 +7,7 @@ #define TAO_TWO_OBJECTS_FIRST_I_H #include "Two_ObjectsS.h" -#include "ace/Synch.h" +#include "ace/Auto_Event.h" /// Implement the Two_Objects_Test::First interface class First_i diff --git a/TAO/utils/IOR-parser/ior-handler.cpp b/TAO/utils/IOR-parser/ior-handler.cpp index 288fa63e2d2..2c2ad934798 100644 --- a/TAO/utils/IOR-parser/ior-handler.cpp +++ b/TAO/utils/IOR-parser/ior-handler.cpp @@ -2,6 +2,9 @@ #include "ior-handler.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_stdlib.h" IorHandler::IorHandler (void) { @@ -556,7 +559,7 @@ IorHandler::getIdlInterface (char *typeId, int *validTypeId) return ((char *)typeId); } - char *readStart = strchr(typeId, ':'); + char *readStart = ACE_OS::strchr(typeId, ':'); if (readStart == NULL) { @@ -566,7 +569,7 @@ IorHandler::getIdlInterface (char *typeId, int *validTypeId) } - char *readEnd = strrchr (typeId, ':'); + char *readEnd = ACE_OS::strrchr (typeId, ':'); if (readEnd == NULL) { diff --git a/TAO/utils/nslist/nsadd.cpp b/TAO/utils/nslist/nsadd.cpp index 27cf959a964..ae248e0ad4a 100644 --- a/TAO/utils/nslist/nsadd.cpp +++ b/TAO/utils/nslist/nsadd.cpp @@ -41,7 +41,7 @@ main (int argc, char *argv[]) int rebind = 0; while (argc > 0) { - if (strcmp (*argv, "--ior") == 0) + if (ACE_OS::strcmp (*argv, "--ior") == 0) { if (argc == 1) { @@ -53,7 +53,7 @@ main (int argc, char *argv[]) argv++; ior = *argv; } - else if (strcmp (*argv, "--name") == 0) + else if (ACE_OS::strcmp (*argv, "--name") == 0) { if (argc == 1) { @@ -65,11 +65,11 @@ main (int argc, char *argv[]) argv++; name = *argv; } - else if (strcmp (*argv, "--rebind") == 0) + else if (ACE_OS::strcmp (*argv, "--rebind") == 0) { rebind = 1; } - else if (strncmp (*argv, "--", 2) == 0) + else if (ACE_OS::strncmp (*argv, "--", 2) == 0) { ACE_DEBUG ((LM_DEBUG, "Usage: %s --name <name> " @@ -106,12 +106,12 @@ main (int argc, char *argv[]) } //printf (" make a copy\n"); char buf[BUFSIZ]; - strcpy (buf, name); + ACE_OS::strcpy (buf, name); char *bp = &buf[0]; char *cp = 0; int ntoks = 0; char *toks[20]; - while ((cp = strtok (bp, "/")) != 0) + while ((cp = ACE_OS::strtok (bp, "/")) != 0) { toks[ntoks] = cp; ntoks++; @@ -122,9 +122,9 @@ main (int argc, char *argv[]) // now assign name = toks[ntoks] char lastname[BUFSIZ]; - strcpy (lastname, toks[ntoks-1]); + ACE_OS::strcpy (lastname, toks[ntoks-1]); // search for '.' in name; if exists then the part after '.' is the kind - char *kind = strchr (lastname, '.'); + char *kind = ACE_OS::strchr (lastname, '.'); if (kind != 0) { *kind = 0; diff --git a/TAO/utils/nslist/nsdel.cpp b/TAO/utils/nslist/nsdel.cpp index 8ee7b243193..a2c12e3b0f4 100644 --- a/TAO/utils/nslist/nsdel.cpp +++ b/TAO/utils/nslist/nsdel.cpp @@ -19,6 +19,7 @@ #include "orbsvcs/CosNamingC.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_stdio.h" CORBA::ORB_var orb; int showIOR = 0; @@ -41,7 +42,7 @@ main (int argc, char *argv[]) while (argc > 0) { - if (strcmp (*argv, "--name") == 0) + if (ACE_OS::strcmp (*argv, "--name") == 0) { if (argc == 1) { @@ -53,7 +54,7 @@ main (int argc, char *argv[]) argv++; name = *argv; } - else if (strncmp(*argv, "--", 2) == 0) + else if (ACE_OS::strncmp(*argv, "--", 2) == 0) { ACE_DEBUG ((LM_DEBUG, "Usage: %s [ --name <name> ]\n", pname)); @@ -72,13 +73,13 @@ main (int argc, char *argv[]) // make a copy char buf[BUFSIZ]; - strcpy (buf, name); + ACE_OS::strcpy (buf, name); char *bp = &buf[0]; char *cp = 0; int ntoks = 0; char *toks[20]; - while ((cp = strtok (bp, "/")) != 0) + while ((cp = ACE_OS::strtok (bp, "/")) != 0) { toks[ntoks] = cp; ntoks++; @@ -91,24 +92,24 @@ main (int argc, char *argv[]) } for (i=0; i<ntoks; i++) - printf ("%s\n", toks[i]); + ACE_OS::printf ("%s\n", toks[i]); // now assign name = toks[ntoks] char lastname[BUFSIZ]; - strcpy (lastname, toks[ntoks - 1]); + ACE_OS::strcpy (lastname, toks[ntoks - 1]); // search for '.' in name; if exists then the part after '.' is the kind - char *kind = strchr (lastname, '.'); + char *kind = ACE_OS::strchr (lastname, '.'); if (kind != 0) { *kind = 0; kind++; - printf ("name='%s'\n", lastname); - printf ( "kind='%s'\n" , kind ); + ACE_OS::printf ("name='%s'\n", lastname); + ACE_OS::printf ( "kind='%s'\n" , kind ); } else - printf ("name=%s\n", lastname ); + ACE_OS::printf ("name=%s\n", lastname ); CORBA::Object_var nc_obj = orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); diff --git a/ace/CDR_Stream.h b/ace/CDR_Stream.h index f8d3a95b1b3..57052efeebc 100644 --- a/ace/CDR_Stream.h +++ b/ace/CDR_Stream.h @@ -39,8 +39,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/SStringfwd.h" -#include "ace/OS_Memory.h" -#include "ace/OS_String.h" #include "ace/Message_Block.h" diff --git a/ace/Makefile.ace b/ace/Makefile.ace index 84370d373cb..0b014440929 100644 --- a/ace/Makefile.ace +++ b/ace/Makefile.ace @@ -116,7 +116,21 @@ THREADS_FILES = \ Atomic_Op \ Process \ Process_Manager \ - Synch \ + TSS_Adapter \ + Auto_Event \ + Manual_Event \ + Barrier \ + Condition_Thread_Mutex \ + Condition_Recursive_Thread_Mutex \ + Event \ + Lock \ + Mutex \ + RW_Mutex \ + RW_Thread_Mutex \ + Recursive_Thread_Mutex \ + Semaphore \ + Thread_Mutex \ + Thread_Semaphore \ Synch_Options \ Process_Semaphore \ Process_Mutex \ diff --git a/ace/Object_Manager.h b/ace/Object_Manager.h index cf880542528..d5b1df15ea4 100644 --- a/ace/Object_Manager.h +++ b/ace/Object_Manager.h @@ -41,6 +41,12 @@ class ACE_Sig_Set; #include "ace/Recursive_Thread_Mutex.h" #endif /* ACE_MT_SAFE */ +// temporary fix dhinton +#if defined (DO_NOT_INCLUDE_OS_H) +# include "ace/OS_NS_stdio.h" +# include "ace/OS_NS_ctype.h" +#endif /* DO_NOT_INCLUDE_OS_H */ + // only used by ACE_OS_Object_Manager::ctor # if defined (ACE_WIN32) // Default WIN32 structured exception handler. diff --git a/ace/ace.mpc b/ace/ace.mpc index 6ad0c6fcabf..c83356dba18 100644 --- a/ace/ace.mpc +++ b/ace/ace.mpc @@ -17,6 +17,7 @@ project(ACE) : acedefaults, aceversion, core, qt_moc, qt_reactor { //OS_Dirent.cpp //OS_Memory.cpp //OS_String.cpp + //Synch.cpp Source_Files(ACE_COMPONENTS) { OS { @@ -129,7 +130,6 @@ project(ACE) : acedefaults, aceversion, core, qt_moc, qt_reactor { Atomic_Op.cpp Process.cpp Process_Manager.cpp - //Synch.cpp TSS_Adapter.cpp Auto_Event.cpp Manual_Event.cpp diff --git a/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp b/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp index 2fd1daa1661..eb759976456 100644 --- a/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp +++ b/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp @@ -10,6 +10,7 @@ #include "ace/streams.h" #include "ace/os_include/arpa/os_inet.h" #include "ace/OS_NS_sys_select.h" +#include "ace/OS_NS_string.h" // make sure that the code compiles cleanly even if SCTP is not // available. If SCTP is not installed, program will exit early in diff --git a/tests/CDR_Test.cpp b/tests/CDR_Test.cpp index 0b027b6cbba..3a918a1c68a 100644 --- a/tests/CDR_Test.cpp +++ b/tests/CDR_Test.cpp @@ -24,6 +24,7 @@ #include "ace/CDR_Stream.h" #include "ace/SString.h" #include "ace/ACE.h" +#include "ace/OS_NS_wchar.h" ACE_RCSID(tests, CDR_Test, "$Id$") |