From 56681ffa90714cf82c32e907c0f80cea75166740 Mon Sep 17 00:00:00 2001 From: okellogg Date: Tue, 29 Jan 2002 20:21:11 +0000 Subject: ChangeLogTag:Tue Jan 29 21:09:12 2002 Oliver Kellogg --- TAO/ChangeLogs/ChangeLog-02a | 12 + TAO/TAO_IDL/be/be_interface.cpp | 24 +- TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp | 2 +- TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp | 2 +- TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp | 2 +- .../be/be_visitor_exception/exception_ch.cpp | 4 +- .../be/be_visitor_exception/exception_cs.cpp | 8 +- TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp | 12 +- TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp | 8 +- TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp | 2 +- .../be_visitor_interface/base_proxy_broker_ch.cpp | 2 +- TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp | 2 +- .../be_visitor_interface/direct_collocated_sh.cpp | 4 +- .../be_visitor_interface/direct_collocated_ss.cpp | 8 +- .../be/be_visitor_interface/interface_ch.cpp | 6 +- .../be/be_visitor_interface/interface_cs.cpp | 24 +- .../be/be_visitor_interface/interface_sh.cpp | 12 +- .../be/be_visitor_interface/interface_ss.cpp | 24 +- .../remote_proxy_broker_ch.cpp | 2 +- .../remote_proxy_broker_cs.cpp | 2 +- .../be/be_visitor_interface/smart_proxy_ch.cpp | 8 +- .../be/be_visitor_interface/smart_proxy_cs.cpp | 10 +- .../strategized_proxy_broker_sh.cpp | 4 +- .../strategized_proxy_broker_ss.cpp | 8 +- .../thru_poa_collocated_sh.cpp | 4 +- .../thru_poa_collocated_ss.cpp | 12 +- TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp | 16 +- TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp | 18 +- TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp | 8 +- TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp | 10 +- TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp | 8 +- .../ami_exception_holder_operation_cs.cpp | 4 +- .../ami_handler_reply_stub_operation_ch.cpp | 2 +- .../ami_handler_reply_stub_operation_cs.cpp | 8 +- TAO/TAO_IDL/be/be_visitor_operation/argument.cpp | 8 +- .../be_visitor_operation/interceptors_arglist.cpp | 8 +- .../be/be_visitor_operation/interceptors_cs.cpp | 20 +- .../be/be_visitor_operation/interceptors_ss.cpp | 30 +- TAO/TAO_IDL/be/be_visitor_operation/operation.cpp | 8 +- .../be/be_visitor_operation/operation_cs.cpp | 4 +- .../be/be_visitor_operation/operation_sh.cpp | 2 +- .../be/be_visitor_operation/operation_ss.cpp | 10 +- .../be_visitor_operation/remote_proxy_impl_cs.cpp | 26 +- .../thru_poa_collocated_ss.cpp | 2 +- .../thru_poa_proxy_impl_ss.cpp | 2 +- TAO/TAO_IDL/be/be_visitor_root/root.cpp | 2 +- TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp | 2 +- .../gen_bounded_obj_sequence_ch.cpp | 2 +- .../gen_bounded_obj_sequence_cs.cpp | 6 +- .../gen_unbounded_obj_sequence_ch.cpp | 2 +- .../gen_unbounded_obj_sequence_cs.cpp | 6 +- TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp | 2 +- TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp | 2 +- TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp | 6 +- TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp | 10 +- .../be_include/be_visitor_operation/operation.h | 2 +- .../tutorials/Quoter/Event_Service/Consumer_i.h | 4 +- .../Quoter/Event_Service/Stock_Consumer.cpp | 4 +- .../Quoter/Event_Service/Stock_Consumer.h | 4 +- .../tutorials/Quoter/Event_Service/Stock_i.cpp | 2 +- TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h | 2 +- .../Stock_Factory_Locator_i.cpp | 4 +- .../On_Demand_Activation/Stock_Factory_Locator_i.h | 4 +- .../Quoter/RT_Event_Service/Stock_Consumer.cpp | 4 +- .../Quoter/RT_Event_Service/Stock_Consumer.h | 4 +- .../tutorials/Quoter/RT_Event_Service/Stock_i.cpp | 6 +- .../tutorials/Quoter/RT_Event_Service/Stock_i.h | 2 +- TAO/examples/AMI/FL_Callback/Peer_i.cpp | 36 +- TAO/examples/AMI/FL_Callback/Peer_i.h | 18 +- TAO/examples/AMI/FL_Callback/Progress_i.cpp | 14 +- TAO/examples/AMI/FL_Callback/Progress_i.h | 8 +- TAO/examples/AMI/FL_Callback/peer.cpp | 16 +- TAO/examples/AMI/FL_Callback/progress.cpp | 16 +- TAO/examples/Advanced/ch_12/server.cpp | 2 +- TAO/examples/Advanced/ch_12/server.h | 4 +- TAO/examples/Buffered_AMI/client.cpp | 62 +- TAO/examples/Buffered_AMI/server.cpp | 18 +- TAO/examples/Buffered_AMI/test_i.cpp | 6 +- TAO/examples/Buffered_AMI/test_i.h | 4 +- TAO/examples/Buffered_Oneways/client.cpp | 42 +- TAO/examples/Buffered_Oneways/server.cpp | 18 +- TAO/examples/Buffered_Oneways/test_i.cpp | 6 +- TAO/examples/Buffered_Oneways/test_i.h | 4 +- TAO/examples/Callback_Quoter/Consumer_Handler.cpp | 30 +- .../Callback_Quoter/Consumer_Input_Handler.cpp | 14 +- .../Callback_Quoter/Consumer_Signal_Handler.cpp | 12 +- TAO/examples/Callback_Quoter/Consumer_i.cpp | 4 +- TAO/examples/Callback_Quoter/Consumer_i.h | 4 +- .../Callback_Quoter/Notifier_Input_Handler.cpp | 24 +- .../Callback_Quoter/Notifier_Input_Handler.h | 6 +- TAO/examples/Callback_Quoter/Notifier_i.cpp | 8 +- TAO/examples/Callback_Quoter/Notifier_i.h | 8 +- TAO/examples/Callback_Quoter/Supplier_i.cpp | 14 +- TAO/examples/Callback_Quoter/notifier.cpp | 6 +- .../AMI_Iterator/Content_Iterator_i.cpp | 10 +- .../AMI_Iterator/Content_Iterator_i.h | 4 +- .../AMI_Iterator/Iterator_Factory_i.cpp | 4 +- .../AMI_Iterator/Iterator_Factory_i.h | 2 +- .../AMI_Iterator/Iterator_Handler.cpp | 30 +- .../Content_Server/AMI_Iterator/Iterator_Handler.h | 14 +- .../Content_Server/AMI_Iterator/client.cpp | 38 +- .../Content_Server/AMI_Iterator/server.cpp | 22 +- .../AMI_Observer/Callback_Handler.cpp | 32 +- .../Content_Server/AMI_Observer/Callback_Handler.h | 10 +- .../Content_Server/AMI_Observer/Callback_i.cpp | 16 +- .../Content_Server/AMI_Observer/Callback_i.h | 4 +- .../AMI_Observer/Push_Iterator_Factory_i.cpp | 4 +- .../AMI_Observer/Push_Iterator_Factory_i.h | 2 +- .../AMI_Observer/Push_Iterator_Handler.cpp | 20 +- .../AMI_Observer/Push_Iterator_Handler.h | 8 +- .../Content_Server/AMI_Observer/client.cpp | 38 +- .../Content_Server/AMI_Observer/server.cpp | 22 +- .../SMI_Iterator/Content_Iterator_i.cpp | 10 +- .../SMI_Iterator/Content_Iterator_i.h | 4 +- .../SMI_Iterator/Iterator_Factory_i.cpp | 4 +- .../SMI_Iterator/Iterator_Factory_i.h | 2 +- .../Content_Server/SMI_Iterator/client.cpp | 26 +- .../Content_Server/SMI_Iterator/server.cpp | 22 +- TAO/examples/Event_Comm/Consumer_Handler.cpp | 22 +- TAO/examples/Event_Comm/Consumer_Input_Handler.cpp | 4 +- TAO/examples/Event_Comm/Event_Comm_i.cpp | 16 +- TAO/examples/Event_Comm/Event_Comm_i.h | 12 +- TAO/examples/Event_Comm/Notifier_Handler.cpp | 14 +- TAO/examples/Event_Comm/Notifier_Server.cpp | 24 +- TAO/examples/Event_Comm/Notifier_Server.h | 6 +- TAO/examples/Event_Comm/Supplier_Input_Handler.cpp | 2 +- TAO/examples/Event_Comm/notifier.cpp | 4 +- TAO/examples/Load_Balancing/Identity_Client.cpp | 26 +- TAO/examples/Load_Balancing/Identity_Client.h | 2 +- TAO/examples/Load_Balancing/Identity_Server.cpp | 32 +- TAO/examples/Load_Balancing/Identity_Server.h | 4 +- TAO/examples/Load_Balancing/Identity_i.cpp | 2 +- TAO/examples/Load_Balancing/Identity_i.h | 2 +- TAO/examples/Load_Balancing/Load_Balancer_i.cpp | 58 +- TAO/examples/Load_Balancing/Load_Balancer_i.h | 38 +- .../Load_Balancing/Load_Balancing_Service.cpp | 14 +- .../Load_Balancing/Load_Balancing_Service.h | 2 +- .../Load_Balancing_persistent/Identity_Client.cpp | 22 +- .../Load_Balancing_persistent/Identity_Client.h | 2 +- .../Load_Balancing_persistent/Identity_Server.cpp | 48 +- .../Load_Balancing_persistent/Identity_Server.h | 6 +- .../Load_Balancing_persistent/Identity_i.cpp | 4 +- .../Load_Balancing_persistent/Identity_i.h | 4 +- .../Load_Balancing_persistent/Load_Balancer_i.cpp | 96 +- .../Load_Balancing_persistent/Load_Balancer_i.h | 48 +- .../Load_Balancing_Service.cpp | 20 +- .../Load_Balancing_Service.h | 2 +- TAO/examples/Logging/Logger_i.cpp | 20 +- TAO/examples/Logging/Logger_i.h | 12 +- TAO/examples/Logging/Logging_Service.cpp | 6 +- TAO/examples/Logging/Logging_Service_i.cpp | 20 +- TAO/examples/Logging/Logging_Service_i.h | 8 +- TAO/examples/Logging/Logging_Test_i.cpp | 42 +- TAO/examples/Logging/Logging_Test_i.h | 4 +- TAO/examples/OBV/Simple_util.cpp | 20 +- TAO/examples/OBV/Simple_util.h | 6 +- TAO/examples/OBV/Typed_Events/Client_i.cpp | 14 +- TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp | 60 +- TAO/examples/OBV/Typed_Events/Event_Types_impl.h | 46 +- TAO/examples/OBV/Typed_Events/Server_i.cpp | 6 +- TAO/examples/OBV/Typed_Events/Server_i.h | 6 +- TAO/examples/OBV/Typed_Events/server.cpp | 6 +- TAO/examples/POA/Adapter_Activator/server.cpp | 70 +- TAO/examples/POA/DSI/Database_i.cpp | 52 +- TAO/examples/POA/DSI/Database_i.h | 22 +- TAO/examples/POA/DSI/client.cpp | 20 +- TAO/examples/POA/DSI/server.cpp | 36 +- TAO/examples/POA/Default_Servant/File_i.cpp | 46 +- TAO/examples/POA/Default_Servant/File_i.h | 16 +- TAO/examples/POA/Default_Servant/client.cpp | 18 +- TAO/examples/POA/Default_Servant/server.cpp | 34 +- TAO/examples/POA/Explicit_Activation/server.cpp | 48 +- TAO/examples/POA/FindPOA/FindPOA.cpp | 26 +- TAO/examples/POA/Forwarding/MyFooServant.cpp | 16 +- TAO/examples/POA/Forwarding/MyFooServant.h | 8 +- TAO/examples/POA/Forwarding/Servant_Activator.cpp | 8 +- TAO/examples/POA/Forwarding/Servant_Activator.h | 6 +- TAO/examples/POA/Forwarding/client.cpp | 18 +- TAO/examples/POA/Forwarding/server.cpp | 44 +- TAO/examples/POA/Generic_Servant/MyFooServant.cpp | 12 +- TAO/examples/POA/Generic_Servant/MyFooServant.h | 10 +- TAO/examples/POA/Generic_Servant/client.cpp | 18 +- TAO/examples/POA/Loader/Servant_Activator.cpp | 4 +- TAO/examples/POA/Loader/Servant_Activator.h | 4 +- TAO/examples/POA/Loader/Servant_Locator.cpp | 4 +- TAO/examples/POA/Loader/Servant_Locator.h | 4 +- TAO/examples/POA/Loader/Server_Manager.cpp | 52 +- TAO/examples/POA/NewPOA/NewPOA.cpp | 40 +- .../POA/On_Demand_Activation/Servant_Activator.cpp | 4 +- .../POA/On_Demand_Activation/Servant_Activator.h | 4 +- .../POA/On_Demand_Activation/Servant_Locator.cpp | 4 +- .../POA/On_Demand_Activation/Servant_Locator.h | 4 +- TAO/examples/POA/On_Demand_Activation/server.cpp | 46 +- .../POA/On_Demand_Loading/Servant_Activator.cpp | 4 +- .../POA/On_Demand_Loading/Servant_Activator.h | 4 +- .../POA/On_Demand_Loading/Servant_Locator.cpp | 4 +- .../POA/On_Demand_Loading/Servant_Locator.h | 4 +- .../POA/On_Demand_Loading/Server_Manager.cpp | 54 +- .../POA/Reference_Counted_Servant/server.cpp | 20 +- TAO/examples/POA/RootPOA/RootPOA.cpp | 10 +- TAO/examples/POA/TIE/Foo_i.cpp | 14 +- TAO/examples/POA/TIE/Foo_i.h | 14 +- TAO/examples/POA/TIE/client.cpp | 36 +- TAO/examples/POA/TIE/server.cpp | 46 +- TAO/examples/Persistent_Grid/Grid_Client_i.cpp | 8 +- TAO/examples/Persistent_Grid/Grid_i.cpp | 22 +- TAO/examples/Persistent_Grid/Grid_i.h | 20 +- .../Persistent_Grid/Persistent_Client_i.cpp | 10 +- TAO/examples/Persistent_Grid/Simple_util.cpp | 18 +- TAO/examples/Persistent_Grid/Simple_util.h | 6 +- TAO/examples/Persistent_Grid/server.cpp | 6 +- .../PluggableUDP/tests/Basic/UDP_Client_i.cpp | 6 +- TAO/examples/PluggableUDP/tests/Basic/UDP_i.cpp | 6 +- TAO/examples/PluggableUDP/tests/Basic/UDP_i.h | 4 +- TAO/examples/PluggableUDP/tests/Basic/client.cpp | 22 +- TAO/examples/PluggableUDP/tests/Basic/server.cpp | 38 +- .../tests/Performance/UDP_PerformanceClient.cpp | 12 +- .../PluggableUDP/tests/Performance/UDP_i.cpp | 14 +- .../PluggableUDP/tests/Performance/UDP_i.h | 8 +- .../PluggableUDP/tests/Performance/client.cpp | 22 +- .../PluggableUDP/tests/Performance/server.cpp | 36 +- .../tests/SimplePerformance/client.cpp | 18 +- .../tests/SimplePerformance/server.cpp | 24 +- .../tests/SimplePerformance/test_i.cpp | 10 +- .../PluggableUDP/tests/SimplePerformance/test_i.h | 8 +- TAO/examples/Quoter/Factory_Finder.cpp | 30 +- TAO/examples/Quoter/Factory_Finder.h | 4 +- TAO/examples/Quoter/Factory_Finder_i.cpp | 8 +- TAO/examples/Quoter/Factory_Finder_i.h | 2 +- TAO/examples/Quoter/Generic_Factory.cpp | 38 +- TAO/examples/Quoter/Generic_Factory.h | 4 +- TAO/examples/Quoter/Generic_Factory_i.cpp | 22 +- TAO/examples/Quoter/Generic_Factory_i.h | 6 +- TAO/examples/Quoter/Quoter_i.cpp | 28 +- TAO/examples/Quoter/Quoter_i.h | 12 +- TAO/examples/Quoter/client.cpp | 26 +- TAO/examples/Quoter/server.cpp | 46 +- TAO/examples/Quoter/server.h | 6 +- TAO/examples/RTCORBA/Activity/Activity.cpp | 82 +- TAO/examples/RTCORBA/Activity/Activity.h | 14 +- TAO/examples/RTCORBA/Activity/Job_i.cpp | 4 +- TAO/examples/RTCORBA/Activity/Job_i.h | 4 +- TAO/examples/RTCORBA/Activity/POA_Holder.cpp | 14 +- TAO/examples/RTCORBA/Activity/POA_Holder.h | 2 +- TAO/examples/RTCORBA/Activity/Thread_Task.cpp | 4 +- TAO/examples/Simple/Simple_util.cpp | 42 +- TAO/examples/Simple/Simple_util.h | 6 +- TAO/examples/Simple/bank/AccountManager_i.cpp | 8 +- TAO/examples/Simple/bank/AccountManager_i.h | 6 +- TAO/examples/Simple/bank/Account_i.cpp | 10 +- TAO/examples/Simple/bank/Account_i.h | 10 +- TAO/examples/Simple/bank/Bank_Client_i.cpp | 38 +- TAO/examples/Simple/bank/Bank_Client_i.h | 14 +- TAO/examples/Simple/bank/server.cpp | 4 +- TAO/examples/Simple/chat/Broadcaster_i.cpp | 16 +- TAO/examples/Simple/chat/Broadcaster_i.h | 8 +- TAO/examples/Simple/chat/Client_i.cpp | 18 +- TAO/examples/Simple/chat/Receiver_i.cpp | 4 +- TAO/examples/Simple/chat/Receiver_i.h | 4 +- TAO/examples/Simple/chat/Server_i.cpp | 10 +- TAO/examples/Simple/chat/Server_i.h | 4 +- TAO/examples/Simple/chat/server.cpp | 4 +- TAO/examples/Simple/echo/Echo_Client_i.cpp | 6 +- TAO/examples/Simple/echo/Echo_i.cpp | 12 +- TAO/examples/Simple/echo/Echo_i.h | 6 +- TAO/examples/Simple/echo/server.cpp | 6 +- TAO/examples/Simple/grid/Grid_Client_i.cpp | 10 +- TAO/examples/Simple/grid/Grid_i.cpp | 24 +- TAO/examples/Simple/grid/Grid_i.h | 20 +- TAO/examples/Simple/grid/server.cpp | 6 +- TAO/examples/Simple/time-date/Time_Date.cpp | 6 +- .../Simple/time-date/Time_Date_Client_i.cpp | 6 +- TAO/examples/Simple/time-date/Time_Date_i.cpp | 4 +- TAO/examples/Simple/time-date/Time_Date_i.h | 4 +- TAO/examples/Simple/time/Time_Client_i.cpp | 8 +- TAO/examples/Simple/time/Time_i.cpp | 6 +- TAO/examples/Simple/time/Time_i.h | 4 +- TAO/examples/Simple/time/server.cpp | 6 +- .../Simulator/Event_Supplier/DOVE_Supplier.cpp | 32 +- .../Simulator/Event_Supplier/DOVE_Supplier.h | 6 +- .../Simulator/Event_Supplier/DualEC_Sup.cpp | 66 +- TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h | 2 +- .../Simulator/Event_Supplier/Event_Con.cpp | 54 +- TAO/examples/Simulator/Event_Supplier/Event_Con.h | 4 +- .../Simulator/Event_Supplier/Event_Sup.cpp | 2 +- .../Simulator/Event_Supplier/Logging_Sup.cpp | 2 +- TAO/examples/TypeCode_Creation/main.cpp | 10 +- TAO/examples/mfc/client.cpp | 12 +- TAO/examples/mfc/server.cpp | 18 +- .../Concurrency_Service/Concurrency_Service.cpp | 30 +- .../Concurrency_Service/Concurrency_Service.h | 8 +- TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp | 8 +- TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp | 10 +- TAO/orbsvcs/Event_Service/Event_Service.cpp | 56 +- TAO/orbsvcs/Event_Service/Event_Service.h | 10 +- TAO/orbsvcs/IFR_Service/AbstractInterfaceDef_i.cpp | 10 +- TAO/orbsvcs/IFR_Service/AbstractInterfaceDef_i.h | 6 +- TAO/orbsvcs/IFR_Service/AliasDef_i.cpp | 32 +- TAO/orbsvcs/IFR_Service/AliasDef_i.h | 14 +- TAO/orbsvcs/IFR_Service/ArrayDef_i.cpp | 70 +- TAO/orbsvcs/IFR_Service/ArrayDef_i.h | 32 +- TAO/orbsvcs/IFR_Service/AttributeDef_i.cpp | 80 +- TAO/orbsvcs/IFR_Service/AttributeDef_i.h | 32 +- TAO/orbsvcs/IFR_Service/ComponentDef_i.cpp | 100 +- TAO/orbsvcs/IFR_Service/ComponentDef_i.h | 70 +- TAO/orbsvcs/IFR_Service/ComponentRepository_i.cpp | 12 +- TAO/orbsvcs/IFR_Service/ComponentRepository_i.h | 8 +- TAO/orbsvcs/IFR_Service/ConstantDef_i.cpp | 66 +- TAO/orbsvcs/IFR_Service/ConstantDef_i.h | 26 +- TAO/orbsvcs/IFR_Service/ConsumesDef_i.cpp | 18 +- TAO/orbsvcs/IFR_Service/ConsumesDef_i.h | 10 +- TAO/orbsvcs/IFR_Service/Contained_i.cpp | 186 +- TAO/orbsvcs/IFR_Service/Contained_i.h | 54 +- TAO/orbsvcs/IFR_Service/Container_i.cpp | 298 +- TAO/orbsvcs/IFR_Service/Container_i.h | 84 +- TAO/orbsvcs/IFR_Service/EmitsDef_i.cpp | 18 +- TAO/orbsvcs/IFR_Service/EmitsDef_i.h | 10 +- TAO/orbsvcs/IFR_Service/EnumDef_i.cpp | 24 +- TAO/orbsvcs/IFR_Service/EnumDef_i.h | 14 +- TAO/orbsvcs/IFR_Service/EventDef_i.cpp | 24 +- TAO/orbsvcs/IFR_Service/EventDef_i.h | 16 +- TAO/orbsvcs/IFR_Service/ExceptionDef_i.cpp | 62 +- TAO/orbsvcs/IFR_Service/ExceptionDef_i.h | 22 +- TAO/orbsvcs/IFR_Service/FactoryDef_i.cpp | 18 +- TAO/orbsvcs/IFR_Service/FactoryDef_i.h | 10 +- TAO/orbsvcs/IFR_Service/FinderDef_i.cpp | 18 +- TAO/orbsvcs/IFR_Service/FinderDef_i.h | 10 +- TAO/orbsvcs/IFR_Service/FixedDef_i.cpp | 38 +- TAO/orbsvcs/IFR_Service/FixedDef_i.h | 26 +- TAO/orbsvcs/IFR_Service/HomeDef_i.cpp | 74 +- TAO/orbsvcs/IFR_Service/HomeDef_i.h | 50 +- TAO/orbsvcs/IFR_Service/IDLType_i.h | 4 +- TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp | 1772 ++++----- TAO/orbsvcs/IFR_Service/IFR_BaseS.h | 306 +- TAO/orbsvcs/IFR_Service/IFR_BaseS.i | 80 +- TAO/orbsvcs/IFR_Service/IFR_BaseS_T.h | 112 +- TAO/orbsvcs/IFR_Service/IFR_BaseS_T.i | 224 +- TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp | 3936 ++++++++++---------- TAO/orbsvcs/IFR_Service/IFR_BasicS.h | 1372 +++---- TAO/orbsvcs/IFR_Service/IFR_BasicS.i | 1368 +++---- TAO/orbsvcs/IFR_Service/IFR_BasicS_T.h | 850 ++--- TAO/orbsvcs/IFR_Service/IFR_BasicS_T.i | 1700 ++++----- TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp | 2048 +++++----- TAO/orbsvcs/IFR_Service/IFR_ComponentsS.h | 876 ++--- TAO/orbsvcs/IFR_Service/IFR_ComponentsS.i | 984 ++--- TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.h | 580 +-- TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.i | 1160 +++--- TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp | 1688 ++++----- TAO/orbsvcs/IFR_Service/IFR_ExtendedS.h | 366 +- TAO/orbsvcs/IFR_Service/IFR_ExtendedS.i | 244 +- TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.h | 190 +- TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.i | 380 +- TAO/orbsvcs/IFR_Service/IFR_Server.cpp | 8 +- TAO/orbsvcs/IFR_Service/IFR_Service.cpp | 68 +- TAO/orbsvcs/IFR_Service/IFR_Service.h | 16 +- TAO/orbsvcs/IFR_Service/IRObject_i.h | 6 +- TAO/orbsvcs/IFR_Service/InterfaceDef_i.cpp | 170 +- TAO/orbsvcs/IFR_Service/InterfaceDef_i.h | 46 +- TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.cpp | 10 +- TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.h | 6 +- TAO/orbsvcs/IFR_Service/ModuleDef_i.cpp | 32 +- TAO/orbsvcs/IFR_Service/ModuleDef_i.h | 12 +- TAO/orbsvcs/IFR_Service/NativeDef_i.cpp | 10 +- TAO/orbsvcs/IFR_Service/NativeDef_i.h | 6 +- TAO/orbsvcs/IFR_Service/OperationDef_i.cpp | 122 +- TAO/orbsvcs/IFR_Service/OperationDef_i.h | 52 +- TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.cpp | 26 +- TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.h | 18 +- TAO/orbsvcs/IFR_Service/PrimitiveDef_i.cpp | 32 +- TAO/orbsvcs/IFR_Service/PrimitiveDef_i.h | 14 +- TAO/orbsvcs/IFR_Service/ProvidesDef_i.cpp | 28 +- TAO/orbsvcs/IFR_Service/ProvidesDef_i.h | 14 +- TAO/orbsvcs/IFR_Service/PublishesDef_i.cpp | 18 +- TAO/orbsvcs/IFR_Service/PublishesDef_i.h | 10 +- TAO/orbsvcs/IFR_Service/Repository_i.cpp | 106 +- TAO/orbsvcs/IFR_Service/Repository_i.h | 34 +- TAO/orbsvcs/IFR_Service/SequenceDef_i.cpp | 70 +- TAO/orbsvcs/IFR_Service/SequenceDef_i.h | 32 +- TAO/orbsvcs/IFR_Service/Servant_Factory.cpp | 12 +- TAO/orbsvcs/IFR_Service/Servant_Factory.h | 10 +- TAO/orbsvcs/IFR_Service/Servant_Locator.cpp | 6 +- TAO/orbsvcs/IFR_Service/Servant_Locator.h | 4 +- TAO/orbsvcs/IFR_Service/StringDef_i.cpp | 30 +- TAO/orbsvcs/IFR_Service/StringDef_i.h | 18 +- TAO/orbsvcs/IFR_Service/StructDef_i.cpp | 46 +- TAO/orbsvcs/IFR_Service/StructDef_i.h | 18 +- TAO/orbsvcs/IFR_Service/TypedefDef_i.cpp | 16 +- TAO/orbsvcs/IFR_Service/TypedefDef_i.h | 6 +- TAO/orbsvcs/IFR_Service/UnionDef_i.cpp | 86 +- TAO/orbsvcs/IFR_Service/UnionDef_i.h | 32 +- TAO/orbsvcs/IFR_Service/UsesDef_i.cpp | 38 +- TAO/orbsvcs/IFR_Service/UsesDef_i.h | 18 +- TAO/orbsvcs/IFR_Service/ValueBoxDef_i.cpp | 32 +- TAO/orbsvcs/IFR_Service/ValueBoxDef_i.h | 14 +- TAO/orbsvcs/IFR_Service/ValueDef_i.cpp | 134 +- TAO/orbsvcs/IFR_Service/ValueDef_i.h | 90 +- TAO/orbsvcs/IFR_Service/ValueMemberDef_i.cpp | 44 +- TAO/orbsvcs/IFR_Service/ValueMemberDef_i.h | 30 +- TAO/orbsvcs/IFR_Service/WstringDef_i.cpp | 30 +- TAO/orbsvcs/IFR_Service/WstringDef_i.h | 18 +- TAO/orbsvcs/IFR_Service/be_produce.cpp | 28 +- TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp | 170 +- TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h | 6 +- .../IFR_Service/ifr_adding_visitor_exception.cpp | 52 +- .../IFR_Service/ifr_adding_visitor_operation.cpp | 18 +- .../IFR_Service/ifr_adding_visitor_structure.cpp | 48 +- .../IFR_Service/ifr_adding_visitor_union.cpp | 54 +- TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp | 6 +- TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp | 16 +- TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h | 2 +- TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp | 12 +- TAO/orbsvcs/ImplRepo_Service/Forwarder.h | 4 +- TAO/orbsvcs/ImplRepo_Service/ImplRepo.cpp | 6 +- TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp | 110 +- TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h | 30 +- TAO/orbsvcs/ImplRepo_Service/Iterator.cpp | 4 +- TAO/orbsvcs/ImplRepo_Service/Iterator.h | 4 +- TAO/orbsvcs/ImplRepo_Service/Locator.cpp | 4 +- TAO/orbsvcs/ImplRepo_Service/Locator.h | 2 +- TAO/orbsvcs/ImplRepo_Service/NT_Service.cpp | 6 +- TAO/orbsvcs/ImplRepo_Service/Options.cpp | 2 +- TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp | 48 +- .../LifeCycle_Service/Criteria_Evaluator.cpp | 4 +- TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h | 8 +- TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp | 8 +- .../LifeCycle_Service/LifeCycle_Service.cpp | 26 +- TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h | 4 +- .../LifeCycle_Service/LifeCycle_Service_i.cpp | 12 +- .../LifeCycle_Service/LifeCycle_Service_i.h | 6 +- TAO/orbsvcs/LoadBalancer/LoadBalancer.cpp | 24 +- TAO/orbsvcs/LoadBalancer/LoadBalancer.h | 6 +- TAO/orbsvcs/LoadBalancer/LoadBalancer_Service.cpp | 6 +- TAO/orbsvcs/Logging_Service/Logging_Service.cpp | 44 +- TAO/orbsvcs/Logging_Service/Logging_Service.h | 8 +- TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp | 2 +- TAO/orbsvcs/Naming_Service/Naming_Server.cpp | 2 +- TAO/orbsvcs/Naming_Service/Naming_Service.cpp | 10 +- TAO/orbsvcs/Naming_Service/Naming_Service.h | 2 +- TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp | 2 +- TAO/orbsvcs/Notify_Service/Notify_Server.cpp | 6 +- TAO/orbsvcs/Notify_Service/Notify_Service.cpp | 64 +- TAO/orbsvcs/Notify_Service/Notify_Service.h | 8 +- .../Scheduling_Service/Scheduling_Service.cpp | 20 +- .../Scheduling_Service/Scheduling_Service.h | 2 +- TAO/orbsvcs/TAO_Service/TAO_Service.cpp | 6 +- TAO/orbsvcs/Time_Service/Clerk_i.cpp | 54 +- TAO/orbsvcs/Time_Service/Clerk_i.h | 4 +- TAO/orbsvcs/Time_Service/Server_i.cpp | 38 +- TAO/orbsvcs/Time_Service/Server_i.h | 6 +- TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp | 6 +- TAO/orbsvcs/Time_Service/Time_Service_Server.cpp | 6 +- TAO/orbsvcs/Trading_Service/Trading_Server.cpp | 4 +- TAO/orbsvcs/Trading_Service/Trading_Service.cpp | 6 +- TAO/orbsvcs/Trading_Service/Trading_Service.h | 4 +- .../CosEC/Factory/CosEventChannelFactory_i.cpp | 44 +- .../CosEC/Factory/CosEventChannelFactory_i.h | 12 +- .../examples/CosEC/Factory/FactoryClient.cpp | 104 +- .../examples/CosEC/Factory/FactoryDriver.cpp | 22 +- .../CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp | 64 +- .../CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h | 16 +- .../CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp | 10 +- .../CosEC/RtEC_Based/lib/ConsumerAdmin_i.h | 4 +- .../CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp | 86 +- .../CosEC/RtEC_Based/lib/CosEvent_Utilities.h | 26 +- .../CosEC/RtEC_Based/lib/EventChannel_i.cpp | 30 +- .../examples/CosEC/RtEC_Based/lib/EventChannel_i.h | 10 +- .../CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp | 34 +- .../CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h | 6 +- .../CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp | 36 +- .../CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h | 4 +- .../CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp | 10 +- .../CosEC/RtEC_Based/lib/SupplierAdmin_i.h | 4 +- .../CosEC/RtEC_Based/tests/Basic/Basic.cpp | 56 +- .../examples/CosEC/RtEC_Based/tests/Basic/Basic.h | 10 +- .../CosEC/RtEC_Based/tests/Basic/Consumer.cpp | 30 +- .../CosEC/RtEC_Based/tests/Basic/Consumer.h | 12 +- .../CosEC/RtEC_Based/tests/Basic/Supplier.cpp | 32 +- .../CosEC/RtEC_Based/tests/Basic/Supplier.h | 12 +- .../CosEC/RtEC_Based/tests/Multiple/Consumer.cpp | 38 +- .../CosEC/RtEC_Based/tests/Multiple/Consumer.h | 12 +- .../CosEC/RtEC_Based/tests/Multiple/Multiple.cpp | 22 +- .../CosEC/RtEC_Based/tests/Multiple/Supplier.cpp | 42 +- .../CosEC/RtEC_Based/tests/Multiple/Supplier.h | 12 +- TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp | 30 +- TAO/orbsvcs/examples/CosEC/Simple/Consumer.h | 4 +- TAO/orbsvcs/examples/CosEC/Simple/Service.cpp | 18 +- TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp | 38 +- TAO/orbsvcs/examples/CosEC/Simple/Supplier.h | 2 +- TAO/orbsvcs/examples/Notify/Filter/Filter.cpp | 136 +- TAO/orbsvcs/examples/Notify/Filter/Filter.h | 42 +- TAO/orbsvcs/examples/Notify/Filter/main.cpp | 4 +- .../examples/Notify/Subscribe/Subscribe.cpp | 126 +- TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h | 42 +- TAO/orbsvcs/examples/Notify/Subscribe/main.cpp | 4 +- .../examples/ORT/Gateway_ObjRef_Factory.cpp | 6 +- TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h | 2 +- TAO/orbsvcs/examples/ORT/Gateway_i.cpp | 22 +- TAO/orbsvcs/examples/ORT/Gateway_i.h | 4 +- TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp | 6 +- TAO/orbsvcs/examples/ORT/Object_Factory_i.h | 2 +- TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp | 10 +- TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h | 12 +- .../ORT/Server_IORInterceptor_ORBInitializer.cpp | 10 +- .../ORT/Server_IORInterceptor_ORBInitializer.h | 4 +- TAO/orbsvcs/examples/ORT/client.cpp | 6 +- TAO/orbsvcs/examples/ORT/gateway_server.cpp | 30 +- TAO/orbsvcs/examples/ORT/server.cpp | 20 +- TAO/orbsvcs/examples/ORT/sum_server_i.cpp | 2 +- TAO/orbsvcs/examples/ORT/sum_server_i.h | 2 +- TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp | 2 +- TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h | 2 +- TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp | 22 +- TAO/orbsvcs/examples/RtEC/MCast/Consumer.h | 8 +- TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp | 66 +- TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp | 24 +- TAO/orbsvcs/examples/RtEC/MCast/Supplier.h | 8 +- TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp | 4 +- TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h | 4 +- TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp | 64 +- TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp | 2 +- TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h | 2 +- TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp | 30 +- TAO/orbsvcs/examples/RtEC/Simple/Consumer.h | 4 +- TAO/orbsvcs/examples/RtEC/Simple/Service.cpp | 18 +- TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp | 38 +- TAO/orbsvcs/examples/RtEC/Simple/Supplier.h | 2 +- .../Security/SecurityLevel1/SLevel1_Test_i.cpp | 6 +- .../Security/SecurityLevel1/SLevel1_Test_i.h | 4 +- .../examples/Security/SecurityLevel1/client.cpp | 12 +- .../examples/Security/SecurityLevel1/server.cpp | 12 +- TAO/orbsvcs/examples/Security/Send_File/client.cpp | 12 +- TAO/orbsvcs/examples/Security/Send_File/server.cpp | 18 +- TAO/orbsvcs/examples/Security/Send_File/test_i.cpp | 4 +- TAO/orbsvcs/examples/Security/Send_File/test_i.h | 4 +- TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp | 632 ++-- TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h | 234 +- TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp | 10 +- TAO/orbsvcs/orbsvcs/AV/AV_Core.h | 2 +- TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp | 42 +- TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h | 18 +- TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp | 116 +- TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h | 26 +- TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp | 26 +- TAO/orbsvcs/orbsvcs/AV/Flows_T.h | 14 +- TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp | 10 +- TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp | 12 +- TAO/orbsvcs/orbsvcs/Channel_Clients_T.h | 6 +- TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp | 10 +- TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h | 10 +- TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp | 16 +- TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h | 10 +- .../orbsvcs/Concurrency/CC_LockSetFactory.cpp | 8 +- .../orbsvcs/Concurrency/CC_LockSetFactory.h | 4 +- .../orbsvcs/Concurrency/Concurrency_Utils.cpp | 6 +- TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp | 54 +- TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h | 30 +- TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i | 8 +- .../orbsvcs/CosEvent/CEC_ConsumerControl.cpp | 6 +- TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h | 6 +- TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp | 8 +- TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h | 8 +- .../orbsvcs/CosEvent/CEC_Dispatching_Task.cpp | 10 +- .../orbsvcs/CosEvent/CEC_Dispatching_Task.h | 8 +- TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp | 80 +- TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h | 34 +- TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp | 42 +- TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h | 2 +- .../orbsvcs/CosEvent/CEC_MT_Dispatching.cpp | 8 +- TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h | 4 +- .../orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp | 52 +- .../orbsvcs/CosEvent/CEC_ProxyPullConsumer.h | 22 +- .../orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp | 46 +- .../orbsvcs/CosEvent/CEC_ProxyPullSupplier.h | 24 +- .../orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp | 44 +- .../orbsvcs/CosEvent/CEC_ProxyPushConsumer.h | 20 +- .../orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp | 64 +- .../orbsvcs/CosEvent/CEC_ProxyPushSupplier.h | 26 +- .../orbsvcs/CosEvent/CEC_Pulling_Strategy.h | 6 +- .../CosEvent/CEC_Reactive_ConsumerControl.cpp | 54 +- .../CosEvent/CEC_Reactive_ConsumerControl.h | 12 +- .../CosEvent/CEC_Reactive_Pulling_Strategy.cpp | 22 +- .../CosEvent/CEC_Reactive_Pulling_Strategy.h | 2 +- .../CosEvent/CEC_Reactive_SupplierControl.cpp | 54 +- .../CosEvent/CEC_Reactive_SupplierControl.h | 12 +- TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp | 40 +- TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h | 24 +- TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i | 8 +- .../orbsvcs/CosEvent/CEC_SupplierControl.cpp | 6 +- TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h | 6 +- TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp | 20 +- TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h | 10 +- TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp | 20 +- TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h | 10 +- TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp | 20 +- TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h | 18 +- TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i | 16 +- TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp | 32 +- TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp | 4 +- TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h | 10 +- TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i | 16 +- TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp | 12 +- TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h | 18 +- TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp | 18 +- TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h | 6 +- TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp | 24 +- TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h | 14 +- TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i | 4 +- TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h | 10 +- TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp | 8 +- TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h | 8 +- TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp | 8 +- TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h | 8 +- TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp | 4 +- TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h | 2 +- TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h | 2 +- TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp | 110 +- TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp | 32 +- TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h | 14 +- TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i | 8 +- TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp | 40 +- TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h | 14 +- TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp | 62 +- TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h | 20 +- TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp | 18 +- TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h | 10 +- .../orbsvcs/Event/EC_Basic_Filter_Builder.cpp | 2 +- .../orbsvcs/Event/EC_Basic_Filter_Builder.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp | 18 +- TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h | 10 +- .../orbsvcs/Event/EC_Conjunction_Filter.cpp | 18 +- TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h | 10 +- TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp | 6 +- TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h | 6 +- TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp | 4 +- TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h | 4 +- .../orbsvcs/Event/EC_Disjunction_Filter.cpp | 18 +- TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h | 10 +- TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp | 8 +- TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h | 8 +- TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp | 10 +- TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h | 8 +- TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp | 88 +- TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h | 30 +- TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp | 20 +- TAO/orbsvcs/orbsvcs/Event/EC_Filter.h | 22 +- TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h | 4 +- TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp | 76 +- TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h | 24 +- TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp | 12 +- TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp | 42 +- TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h | 14 +- TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp | 6 +- TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h | 4 +- TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp | 8 +- TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h | 4 +- .../orbsvcs/Event/EC_Masked_Type_Filter.cpp | 14 +- TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h | 10 +- TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp | 18 +- TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h | 10 +- TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp | 6 +- TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h | 4 +- TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp | 60 +- TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h | 44 +- .../orbsvcs/Event/EC_Per_Supplier_Filter.cpp | 28 +- TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h | 12 +- .../orbsvcs/Event/EC_Prefix_Filter_Builder.cpp | 2 +- .../orbsvcs/Event/EC_Prefix_Filter_Builder.h | 2 +- .../orbsvcs/Event/EC_Priority_Dispatching.cpp | 14 +- .../orbsvcs/Event/EC_Priority_Dispatching.h | 4 +- .../orbsvcs/Event/EC_Priority_Scheduling.cpp | 12 +- TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h | 6 +- TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp | 64 +- TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h | 32 +- TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp | 100 +- TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h | 48 +- .../orbsvcs/Event/EC_RTCORBA_Dispatching.cpp | 10 +- TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h | 4 +- TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp | 12 +- .../orbsvcs/Event/EC_Reactive_ConsumerControl.cpp | 38 +- .../orbsvcs/Event/EC_Reactive_ConsumerControl.h | 8 +- .../orbsvcs/Event/EC_Reactive_SupplierControl.cpp | 38 +- .../orbsvcs/Event/EC_Reactive_SupplierControl.h | 8 +- TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp | 60 +- TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h | 16 +- .../orbsvcs/Event/EC_Sched_Filter_Builder.cpp | 46 +- .../orbsvcs/Event/EC_Sched_Filter_Builder.h | 6 +- TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h | 4 +- TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp | 6 +- TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h | 4 +- TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp | 4 +- TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h | 14 +- TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp | 18 +- TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h | 12 +- TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp | 2 +- .../orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp | 16 +- .../orbsvcs/Event/EC_Trivial_Supplier_Filter.h | 12 +- TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp | 26 +- TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h | 12 +- TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h | 2 +- TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp | 206 +- TAO/orbsvcs/orbsvcs/Event/Event_Channel.h | 76 +- TAO/orbsvcs/orbsvcs/Event/Event_Channel.i | 20 +- TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp | 20 +- TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp | 6 +- .../FT_Endpoint_Selector_Factory.cpp | 2 +- .../FaultTolerance/FT_Endpoint_Selector_Factory.h | 2 +- .../orbsvcs/FaultTolerance/FT_IOGR_Property.cpp | 8 +- .../orbsvcs/FaultTolerance/FT_IOGR_Property.h | 8 +- .../FT_Invocation_Endpoint_Selectors.cpp | 26 +- .../FT_Invocation_Endpoint_Selectors.h | 12 +- .../orbsvcs/FaultTolerance/FT_ORBInitializer.cpp | 14 +- .../orbsvcs/FaultTolerance/FT_ORBInitializer.h | 6 +- .../orbsvcs/FaultTolerance/FT_PolicyFactory.cpp | 8 +- .../orbsvcs/FaultTolerance/FT_PolicyFactory.h | 2 +- TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp | 30 +- TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h | 30 +- .../FaultTolerance/FT_Service_Callbacks.cpp | 18 +- .../orbsvcs/FaultTolerance/FT_Service_Callbacks.h | 10 +- TAO/orbsvcs/orbsvcs/LoadBalancer_i.cpp | 30 +- TAO/orbsvcs/orbsvcs/LoadBalancer_i.h | 10 +- TAO/orbsvcs/orbsvcs/LoadBalancer_i.i | 6 +- .../orbsvcs/LoadBalancing/LoadBalancer_i.cpp | 30 +- TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.h | 10 +- TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.i | 6 +- .../LoadBalancing/LoadBalancing_Strategy.cpp | 2 +- .../orbsvcs/LoadBalancing/LoadBalancing_Strategy.h | 4 +- .../orbsvcs/LoadBalancing/Minimum_Dispersion.cpp | 10 +- .../orbsvcs/LoadBalancing/Minimum_Dispersion.h | 4 +- .../orbsvcs/LoadBalancing/ReplicaLocator.cpp | 6 +- TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.h | 4 +- TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.cpp | 10 +- TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.h | 6 +- .../orbsvcs/LoadBalancing/Round_Robin_Strategy.cpp | 2 +- .../orbsvcs/LoadBalancing/Round_Robin_Strategy.h | 2 +- TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.cpp | 2 +- TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.h | 4 +- TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp | 22 +- TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h | 6 +- TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp | 8 +- TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h | 2 +- TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp | 14 +- TAO/orbsvcs/orbsvcs/Log/Iterator_i.h | 4 +- TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp | 6 +- TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h | 6 +- .../orbsvcs/Log/Log_Constraint_Interpreter.cpp | 2 +- .../orbsvcs/Log/Log_Constraint_Interpreter.h | 2 +- .../orbsvcs/Log/Log_Constraint_Visitors.cpp | 4 +- TAO/orbsvcs/orbsvcs/Log/Log_i.cpp | 108 +- TAO/orbsvcs/orbsvcs/Log/Log_i.h | 82 +- TAO/orbsvcs/orbsvcs/Minimum_Dispersion.cpp | 10 +- TAO/orbsvcs/orbsvcs/Minimum_Dispersion.h | 4 +- TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp | 18 +- TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h | 8 +- TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp | 56 +- TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h | 18 +- .../orbsvcs/Naming/Naming_Context_Interface.cpp | 58 +- .../orbsvcs/Naming/Naming_Context_Interface.h | 52 +- TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp | 8 +- TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h | 2 +- TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp | 54 +- .../orbsvcs/Naming/Persistent_Context_Index.cpp | 10 +- .../orbsvcs/Naming/Persistent_Naming_Context.cpp | 26 +- .../orbsvcs/Naming/Persistent_Naming_Context.h | 6 +- .../orbsvcs/Naming/Transient_Naming_Context.cpp | 18 +- .../orbsvcs/Naming/Transient_Naming_Context.h | 6 +- .../orbsvcs/Notify/Notify_AdminProperties.cpp | 4 +- .../orbsvcs/Notify/Notify_AdminProperties.h | 4 +- .../orbsvcs/Notify/Notify_Buffering_Strategy.cpp | 2 +- .../orbsvcs/Notify/Notify_Buffering_Strategy.h | 2 +- .../Notify/Notify_Channel_Objects_Factory.h | 32 +- TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.cpp | 4 +- TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.h | 2 +- .../orbsvcs/Notify/Notify_Collection_Factory.h | 4 +- TAO/orbsvcs/orbsvcs/Notify/Notify_Command.h | 2 +- .../Notify/Notify_Constraint_Interpreter.cpp | 2 +- .../orbsvcs/Notify/Notify_Constraint_Interpreter.h | 4 +- .../orbsvcs/Notify/Notify_Constraint_Visitors.cpp | 192 +- .../orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp | 186 +- .../orbsvcs/Notify/Notify_ConsumerAdmin_i.h | 80 +- .../orbsvcs/Notify/Notify_Default_CO_Factory.cpp | 74 +- .../orbsvcs/Notify/Notify_Default_CO_Factory.h | 32 +- .../Notify/Notify_Default_Collection_Factory.cpp | 4 +- .../Notify/Notify_Default_Collection_Factory.h | 4 +- .../orbsvcs/Notify/Notify_Default_EMO_Factory.cpp | 36 +- .../orbsvcs/Notify/Notify_Default_EMO_Factory.h | 18 +- .../orbsvcs/Notify/Notify_Default_POA_Factory.cpp | 70 +- .../orbsvcs/Notify/Notify_Default_POA_Factory.h | 26 +- TAO/orbsvcs/orbsvcs/Notify/Notify_Event.cpp | 32 +- TAO/orbsvcs/orbsvcs/Notify/Notify_Event.h | 24 +- .../Notify/Notify_EventChannelFactory_i.cpp | 56 +- .../orbsvcs/Notify/Notify_EventChannelFactory_i.h | 18 +- .../orbsvcs/Notify/Notify_EventChannel_i.cpp | 124 +- TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h | 42 +- .../Notify/Notify_Event_Dispatch_Command.cpp | 4 +- .../orbsvcs/Notify/Notify_Event_Dispatch_Command.h | 2 +- .../orbsvcs/Notify/Notify_Event_Manager.cpp | 42 +- TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h | 22 +- TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.i | 20 +- .../Notify/Notify_Event_Manager_Objects_Factory.h | 16 +- TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.cpp | 46 +- TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.h | 18 +- .../orbsvcs/Notify/Notify_Event_Processor.cpp | 24 +- .../orbsvcs/Notify/Notify_Event_Processor.h | 12 +- TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.cpp | 2 +- TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.h | 2 +- .../orbsvcs/Notify/Notify_FilterAdmin_i.cpp | 20 +- TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h | 12 +- .../orbsvcs/Notify/Notify_FilterFactory_i.cpp | 10 +- .../orbsvcs/Notify/Notify_FilterFactory_i.h | 6 +- TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp | 48 +- TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h | 30 +- TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.cpp | 2 +- TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.h | 2 +- .../Notify/Notify_Listener_Filter_Eval_Command.cpp | 6 +- .../Notify/Notify_Listener_Filter_Eval_Command.h | 2 +- TAO/orbsvcs/orbsvcs/Notify/Notify_Listeners.h | 10 +- .../orbsvcs/Notify/Notify_Lookup_Command.cpp | 10 +- TAO/orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.h | 4 +- .../orbsvcs/Notify/Notify_MT_Worker_Task.cpp | 16 +- TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.h | 6 +- TAO/orbsvcs/orbsvcs/Notify/Notify_POA_Factory.h | 24 +- .../orbsvcs/Notify/Notify_ProxyConsumer_T.cpp | 44 +- .../orbsvcs/Notify/Notify_ProxyConsumer_T.h | 16 +- .../orbsvcs/Notify/Notify_ProxyPushConsumer_i.cpp | 36 +- .../orbsvcs/Notify/Notify_ProxyPushConsumer_i.h | 16 +- .../orbsvcs/Notify/Notify_ProxyPushSupplier_i.cpp | 46 +- .../orbsvcs/Notify/Notify_ProxyPushSupplier_i.h | 18 +- .../orbsvcs/Notify/Notify_ProxySupplier_T.cpp | 80 +- .../orbsvcs/Notify/Notify_ProxySupplier_T.h | 32 +- TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.cpp | 50 +- TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.h | 30 +- TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.cpp | 6 +- TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.h | 6 +- .../Notify/Notify_SequenceProxyPushConsumer_i.cpp | 18 +- .../Notify/Notify_SequenceProxyPushConsumer_i.h | 8 +- .../Notify/Notify_SequenceProxyPushSupplier_i.cpp | 32 +- .../Notify/Notify_SequenceProxyPushSupplier_i.h | 12 +- .../Notify/Notify_Source_Filter_Eval_Command.cpp | 6 +- .../Notify/Notify_Source_Filter_Eval_Command.h | 2 +- .../orbsvcs/Notify/Notify_StructuredEvents.cpp | 20 +- .../orbsvcs/Notify/Notify_StructuredEvents.h | 8 +- .../Notify_StructuredProxyPushConsumer_i.cpp | 18 +- .../Notify/Notify_StructuredProxyPushConsumer_i.h | 8 +- .../Notify_StructuredProxyPushSupplier_i.cpp | 32 +- .../Notify/Notify_StructuredProxyPushSupplier_i.h | 12 +- .../orbsvcs/Notify/Notify_SupplierAdmin_i.cpp | 118 +- .../orbsvcs/Notify/Notify_SupplierAdmin_i.h | 52 +- .../Notify/Notify_Update_Dispatch_Command.cpp | 4 +- .../Notify/Notify_Update_Dispatch_Command.h | 2 +- TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.cpp | 6 +- TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.h | 4 +- TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.cpp | 28 +- TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h | 12 +- .../PortableGroup_Acceptor_Registry.cpp | 6 +- .../PortableGroup_Acceptor_Registry.h | 4 +- .../orbsvcs/PortableGroup/PortableGroup_Loader.cpp | 2 +- .../PortableGroup/PortableGroup_ORBInitializer.cpp | 6 +- .../PortableGroup/PortableGroup_ORBInitializer.h | 4 +- .../PortableGroup_Request_Dispatcher.cpp | 6 +- .../PortableGroup_Request_Dispatcher.h | 2 +- .../orbsvcs/PortableGroup/Portable_Group_Map.cpp | 8 +- .../orbsvcs/PortableGroup/Portable_Group_Map.h | 6 +- .../orbsvcs/PortableGroup/UIPMC_Connector.cpp | 4 +- .../orbsvcs/PortableGroup/UIPMC_Connector.h | 4 +- .../orbsvcs/PortableGroup/UIPMC_Profile.cpp | 14 +- TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h | 12 +- .../orbsvcs/Property/CosPropertyService_i.cpp | 150 +- .../orbsvcs/Property/CosPropertyService_i.h | 76 +- TAO/orbsvcs/orbsvcs/ReplicaLocator.cpp | 6 +- TAO/orbsvcs/orbsvcs/ReplicaLocator.h | 4 +- TAO/orbsvcs/orbsvcs/ReplicaProxy.cpp | 10 +- TAO/orbsvcs/orbsvcs/ReplicaProxy.h | 6 +- TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.cpp | 2 +- TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.h | 2 +- TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp | 28 +- TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h | 20 +- TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp | 2 +- TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h | 2 +- TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp | 38 +- TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h | 10 +- TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp | 50 +- TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h | 42 +- TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp | 20 +- TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h | 12 +- TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp | 4 +- TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h | 4 +- TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp | 6 +- .../SSLIOP/SSLIOP_Invocation_Interceptor.cpp | 18 +- .../orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h | 14 +- .../orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp | 32 +- TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h | 6 +- .../orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.cpp | 18 +- .../orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.h | 16 +- .../orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp | 14 +- .../orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h | 12 +- TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp | 8 +- TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Vault.cpp | 16 +- TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Vault.h | 16 +- TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp | 24 +- TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h | 20 +- TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp | 80 +- TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h | 44 +- TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp | 10 +- .../orbsvcs/Security/EstablishTrustPolicy.cpp | 8 +- .../orbsvcs/Security/EstablishTrustPolicy.h | 8 +- .../Security/InvocationCredentialsPolicy.cpp | 8 +- .../orbsvcs/Security/InvocationCredentialsPolicy.h | 8 +- TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.cpp | 8 +- TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.h | 8 +- .../orbsvcs/Security/PrincipalAuthenticator.cpp | 30 +- .../orbsvcs/Security/PrincipalAuthenticator.h | 14 +- TAO/orbsvcs/orbsvcs/Security/QOPPolicy.cpp | 8 +- TAO/orbsvcs/orbsvcs/Security/QOPPolicy.h | 8 +- TAO/orbsvcs/orbsvcs/Security/SecurityManager.cpp | 20 +- TAO/orbsvcs/orbsvcs/Security/SecurityManager.h | 20 +- TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp | 12 +- TAO/orbsvcs/orbsvcs/Security/Security_Current.h | 4 +- .../orbsvcs/Security/Security_Current_Impl.h | 4 +- .../orbsvcs/Security/Security_ORBInitializer.cpp | 30 +- .../orbsvcs/Security/Security_ORBInitializer.h | 6 +- .../orbsvcs/Security/Security_PolicyFactory.cpp | 2 +- .../orbsvcs/Security/Security_PolicyFactory.h | 2 +- TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp | 16 +- TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h | 8 +- .../orbsvcs/Time/TAO_Time_Service_Clerk.cpp | 10 +- TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h | 10 +- .../orbsvcs/Time/TAO_Time_Service_Server.cpp | 10 +- TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h | 10 +- TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp | 26 +- TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h | 16 +- TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp | 4 +- .../orbsvcs/Trader/Constraint_Interpreter.cpp | 8 +- .../orbsvcs/Trader/Constraint_Interpreter.h | 8 +- TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp | 170 +- TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp | 24 +- TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp | 14 +- TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h | 2 +- TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp | 4 +- TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp | 14 +- TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h | 8 +- TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp | 44 +- TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h | 22 +- TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp | 6 +- TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h | 4 +- .../orbsvcs/Trader/Service_Type_Repository.cpp | 32 +- .../orbsvcs/Trader/Service_Type_Repository.h | 24 +- TAO/orbsvcs/orbsvcs/Trader/Trader.cpp | 4 +- .../orbsvcs/Trader/Trader_Constraint_Visitors.cpp | 4 +- TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp | 206 +- TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h | 86 +- TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp | 68 +- TAO/orbsvcs/orbsvcs/Trader/Trader_T.h | 42 +- TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp | 118 +- TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h | 48 +- TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp | 54 +- TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h | 6 +- .../EC_Colocated_Latency/Consumer.cpp | 24 +- .../EC_Colocated_Latency/Consumer.h | 8 +- .../EC_Colocated_Latency/POA_Destroyer.cpp | 2 +- .../EC_Colocated_Latency/Receive_Task.cpp | 2 +- .../EC_Colocated_Latency/Send_Task.cpp | 2 +- .../EC_Colocated_Latency/Servant_var.cpp | 2 +- .../EC_Colocated_Latency/Supplier.cpp | 26 +- .../EC_Colocated_Latency/Supplier.h | 8 +- .../EC_Colocated_Latency/driver.cpp | 50 +- .../EC_Federated_Latency/Consumer.cpp | 24 +- .../EC_Federated_Latency/Consumer.h | 8 +- .../EC_Federated_Latency/Coordinator.cpp | 16 +- .../EC_Federated_Latency/Coordinator.h | 2 +- .../EC_Federated_Latency/Loopback.cpp | 18 +- .../EC_Federated_Latency/Loopback.h | 4 +- .../EC_Federated_Latency/Loopback_Consumer.cpp | 26 +- .../EC_Federated_Latency/Loopback_Consumer.h | 8 +- .../EC_Federated_Latency/Loopback_Supplier.cpp | 26 +- .../EC_Federated_Latency/Loopback_Supplier.h | 8 +- .../EC_Federated_Latency/Peer.cpp | 40 +- .../performance-tests/EC_Federated_Latency/Peer.h | 12 +- .../EC_Federated_Latency/Servant_var.cpp | 2 +- .../EC_Federated_Latency/Supplier.cpp | 26 +- .../EC_Federated_Latency/Supplier.h | 8 +- .../EC_Federated_Latency/client.cpp | 34 +- .../EC_Federated_Latency/server.cpp | 30 +- .../EC_Federated_Scalability/Consumer.cpp | 24 +- .../EC_Federated_Scalability/Consumer.h | 8 +- .../EC_Federated_Scalability/Coordinator.cpp | 16 +- .../EC_Federated_Scalability/Coordinator.h | 2 +- .../EC_Federated_Scalability/Loopback.cpp | 18 +- .../EC_Federated_Scalability/Loopback.h | 4 +- .../EC_Federated_Scalability/Loopback_Consumer.cpp | 26 +- .../EC_Federated_Scalability/Loopback_Consumer.h | 8 +- .../EC_Federated_Scalability/Loopback_Supplier.cpp | 26 +- .../EC_Federated_Scalability/Loopback_Supplier.h | 8 +- .../EC_Federated_Scalability/Peer.cpp | 40 +- .../EC_Federated_Scalability/Peer.h | 12 +- .../EC_Federated_Scalability/Servant_var.cpp | 2 +- .../EC_Federated_Scalability/Supplier.cpp | 26 +- .../EC_Federated_Scalability/Supplier.h | 8 +- .../EC_Federated_Scalability/client.cpp | 34 +- .../EC_Federated_Scalability/server.cpp | 30 +- .../performance-tests/EC_Latency/Client_Task.cpp | 2 +- .../performance-tests/EC_Latency/Consumer.cpp | 24 +- .../performance-tests/EC_Latency/Consumer.h | 8 +- .../performance-tests/EC_Latency/Supplier.cpp | 26 +- .../performance-tests/EC_Latency/Supplier.h | 8 +- .../performance-tests/EC_Latency/client.cpp | 36 +- .../performance-tests/EC_Latency/server.cpp | 32 +- .../EC_Scalability/Client_Task.cpp | 2 +- .../performance-tests/EC_Scalability/Consumer.cpp | 24 +- .../performance-tests/EC_Scalability/Consumer.h | 8 +- .../performance-tests/EC_Scalability/Supplier.cpp | 26 +- .../performance-tests/EC_Scalability/Supplier.h | 8 +- .../performance-tests/EC_Scalability/client.cpp | 36 +- .../performance-tests/EC_Scalability/server.cpp | 32 +- .../Asynch_Three_Stage/Connection_Manager.cpp | 70 +- .../Asynch_Three_Stage/Connection_Manager.h | 18 +- .../AVStreams/Asynch_Three_Stage/distributer.cpp | 34 +- .../AVStreams/Asynch_Three_Stage/distributer.h | 2 +- .../AVStreams/Asynch_Three_Stage/receiver.cpp | 28 +- .../tests/AVStreams/Asynch_Three_Stage/receiver.h | 2 +- .../tests/AVStreams/Asynch_Three_Stage/sender.cpp | 32 +- .../tests/AVStreams/Asynch_Three_Stage/sender.h | 4 +- .../AVStreams/Bidirectional_Flows/receiver.cpp | 28 +- .../tests/AVStreams/Bidirectional_Flows/receiver.h | 2 +- .../tests/AVStreams/Bidirectional_Flows/sender.cpp | 44 +- .../tests/AVStreams/Bidirectional_Flows/sender.h | 6 +- .../Component_Switching/Connection_Manager.cpp | 86 +- .../Component_Switching/Connection_Manager.h | 20 +- .../AVStreams/Component_Switching/distributer.cpp | 44 +- .../AVStreams/Component_Switching/distributer.h | 6 +- .../AVStreams/Component_Switching/receiver.cpp | 36 +- .../tests/AVStreams/Component_Switching/receiver.h | 6 +- .../tests/AVStreams/Component_Switching/sender.cpp | 42 +- .../tests/AVStreams/Component_Switching/sender.h | 6 +- TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp | 38 +- .../tests/AVStreams/Full_Profile/server.cpp | 24 +- TAO/orbsvcs/tests/AVStreams/Latency/control.cpp | 22 +- TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp | 16 +- TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp | 16 +- .../tests/AVStreams/Modify_QoS/receiver.cpp | 32 +- TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h | 2 +- TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp | 42 +- TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h | 8 +- TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp | 32 +- TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp | 18 +- .../tests/AVStreams/Multicast_Full_Profile/ftp.cpp | 40 +- .../AVStreams/Multicast_Full_Profile/server.cpp | 30 +- .../AVStreams/Multicast_Full_Profile/server.h | 2 +- .../tests/AVStreams/Multiple_Flows/receiver.cpp | 24 +- .../tests/AVStreams/Multiple_Flows/receiver.h | 2 +- .../tests/AVStreams/Multiple_Flows/sender.cpp | 48 +- .../tests/AVStreams/Multiple_Flows/sender.h | 6 +- TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp | 40 +- TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h | 6 +- TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp | 24 +- TAO/orbsvcs/tests/AVStreams/Pluggable/server.h | 2 +- .../AVStreams/Pluggable_Flow_Protocol/receiver.cpp | 24 +- .../AVStreams/Pluggable_Flow_Protocol/sender.cpp | 38 +- .../AVStreams/Simple_Three_Stage/distributer.cpp | 40 +- .../AVStreams/Simple_Three_Stage/distributer.h | 4 +- .../AVStreams/Simple_Three_Stage/receiver.cpp | 28 +- .../tests/AVStreams/Simple_Three_Stage/receiver.h | 2 +- .../tests/AVStreams/Simple_Three_Stage/sender.cpp | 32 +- .../tests/AVStreams/Simple_Three_Stage/sender.h | 4 +- .../tests/AVStreams/Simple_Two_Stage/receiver.cpp | 28 +- .../tests/AVStreams/Simple_Two_Stage/receiver.h | 2 +- .../tests/AVStreams/Simple_Two_Stage/sender.cpp | 40 +- .../tests/AVStreams/Simple_Two_Stage/sender.h | 6 +- .../Simple_Two_Stage_With_QoS/receiver.cpp | 26 +- .../AVStreams/Simple_Two_Stage_With_QoS/receiver.h | 2 +- .../AVStreams/Simple_Two_Stage_With_QoS/sender.cpp | 46 +- .../AVStreams/Simple_Two_Stage_With_QoS/sender.h | 8 +- TAO/orbsvcs/tests/Concurrency/CC_client.cpp | 12 +- TAO/orbsvcs/tests/Concurrency/CC_command.cpp | 40 +- TAO/orbsvcs/tests/Concurrency/CC_command.h | 2 +- .../tests/Concurrency/CC_naming_service.cpp | 22 +- TAO/orbsvcs/tests/Concurrency/CC_naming_service.h | 8 +- TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp | 2 +- TAO/orbsvcs/tests/Concurrency/CC_tests.cpp | 46 +- TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp | 68 +- TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp | 68 +- TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h | 2 +- .../tests/CosEvent/Basic/Pull_Push_Event.cpp | 54 +- TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp | 50 +- TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp | 112 +- TAO/orbsvcs/tests/CosEvent/Basic/Random.h | 24 +- TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp | 52 +- .../tests/CosEvent/lib/Counting_Consumer.cpp | 56 +- TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h | 20 +- .../tests/CosEvent/lib/Counting_Supplier.cpp | 54 +- TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h | 20 +- .../tests/EC_Custom_Marshal/ECM_Consumer.cpp | 58 +- TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h | 14 +- .../tests/EC_Custom_Marshal/ECM_Supplier.cpp | 56 +- TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h | 14 +- TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp | 190 +- TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h | 62 +- TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp | 216 +- TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h | 42 +- TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp | 30 +- TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h | 8 +- .../tests/EC_Throughput/ECT_Consumer_Driver.cpp | 46 +- .../tests/EC_Throughput/ECT_Consumer_Driver.h | 6 +- TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h | 2 +- TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp | 32 +- TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h | 6 +- .../tests/EC_Throughput/ECT_Supplier_Driver.cpp | 46 +- .../tests/EC_Throughput/ECT_Supplier_Driver.h | 8 +- TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp | 70 +- TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h | 12 +- TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp | 54 +- TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h | 2 +- TAO/orbsvcs/tests/Event/Basic/BCast.cpp | 30 +- TAO/orbsvcs/tests/Event/Basic/BCast.h | 4 +- TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp | 62 +- TAO/orbsvcs/tests/Event/Basic/Complex.cpp | 66 +- TAO/orbsvcs/tests/Event/Basic/Control.cpp | 40 +- TAO/orbsvcs/tests/Event/Basic/Control.h | 2 +- TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp | 68 +- TAO/orbsvcs/tests/Event/Basic/Gateway.cpp | 76 +- TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp | 68 +- TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h | 2 +- TAO/orbsvcs/tests/Event/Basic/Negation.cpp | 58 +- TAO/orbsvcs/tests/Event/Basic/Observer.cpp | 64 +- TAO/orbsvcs/tests/Event/Basic/Observer.h | 12 +- TAO/orbsvcs/tests/Event/Basic/Random.cpp | 116 +- TAO/orbsvcs/tests/Event/Basic/Random.h | 24 +- TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp | 36 +- TAO/orbsvcs/tests/Event/Basic/Reconnect.h | 6 +- TAO/orbsvcs/tests/Event/Basic/Schedule.cpp | 22 +- TAO/orbsvcs/tests/Event/Basic/Schedule.h | 8 +- TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp | 18 +- TAO/orbsvcs/tests/Event/Basic/Shutdown.h | 6 +- TAO/orbsvcs/tests/Event/Basic/Timeout.cpp | 44 +- TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp | 80 +- TAO/orbsvcs/tests/Event/Performance/Connect.cpp | 72 +- TAO/orbsvcs/tests/Event/Performance/Connect.h | 22 +- TAO/orbsvcs/tests/Event/Performance/Inversion.cpp | 18 +- TAO/orbsvcs/tests/Event/Performance/Inversion.h | 6 +- TAO/orbsvcs/tests/Event/Performance/Latency.cpp | 62 +- TAO/orbsvcs/tests/Event/Performance/Latency.h | 6 +- .../tests/Event/Performance/Latency_Server.cpp | 32 +- TAO/orbsvcs/tests/Event/Performance/Throughput.cpp | 4 +- TAO/orbsvcs/tests/Event/Performance/Throughput.h | 2 +- TAO/orbsvcs/tests/Event/lib/Consumer.cpp | 34 +- TAO/orbsvcs/tests/Event/lib/Consumer.h | 12 +- TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp | 26 +- TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h | 10 +- TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp | 54 +- TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h | 18 +- TAO/orbsvcs/tests/Event/lib/Driver.cpp | 172 +- TAO/orbsvcs/tests/Event/lib/Driver.h | 58 +- TAO/orbsvcs/tests/Event/lib/Supplier.cpp | 42 +- TAO/orbsvcs/tests/Event/lib/Supplier.h | 16 +- TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h | 2 +- TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp | 62 +- TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h | 8 +- TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp | 16 +- TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp | 4 +- TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h | 4 +- .../FaultTolerance/IOGRManipulation/IOGRTest.cpp | 22 +- TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp | 2 +- TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h | 2 +- TAO/orbsvcs/tests/IOR_MCast/client.cpp | 4 +- TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp | 10 +- TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h | 4 +- TAO/orbsvcs/tests/IOR_MCast/server.cpp | 4 +- TAO/orbsvcs/tests/IOR_MCast/server_i.cpp | 26 +- TAO/orbsvcs/tests/IOR_MCast/server_i.h | 4 +- TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp | 8 +- TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp | 12 +- TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp | 2 +- TAO/orbsvcs/tests/ImplRepo/airplane_i.h | 8 +- TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp | 6 +- TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp | 38 +- TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h | 4 +- TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp | 8 +- TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp | 8 +- TAO/orbsvcs/tests/ImplRepo/nestea_i.h | 8 +- TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp | 6 +- TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp | 38 +- TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h | 4 +- .../InterfaceRepo/Application_Test/client.cpp | 6 +- .../Application_Test/ifr_dii_client.cpp | 62 +- .../Application_Test/ifr_dii_client.h | 14 +- .../InterfaceRepo/Application_Test/server.cpp | 18 +- .../InterfaceRepo/Application_Test/test_i.cpp | 2 +- .../tests/InterfaceRepo/Application_Test/test_i.h | 2 +- .../tests/InterfaceRepo/IFR_Test/Admin_Client.cpp | 552 +-- .../tests/InterfaceRepo/IFR_Test/Admin_Client.h | 24 +- .../tests/InterfaceRepo/Persistence_Test/Ptest.cpp | 36 +- .../tests/InterfaceRepo/Persistence_Test/Ptest.h | 4 +- TAO/orbsvcs/tests/Interoperable_Naming/client.cpp | 2 +- .../Interoperable_Naming/ncontextext_client_i.cpp | 22 +- .../Interoperable_Naming/ncontextext_client_i.h | 8 +- .../tests/LoadBalancing/Hash_ReplicaControl.cpp | 22 +- .../tests/LoadBalancing/Hash_ReplicaControl.h | 8 +- TAO/orbsvcs/tests/LoadBalancing/Hash_Replica_i.cpp | 4 +- TAO/orbsvcs/tests/LoadBalancing/Hash_Replica_i.h | 2 +- TAO/orbsvcs/tests/LoadBalancing/client.cpp | 18 +- TAO/orbsvcs/tests/LoadBalancing/server.cpp | 30 +- TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp | 6 +- TAO/orbsvcs/tests/Miop/McastHello/McastHello.h | 6 +- TAO/orbsvcs/tests/Miop/McastHello/client.cpp | 12 +- TAO/orbsvcs/tests/Miop/McastHello/server.cpp | 22 +- .../tests/Notify/Basic/AdminProperties_Test.cpp | 82 +- .../tests/Notify/Basic/AdminProperties_Test.h | 16 +- .../tests/Notify/Basic/ConnectDisconnect.cpp | 135 +- TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h | 14 +- TAO/orbsvcs/tests/Notify/Basic/Events_Test.cpp | 104 +- TAO/orbsvcs/tests/Notify/Basic/Events_Test.h | 16 +- TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp | 182 +- TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h | 34 +- TAO/orbsvcs/tests/Notify/Basic/LifeCycleTest.cpp | 104 +- TAO/orbsvcs/tests/Notify/Basic/LifeCycleTest.h | 22 +- TAO/orbsvcs/tests/Notify/Basic/Simple.cpp | 104 +- TAO/orbsvcs/tests/Notify/Basic/Simple.h | 16 +- TAO/orbsvcs/tests/Notify/Basic/Updates.cpp | 122 +- TAO/orbsvcs/tests/Notify/Basic/Updates.h | 12 +- .../Blocking/Notify_Structured_Push_Consumer.cpp | 12 +- .../Blocking/Notify_Structured_Push_Consumer.h | 4 +- .../tests/Notify/Blocking/Structured_Consumer.cpp | 26 +- .../tests/Notify/Blocking/Structured_Supplier.cpp | 28 +- .../Discarding/Notify_Sequence_Push_Consumer.cpp | 12 +- .../Discarding/Notify_Sequence_Push_Consumer.h | 4 +- .../Discarding/Notify_Structured_Push_Consumer.cpp | 12 +- .../Discarding/Notify_Structured_Push_Consumer.h | 4 +- .../tests/Notify/Discarding/Sequence_Consumer.cpp | 26 +- .../tests/Notify/Discarding/Sequence_Supplier.cpp | 28 +- .../Notify/Discarding/Structured_Consumer.cpp | 28 +- .../Notify/Discarding/Structured_Supplier.cpp | 28 +- .../Notify_Structured_Push_Consumer.cpp | 2 +- .../Notify_Structured_Push_Consumer.h | 2 +- .../Notify/MT_Dispatching/Structured_Consumer.cpp | 34 +- .../Notify/MT_Dispatching/Structured_Supplier.cpp | 36 +- .../Ordering/Notify_Sequence_Push_Consumer.cpp | 12 +- .../Ordering/Notify_Sequence_Push_Consumer.h | 4 +- .../Ordering/Notify_Structured_Push_Consumer.cpp | 12 +- .../Ordering/Notify_Structured_Push_Consumer.h | 4 +- .../tests/Notify/Ordering/Sequence_Consumer.cpp | 26 +- .../tests/Notify/Ordering/Sequence_Supplier.cpp | 30 +- .../tests/Notify/Ordering/Structured_Consumer.cpp | 26 +- .../tests/Notify/Ordering/Structured_Supplier.cpp | 30 +- .../Notify_Sequence_Push_Consumer.cpp | 12 +- .../Notify_Sequence_Push_Consumer.h | 4 +- .../Sequence_Consumer.cpp | 32 +- .../Sequence_Supplier.cpp | 28 +- .../Notify_Sequence_Push_Consumer.cpp | 12 +- .../Notify_Sequence_Push_Consumer.h | 4 +- .../Sequence_Multi_Filter/Sequence_Consumer.cpp | 34 +- .../Sequence_Multi_Filter/Sequence_Supplier.cpp | 28 +- .../Structured_Filter/Notify_Push_Consumer.cpp | 2 +- .../Structured_Filter/Notify_Push_Consumer.h | 2 +- .../Structured_Filter/Structured_Consumer.cpp | 24 +- .../Structured_Filter/Structured_Supplier.cpp | 24 +- .../Notify_Push_Consumer.cpp | 18 +- .../Structured_Multi_Filter/Notify_Push_Consumer.h | 4 +- .../Notify_Push_Supplier.cpp | 16 +- .../Structured_Multi_Filter/Notify_Push_Supplier.h | 2 +- .../Structured_Consumer.cpp | 24 +- .../Structured_Supplier.cpp | 36 +- .../tests/Notify/lib/Notify_PushConsumer.cpp | 44 +- TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.h | 16 +- .../tests/Notify/lib/Notify_PushSupplier.cpp | 44 +- TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.h | 16 +- .../Notify/lib/Notify_SequencePushConsumer.cpp | 44 +- .../tests/Notify/lib/Notify_SequencePushConsumer.h | 16 +- .../Notify/lib/Notify_SequencePushSupplier.cpp | 50 +- .../tests/Notify/lib/Notify_SequencePushSupplier.h | 16 +- .../Notify/lib/Notify_StructuredPushConsumer.cpp | 44 +- .../Notify/lib/Notify_StructuredPushConsumer.h | 16 +- .../Notify/lib/Notify_StructuredPushSupplier.cpp | 48 +- .../Notify/lib/Notify_StructuredPushSupplier.h | 16 +- .../tests/Notify/lib/Notify_Test_Client.cpp | 42 +- TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h | 12 +- .../Filter/Notify_Sequence_Push_Consumer.cpp | 12 +- .../Filter/Notify_Sequence_Push_Consumer.h | 4 +- .../Filter/Notify_Structured_Push_Consumer.cpp | 12 +- .../Filter/Notify_Structured_Push_Consumer.h | 4 +- .../performance-tests/Filter/Sequence_Consumer.cpp | 34 +- .../performance-tests/Filter/Sequence_Supplier.cpp | 28 +- .../Filter/Structured_Consumer.cpp | 34 +- .../Filter/Structured_Supplier.cpp | 28 +- .../performance-tests/RedGreen/RedGreen_Test.cpp | 234 +- .../performance-tests/RedGreen/RedGreen_Test.h | 60 +- .../Notify/performance-tests/RedGreen/main.cpp | 4 +- .../performance-tests/Throughput/Throughput.cpp | 82 +- .../performance-tests/Throughput/Throughput.h | 14 +- TAO/orbsvcs/tests/Property/client.cpp | 114 +- TAO/orbsvcs/tests/Property/client.h | 28 +- TAO/orbsvcs/tests/Property/main.cpp | 126 +- TAO/orbsvcs/tests/Property/server.cpp | 22 +- TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp | 20 +- .../tests/Sched_Conf/Sched_Conf_Anomalies.cpp | 36 +- .../tests/Sched_Conf/Sched_Conf_Runtime.cpp | 24 +- .../tests/Security/Big_Request/TX_Object_i.cpp | 8 +- .../tests/Security/Big_Request/TX_Object_i.h | 6 +- TAO/orbsvcs/tests/Security/Big_Request/client.cpp | 12 +- TAO/orbsvcs/tests/Security/Big_Request/server.cpp | 20 +- TAO/orbsvcs/tests/Security/Callback/client.cpp | 32 +- TAO/orbsvcs/tests/Security/Callback/client_i.cpp | 2 +- TAO/orbsvcs/tests/Security/Callback/client_i.h | 2 +- TAO/orbsvcs/tests/Security/Callback/server.cpp | 22 +- TAO/orbsvcs/tests/Security/Callback/server_i.cpp | 10 +- TAO/orbsvcs/tests/Security/Callback/server_i.h | 6 +- .../tests/Security/MT_SSLIOP/Client_Worker.cpp | 10 +- .../tests/Security/MT_SSLIOP/Client_Worker.h | 2 +- .../tests/Security/MT_SSLIOP/Server_Worker.cpp | 2 +- TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp | 12 +- TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp | 16 +- TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp | 6 +- TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h | 4 +- .../tests/Security/Secure_Invocation/Foo_i.cpp | 8 +- .../tests/Security/Secure_Invocation/Foo_i.h | 4 +- .../tests/Security/Secure_Invocation/client.cpp | 28 +- .../tests/Security/Secure_Invocation/server.cpp | 24 +- .../Security/SecurityLevel1/SLevel1_Test_i.cpp | 8 +- .../tests/Security/SecurityLevel1/SLevel1_Test_i.h | 4 +- .../tests/Security/SecurityLevel1/client.cpp | 12 +- .../tests/Security/SecurityLevel1/server.cpp | 24 +- TAO/orbsvcs/tests/Simple_Naming/client.cpp | 230 +- TAO/orbsvcs/tests/Simple_Naming/client.h | 16 +- TAO/orbsvcs/tests/Time/Client_i.cpp | 66 +- TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp | 74 +- TAO/orbsvcs/tests/Trading/Offer_Exporter.h | 20 +- TAO/orbsvcs/tests/Trading/Offer_Importer.cpp | 42 +- TAO/orbsvcs/tests/Trading/Offer_Importer.h | 8 +- .../tests/Trading/Service_Type_Exporter.cpp | 44 +- TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h | 16 +- TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp | 2 +- TAO/orbsvcs/tests/Trading/Simple_Dynamic.h | 2 +- TAO/orbsvcs/tests/Trading/TT_Info.cpp | 8 +- TAO/orbsvcs/tests/Trading/TT_Info.h | 12 +- TAO/orbsvcs/tests/Trading/colocated_test.cpp | 40 +- TAO/orbsvcs/tests/Trading/export_test.cpp | 50 +- TAO/orbsvcs/tests/Trading/import_test.cpp | 10 +- TAO/orbsvcs/tests/ior_corbaname/client.cpp | 2 +- .../tests/ior_corbaname/ior_corbaname_client_i.cpp | 12 +- .../tests/ior_corbaname/ior_corbaname_client_i.h | 2 +- TAO/orbsvcs/tests/ior_corbaname/server.cpp | 20 +- TAO/orbsvcs/tests/ior_corbaname/status_i.cpp | 4 +- TAO/orbsvcs/tests/ior_corbaname/status_i.h | 4 +- .../tests/tests_svc_loader/tests_svc_loader.cpp | 8 +- TAO/performance-tests/AMI_Latency/Roundtrip.cpp | 26 + TAO/performance-tests/AMI_Latency/Roundtrip.h | 46 + .../AMI_Latency/Roundtrip_Handler.cpp | 75 + .../AMI_Latency/Roundtrip_Handler.h | 61 + TAO/performance-tests/AMI_Latency/Server_Task.cpp | 24 + TAO/performance-tests/AMI_Latency/client.cpp | 185 + TAO/performance-tests/AMI_Latency/server.cpp | 155 + TAO/performance-tests/Callback/Callback_i.cpp | 2 +- TAO/performance-tests/Callback/Callback_i.h | 2 +- TAO/performance-tests/Callback/Server_i.cpp | 8 +- TAO/performance-tests/Callback/Server_i.h | 6 +- TAO/performance-tests/Callback/client.cpp | 38 +- TAO/performance-tests/Callback/server.cpp | 30 +- .../Cubit/TAO/DII_Cubit/client.cpp | 40 +- .../Cubit/TAO/IDL_Cubit/Cubit_Client.cpp | 110 +- .../Cubit/TAO/IDL_Cubit/Cubit_Client.h | 28 +- .../Cubit/TAO/IDL_Cubit/Cubit_Server.cpp | 10 +- .../Cubit/TAO/IDL_Cubit/Cubit_Server.h | 4 +- .../Cubit/TAO/IDL_Cubit/Cubit_i.cpp | 34 +- .../Cubit/TAO/IDL_Cubit/Cubit_i.h | 32 +- .../Cubit/TAO/IDL_Cubit/collocation_test.cpp | 4 +- .../Cubit/TAO/IDL_Cubit/server.cpp | 4 +- .../Cubit/TAO/MT_Cubit/Cubit_Task.cpp | 24 +- .../Cubit/TAO/MT_Cubit/Task_Client.cpp | 44 +- .../Cubit/TAO/MT_Cubit/Task_Client.h | 4 +- .../Cubit/TAO/MT_Cubit/cubit_i.cpp | 14 +- TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h | 14 +- TAO/performance-tests/DII_Latency/Roundtrip.cpp | 26 + TAO/performance-tests/DII_Latency/Roundtrip.h | 46 + TAO/performance-tests/DII_Latency/client.cpp | 178 + TAO/performance-tests/DII_Latency/server.cpp | 136 + TAO/performance-tests/DSI_Latency/Roundtrip.cpp | 97 + TAO/performance-tests/DSI_Latency/Roundtrip.h | 48 + TAO/performance-tests/DSI_Latency/client.cpp | 163 + TAO/performance-tests/DSI_Latency/server.cpp | 142 + .../Deferred_Latency/Roundtrip.cpp | 26 + TAO/performance-tests/Deferred_Latency/Roundtrip.h | 46 + TAO/performance-tests/Deferred_Latency/client.cpp | 203 + TAO/performance-tests/Deferred_Latency/server.cpp | 136 + .../POA/Create_Reference/create_reference.cpp | 28 +- TAO/performance-tests/POA/Demux/client.cpp | 4 +- .../POA/Demux/demux_test_client.cpp | 30 +- .../POA/Demux/demux_test_client.h | 14 +- .../POA/Demux/demux_test_client.i | 8 +- TAO/performance-tests/POA/Demux/demux_test_i.cpp | 4 +- TAO/performance-tests/POA/Demux/demux_test_i.h | 6 +- .../POA/Demux/demux_test_server.cpp | 38 +- .../POA/Demux/demux_test_server.h | 4 +- TAO/performance-tests/POA/Demux/server.cpp | 4 +- .../POA/Implicit_Activation/Factory.cpp | 8 +- .../POA/Implicit_Activation/Factory.h | 4 +- .../POA/Implicit_Activation/Simple.cpp | 8 +- .../POA/Implicit_Activation/Simple.h | 2 +- .../POA/Implicit_Activation/client.cpp | 12 +- .../POA/Implicit_Activation/collocated.cpp | 18 +- .../POA/Implicit_Activation/server.cpp | 20 +- .../registration.cpp | 28 +- TAO/performance-tests/Pluggable/PP_Test_Client.cpp | 28 +- TAO/performance-tests/Pluggable/PP_Test_Server.cpp | 10 +- TAO/performance-tests/Pluggable/PP_Test_Server.h | 4 +- TAO/performance-tests/Pluggable/PP_Test_i.cpp | 12 +- TAO/performance-tests/Pluggable/PP_Test_i.h | 8 +- TAO/performance-tests/Pluggable/server.cpp | 6 +- .../RTCorba/Multiple_Endpoints/Common/test_i.cpp | 8 +- .../RTCorba/Multiple_Endpoints/Common/test_i.h | 4 +- .../Multiple_Endpoints/Orb_Per_Priority/client.cpp | 18 +- .../Multiple_Endpoints/Orb_Per_Priority/server.cpp | 24 +- .../Multiple_Endpoints/Single_Endpoint/client.cpp | 18 +- .../Multiple_Endpoints/Single_Endpoint/server.cpp | 16 +- .../RTCorba/Oneways/Reliable/client.cpp | 56 +- .../RTCorba/Oneways/Reliable/server.cpp | 18 +- .../RTCorba/Oneways/Reliable/test_i.cpp | 10 +- .../RTCorba/Oneways/Reliable/test_i.h | 8 +- .../RTCorba/Thread_Pool/client.cpp | 54 +- .../RTCorba/Thread_Pool/server.cpp | 64 +- .../Single_Threaded_Latency/Roundtrip.cpp | 26 + .../Single_Threaded_Latency/Roundtrip.h | 46 + .../Single_Threaded_Latency/client.cpp | 164 + .../Single_Threaded_Latency/server.cpp | 136 + .../Thread_Per_Connection_Latency/Client_Task.cpp | 65 + .../Thread_Per_Connection_Latency/Client_Task.h | 46 + .../Thread_Per_Connection_Latency/Roundtrip.cpp | 26 + .../Thread_Per_Connection_Latency/Roundtrip.h | 46 + .../Thread_Per_Connection_Latency/client.cpp | 149 + .../Thread_Per_Connection_Latency/server.cpp | 136 + .../Thread_Pool_Latency/Client_Task.cpp | 65 + .../Thread_Pool_Latency/Client_Task.h | 46 + .../Thread_Pool_Latency/Roundtrip.cpp | 26 + .../Thread_Pool_Latency/Roundtrip.h | 46 + .../Thread_Pool_Latency/Worker_Thread.cpp | 24 + .../Thread_Pool_Latency/client.cpp | 149 + .../Thread_Pool_Latency/server.cpp | 139 + TAO/performance-tests/Throughput/Receiver.cpp | 10 +- TAO/performance-tests/Throughput/Receiver.h | 4 +- .../Throughput/Receiver_Factory.cpp | 8 +- .../Throughput/Receiver_Factory.h | 4 +- TAO/performance-tests/Throughput/client.cpp | 16 +- TAO/performance-tests/Throughput/server.cpp | 20 +- TAO/tao/Abstract_Servant_Base.cpp | 6 +- TAO/tao/Abstract_Servant_Base.h | 16 +- TAO/tao/Acceptor_Registry.cpp | 6 +- TAO/tao/Acceptor_Registry.h | 4 +- TAO/tao/Adapter.cpp | 14 +- TAO/tao/Adapter.h | 16 +- TAO/tao/Any.cpp | 124 +- TAO/tao/Any.h | 6 +- TAO/tao/Asynch_Invocation.cpp | 12 +- TAO/tao/Asynch_Invocation.h | 8 +- TAO/tao/Asynch_Reply_Dispatcher.cpp | 10 +- TAO/tao/BiDir_Adapter.h | 2 +- TAO/tao/BiDir_GIOP/BiDirGIOP.cpp | 4 +- TAO/tao/BiDir_GIOP/BiDirGIOP.h | 2 +- TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp | 10 +- TAO/tao/BiDir_GIOP/BiDirPolicyC.h | 8 +- TAO/tao/BiDir_GIOP/BiDirPolicyC.i | 4 +- TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp | 8 +- TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h | 4 +- TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp | 10 +- TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h | 6 +- TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp | 2 +- TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h | 2 +- TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp | 8 +- TAO/tao/BiDir_GIOP/BiDir_Policy_i.h | 8 +- TAO/tao/BoundsC.cpp | 6 +- TAO/tao/BoundsC.h | 4 +- TAO/tao/Buffering_Constraint_Policy.cpp | 10 +- TAO/tao/Buffering_Constraint_Policy.h | 10 +- TAO/tao/CDR_Encaps_Codec.cpp | 18 +- TAO/tao/CDR_Encaps_Codec.h | 10 +- TAO/tao/CONV_FRAMEC.cpp | 12 +- TAO/tao/CORBALOC_Parser.cpp | 36 +- TAO/tao/CORBALOC_Parser.h | 16 +- TAO/tao/CORBANAME_Parser.cpp | 16 +- TAO/tao/CORBANAME_Parser.h | 4 +- TAO/tao/ClientInterceptorAdapter.cpp | 32 +- TAO/tao/ClientInterceptorAdapter.h | 10 +- TAO/tao/ClientRequestInfo.cpp | 138 +- TAO/tao/ClientRequestInfo.h | 48 +- TAO/tao/ClientRequestInfo.inl | 2 +- TAO/tao/ClientRequestInfo_i.cpp | 56 +- TAO/tao/ClientRequestInfo_i.h | 48 +- TAO/tao/CodecFactory.cpp | 2 +- TAO/tao/CodecFactory.h | 2 +- TAO/tao/CodecFactory_ORBInitializer.cpp | 6 +- TAO/tao/CodecFactory_ORBInitializer.h | 4 +- TAO/tao/Collocation_Resolver.h | 2 +- TAO/tao/Connector_Registry.cpp | 8 +- TAO/tao/Connector_Registry.h | 4 +- TAO/tao/CurrentC.cpp | 14 +- TAO/tao/CurrentC.h | 6 +- TAO/tao/DLL_ORB.cpp | 6 +- TAO/tao/DLL_Parser.cpp | 4 +- TAO/tao/DLL_Parser.h | 2 +- TAO/tao/Default_Collocation_Resolver.cpp | 2 +- TAO/tao/Default_Collocation_Resolver.h | 2 +- TAO/tao/Default_Endpoint_Selector_Factory.cpp | 2 +- TAO/tao/Default_Endpoint_Selector_Factory.h | 2 +- TAO/tao/Default_Protocols_Hooks.cpp | 20 +- TAO/tao/Default_Protocols_Hooks.h | 20 +- TAO/tao/Default_Stub_Factory.cpp | 2 +- TAO/tao/Default_Stub_Factory.h | 2 +- TAO/tao/Default_Thread_Lane_Resources_Manager.cpp | 4 +- TAO/tao/Default_Thread_Lane_Resources_Manager.h | 2 +- TAO/tao/Domain/DomainS.cpp | 168 +- TAO/tao/Domain/DomainS.h | 50 +- TAO/tao/Domain/DomainS.i | 12 +- TAO/tao/Domain/DomainS_T.h | 14 +- TAO/tao/Domain/DomainS_T.i | 28 +- TAO/tao/DomainC.cpp | 158 +- TAO/tao/DomainC.h | 38 +- TAO/tao/DynamicAny/DynAnyFactory.cpp | 56 +- TAO/tao/DynamicAny/DynAnyFactory.h | 12 +- TAO/tao/DynamicAny/DynAny_i.cpp | 58 +- TAO/tao/DynamicAny/DynAny_i.h | 20 +- TAO/tao/DynamicAny/DynArray_i.cpp | 116 +- TAO/tao/DynamicAny/DynArray_i.h | 28 +- TAO/tao/DynamicAny/DynCommon.cpp | 352 +- TAO/tao/DynamicAny/DynCommon.h | 102 +- TAO/tao/DynamicAny/DynEnum_i.cpp | 44 +- TAO/tao/DynamicAny/DynEnum_i.h | 24 +- TAO/tao/DynamicAny/DynSequence_i.cpp | 126 +- TAO/tao/DynamicAny/DynSequence_i.h | 30 +- TAO/tao/DynamicAny/DynStruct_i.cpp | 122 +- TAO/tao/DynamicAny/DynStruct_i.h | 30 +- TAO/tao/DynamicAny/DynUnion_i.cpp | 196 +- TAO/tao/DynamicAny/DynUnion_i.h | 38 +- TAO/tao/DynamicAny/DynamicAny.cpp | 2 +- TAO/tao/DynamicAny/DynamicAny.h | 2 +- TAO/tao/DynamicAny/DynamicAnyC.cpp | 112 +- TAO/tao/DynamicAny/DynamicAnyC.h | 250 +- TAO/tao/DynamicAny/DynamicAnyC.i | 36 +- TAO/tao/DynamicC.cpp | 6 +- TAO/tao/DynamicInterface/Context.cpp | 18 +- TAO/tao/DynamicInterface/Context.h | 18 +- TAO/tao/DynamicInterface/DII_Invocation.cpp | 16 +- TAO/tao/DynamicInterface/DII_Invocation.h | 6 +- TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp | 6 +- TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp | 10 +- TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h | 6 +- .../DynamicInterface/Dynamic_Implementation.cpp | 20 +- TAO/tao/DynamicInterface/Dynamic_Implementation.h | 10 +- TAO/tao/DynamicInterface/ExceptionList.cpp | 4 +- TAO/tao/DynamicInterface/ExceptionList.h | 4 +- TAO/tao/DynamicInterface/Request.cpp | 50 +- TAO/tao/DynamicInterface/Request.h | 16 +- TAO/tao/DynamicInterface/Request.inl | 12 +- TAO/tao/DynamicInterface/Server_Request.cpp | 18 +- TAO/tao/DynamicInterface/Server_Request.h | 8 +- .../DynamicInterface/Unknown_User_Exception.cpp | 4 +- TAO/tao/DynamicInterface/Unknown_User_Exception.h | 4 +- TAO/tao/Dynamic_Adapter.cpp | 6 +- TAO/tao/Dynamic_Adapter.h | 6 +- TAO/tao/Endpoint_Selector_Factory.h | 2 +- TAO/tao/Exception.cpp | 30 +- TAO/tao/Exception.h | 16 +- TAO/tao/FILE_Parser.cpp | 4 +- TAO/tao/FILE_Parser.h | 2 +- TAO/tao/GIOPC.cpp | 4 +- TAO/tao/GIOP_Message_Base.cpp | 16 +- TAO/tao/GIOP_Message_Generator_Parser.h | 2 +- TAO/tao/GIOP_Message_Generator_Parser_10.cpp | 8 +- TAO/tao/GIOP_Message_Generator_Parser_10.h | 2 +- TAO/tao/GIOP_Message_Generator_Parser_12.cpp | 6 +- TAO/tao/GIOP_Message_Generator_Parser_12.h | 2 +- TAO/tao/GIOP_Message_Lite.cpp | 18 +- TAO/tao/GIOP_Message_Lite.h | 2 +- TAO/tao/IFR_Client/IFR_BaseC.cpp | 1734 ++++----- TAO/tao/IFR_Client/IFR_BaseC.h | 312 +- TAO/tao/IFR_Client/IFR_BasicC.cpp | 3736 +++++++++---------- TAO/tao/IFR_Client/IFR_BasicC.h | 618 +-- TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp | 18 +- TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h | 4 +- TAO/tao/IFR_Client/IFR_ComponentsC.cpp | 1984 +++++----- TAO/tao/IFR_Client/IFR_ComponentsC.h | 354 +- TAO/tao/IFR_Client/IFR_ExtendedC.cpp | 1612 ++++---- TAO/tao/IFR_Client/IFR_ExtendedC.h | 228 +- TAO/tao/IFR_Client_Adapter.cpp | 4 +- TAO/tao/IFR_Client_Adapter.h | 4 +- TAO/tao/IIOPC.cpp | 6 +- TAO/tao/IIOP_Acceptor.cpp | 2 +- TAO/tao/IIOP_Connector.cpp | 8 +- TAO/tao/IIOP_Connector.h | 4 +- TAO/tao/IIOP_Profile.cpp | 6 +- TAO/tao/IIOP_Profile.h | 6 +- TAO/tao/IOPC.cpp | 62 +- TAO/tao/IOPC.h | 38 +- TAO/tao/IORManipulation/IORC.cpp | 54 +- TAO/tao/IORManipulation/IORC.h | 60 +- TAO/tao/IORManipulation/IORC.i | 8 +- TAO/tao/IORManipulation/IORManip_Loader.cpp | 2 +- TAO/tao/IORManipulation/IORManip_Loader.h | 2 +- TAO/tao/IORManipulation/IORManipulation.cpp | 32 +- TAO/tao/IORManipulation/IORManipulation.h | 18 +- TAO/tao/IORTable/IORTableC.cpp | 28 +- TAO/tao/IORTable/IORTableC.h | 30 +- TAO/tao/IORTable/IORTableC.i | 8 +- TAO/tao/IORTable/IOR_Table_Impl.cpp | 12 +- TAO/tao/IORTable/IOR_Table_Impl.h | 10 +- TAO/tao/IORTable/Table_Adapter.cpp | 12 +- TAO/tao/IORTable/Table_Adapter.h | 8 +- TAO/tao/IOR_Parser.h | 2 +- TAO/tao/Interceptor_List.cpp | 16 +- TAO/tao/Interceptor_List.h | 8 +- TAO/tao/Invocation.cpp | 82 +- TAO/tao/Invocation.h | 30 +- TAO/tao/Invocation.i | 2 +- TAO/tao/Invocation_Endpoint_Selectors.cpp | 12 +- TAO/tao/Invocation_Endpoint_Selectors.h | 14 +- TAO/tao/Leader_Follower_Flushing_Strategy.cpp | 4 +- TAO/tao/LocalObject.cpp | 28 +- TAO/tao/LocalObject.h | 32 +- TAO/tao/LocalObject.i | 4 +- TAO/tao/MCAST_Parser.cpp | 8 +- TAO/tao/MCAST_Parser.h | 4 +- TAO/tao/MProfile.cpp | 14 +- TAO/tao/MProfile.h | 8 +- TAO/tao/MProfile.i | 2 +- TAO/tao/Marshal.cpp | 64 +- TAO/tao/Marshal.h | 64 +- TAO/tao/Messaging.cpp | 24 +- TAO/tao/Messaging.h | 4 +- TAO/tao/MessagingC.cpp | 160 +- TAO/tao/MessagingC.h | 116 +- TAO/tao/MessagingC.i | 56 +- TAO/tao/Messaging_ORBInitializer.cpp | 36 +- TAO/tao/Messaging_ORBInitializer.h | 6 +- TAO/tao/Messaging_PolicyFactory.cpp | 8 +- TAO/tao/Messaging_PolicyFactory.h | 2 +- TAO/tao/Messaging_Policy_i.cpp | 24 +- TAO/tao/Messaging_Policy_i.h | 20 +- TAO/tao/NVList.cpp | 48 +- TAO/tao/NVList.h | 26 +- TAO/tao/NVList.i | 4 +- TAO/tao/ORB.cpp | 264 +- TAO/tao/ORB.h | 122 +- TAO/tao/ORBInitInfo.cpp | 70 +- TAO/tao/ORBInitInfo.h | 30 +- TAO/tao/ORBInitializer_Registry.cpp | 16 +- TAO/tao/ORBInitializer_Registry.h | 8 +- TAO/tao/ORB_Core.cpp | 114 +- TAO/tao/ORB_Core.h | 64 +- TAO/tao/ORB_Core.i | 40 +- TAO/tao/Object.cpp | 68 +- TAO/tao/Object.h | 36 +- TAO/tao/Object.i | 8 +- TAO/tao/ObjectIDList.cpp | 2 +- TAO/tao/ObjectReferenceTemplateC.cpp | 2 +- TAO/tao/ObjectReferenceTemplateC.h | 8 +- TAO/tao/Object_Loader.h | 2 +- TAO/tao/Object_Proxy_Broker.h | 2 +- TAO/tao/Object_Proxy_Impl.h | 6 +- TAO/tao/Object_Ref_Table.cpp | 4 +- TAO/tao/Object_Ref_Table.h | 4 +- TAO/tao/OctetSeqC.cpp | 2 +- TAO/tao/PICurrent.cpp | 20 +- TAO/tao/PICurrent.h | 10 +- TAO/tao/PICurrent.inl | 2 +- TAO/tao/PICurrent_ORBInitializer.cpp | 8 +- TAO/tao/PICurrent_ORBInitializer.h | 4 +- TAO/tao/Pluggable.cpp | 6 +- TAO/tao/Pluggable.h | 6 +- TAO/tao/PolicyC.cpp | 226 +- TAO/tao/PolicyC.h | 56 +- TAO/tao/PolicyFactory_Registry.cpp | 6 +- TAO/tao/PolicyFactory_Registry.h | 4 +- TAO/tao/Policy_Manager.cpp | 8 +- TAO/tao/Policy_Manager.h | 18 +- TAO/tao/Policy_Manager.i | 28 +- TAO/tao/Policy_Set.cpp | 42 +- TAO/tao/Policy_Set.h | 12 +- TAO/tao/Policy_Validator.cpp | 12 +- TAO/tao/Policy_Validator.h | 8 +- TAO/tao/PollableC.cpp | 38 +- TAO/tao/PollableC.h | 40 +- TAO/tao/PollableC.i | 12 +- TAO/tao/PortableInterceptorC.cpp | 414 +- TAO/tao/PortableInterceptorC.h | 1264 +++---- TAO/tao/PortableServer/AMH_Response_Handler.cpp | 30 +- TAO/tao/PortableServer/Active_Object_Map.cpp | 2 +- TAO/tao/PortableServer/Active_Object_Map.h | 2 +- TAO/tao/PortableServer/Collocated_Object.cpp | 26 +- TAO/tao/PortableServer/Collocated_Object.h | 8 +- .../PortableServer/Default_Policy_Validator.cpp | 26 +- TAO/tao/PortableServer/Default_Policy_Validator.h | 4 +- .../PortableServer/Default_Servant_Dispatcher.cpp | 8 +- .../PortableServer/Default_Servant_Dispatcher.h | 4 +- .../PortableServer/Direct_Object_Proxy_Impl.cpp | 12 +- TAO/tao/PortableServer/Direct_Object_Proxy_Impl.h | 6 +- TAO/tao/PortableServer/IORInfo.cpp | 30 +- TAO/tao/PortableServer/IORInfo.h | 20 +- TAO/tao/PortableServer/ImplRepoC.cpp | 746 ++-- TAO/tao/PortableServer/ImplRepoC.h | 126 +- TAO/tao/PortableServer/ImplRepoC.i | 12 +- TAO/tao/PortableServer/ImplRepoS.cpp | 824 ++-- TAO/tao/PortableServer/ImplRepoS.h | 152 +- TAO/tao/PortableServer/ImplRepoS_T.h | 32 +- TAO/tao/PortableServer/ImplRepoS_T.i | 64 +- TAO/tao/PortableServer/ImplRepo_i.cpp | 8 +- TAO/tao/PortableServer/ImplRepo_i.h | 6 +- TAO/tao/PortableServer/MessagingS.cpp | 32 +- TAO/tao/PortableServer/MessagingS.h | 16 +- TAO/tao/PortableServer/MessagingS_T.h | 8 +- TAO/tao/PortableServer/MessagingS_T.i | 28 +- TAO/tao/PortableServer/ORB_Manager.cpp | 86 +- TAO/tao/PortableServer/ORB_Manager.h | 24 +- TAO/tao/PortableServer/ObjectReferenceFactory.cpp | 4 +- TAO/tao/PortableServer/ObjectReferenceFactory.h | 2 +- TAO/tao/PortableServer/ObjectReferenceTemplate.cpp | 14 +- TAO/tao/PortableServer/ObjectReferenceTemplate.h | 10 +- TAO/tao/PortableServer/Object_Adapter.cpp | 146 +- TAO/tao/PortableServer/Object_Adapter.h | 54 +- TAO/tao/PortableServer/Object_Adapter.i | 18 +- TAO/tao/PortableServer/Operation_Table.cpp | 2 +- TAO/tao/PortableServer/POA.cpp | 312 +- TAO/tao/PortableServer/POA.h | 178 +- TAO/tao/PortableServer/POA.i | 84 +- TAO/tao/PortableServer/POAManager.cpp | 20 +- TAO/tao/PortableServer/POAManager.h | 20 +- TAO/tao/PortableServer/POAManager.i | 18 +- TAO/tao/PortableServer/POA_Cached_Policies.cpp | 34 +- TAO/tao/PortableServer/POA_Cached_Policies.h | 4 +- TAO/tao/PortableServer/POA_Policies.cpp | 56 +- TAO/tao/PortableServer/POA_Policies.h | 56 +- TAO/tao/PortableServer/POA_Policy_Set.cpp | 10 +- TAO/tao/PortableServer/POA_Policy_Set.h | 8 +- TAO/tao/PortableServer/POA_Policy_Set.i | 8 +- TAO/tao/PortableServer/PolicyS.cpp | 200 +- TAO/tao/PortableServer/PolicyS.h | 40 +- TAO/tao/PortableServer/PolicyS_T.h | 8 +- TAO/tao/PortableServer/PolicyS_T.i | 16 +- TAO/tao/PortableServer/PortableGroup_Hooks.h | 8 +- TAO/tao/PortableServer/PortableServerC.cpp | 222 +- TAO/tao/PortableServer/PortableServerC.h | 254 +- TAO/tao/PortableServer/PortableServerC.i | 56 +- TAO/tao/PortableServer/Servant_Base.cpp | 38 +- TAO/tao/PortableServer/Servant_Base.h | 24 +- TAO/tao/PortableServer/Servant_Base.i | 6 +- TAO/tao/PortableServer/Servant_Dispatcher.h | 4 +- .../PortableServer/ServerInterceptorAdapter.cpp | 32 +- TAO/tao/PortableServer/ServerInterceptorAdapter.h | 10 +- TAO/tao/PortableServer/ServerRequestInfo.cpp | 72 +- TAO/tao/PortableServer/ServerRequestInfo.h | 56 +- .../Strategized_Object_Proxy_Broker.cpp | 8 +- .../Strategized_Object_Proxy_Broker.h | 4 +- .../PortableServer/ThruPOA_Object_Proxy_Impl.cpp | 18 +- TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h | 6 +- TAO/tao/PortableServer/poa_macros.h | 4 +- TAO/tao/Profile.cpp | 30 +- TAO/tao/Profile.h | 36 +- TAO/tao/Protocols_Hooks.h | 20 +- TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp | 6 +- TAO/tao/RTCORBA/Priority_Mapping_Manager.h | 6 +- TAO/tao/RTCORBA/Priority_Mapping_Manager.i | 4 +- TAO/tao/RTCORBA/RTCORBAC.cpp | 214 +- TAO/tao/RTCORBA/RTCORBAC.h | 182 +- TAO/tao/RTCORBA/RT_Current.cpp | 12 +- TAO/tao/RTCORBA/RT_Current.h | 4 +- TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp | 14 +- TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h | 6 +- TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp | 8 +- TAO/tao/RTCORBA/RT_Endpoint_Utils.h | 4 +- .../RTCORBA/RT_Invocation_Endpoint_Selectors.cpp | 48 +- TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h | 12 +- TAO/tao/RTCORBA/RT_Mutex.cpp | 6 +- TAO/tao/RTCORBA/RT_Mutex.h | 6 +- TAO/tao/RTCORBA/RT_ORB.cpp | 52 +- TAO/tao/RTCORBA/RT_ORB.h | 36 +- TAO/tao/RTCORBA/RT_ORBInitializer.cpp | 22 +- TAO/tao/RTCORBA/RT_ORBInitializer.h | 6 +- TAO/tao/RTCORBA/RT_ORB_Loader.cpp | 2 +- TAO/tao/RTCORBA/RT_PolicyFactory.cpp | 2 +- TAO/tao/RTCORBA/RT_PolicyFactory.h | 2 +- TAO/tao/RTCORBA/RT_Policy_i.cpp | 142 +- TAO/tao/RTCORBA/RT_Policy_i.h | 88 +- TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp | 46 +- TAO/tao/RTCORBA/RT_Protocols_Hooks.h | 20 +- TAO/tao/RTCORBA/RT_Stub.cpp | 58 +- TAO/tao/RTCORBA/RT_Stub.h | 18 +- TAO/tao/RTCORBA/RT_Stub_Factory.cpp | 2 +- TAO/tao/RTCORBA/RT_Stub_Factory.h | 2 +- .../RTCORBA/RT_Thread_Lane_Resources_Manager.cpp | 4 +- TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h | 2 +- TAO/tao/RTCORBA/Thread_Pool.cpp | 58 +- TAO/tao/RTCORBA/Thread_Pool.h | 26 +- TAO/tao/RTPortableServer/RTPortableServerC.cpp | 10 +- TAO/tao/RTPortableServer/RTPortableServerC.h | 14 +- TAO/tao/RTPortableServer/RTPortableServerC.i | 4 +- .../RTPortableServer/RT_Collocation_Resolver.cpp | 6 +- TAO/tao/RTPortableServer/RT_Collocation_Resolver.h | 2 +- TAO/tao/RTPortableServer/RT_POA.cpp | 176 +- TAO/tao/RTPortableServer/RT_POA.h | 88 +- TAO/tao/RTPortableServer/RT_POA.i | 32 +- TAO/tao/RTPortableServer/RT_Policy_Validator.cpp | 52 +- TAO/tao/RTPortableServer/RT_Policy_Validator.h | 14 +- TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp | 32 +- TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h | 8 +- TAO/tao/Reactive_Flushing_Strategy.cpp | 8 +- TAO/tao/Remote_Object_Proxy_Broker.cpp | 2 +- TAO/tao/Remote_Object_Proxy_Broker.h | 2 +- TAO/tao/Remote_Object_Proxy_Impl.cpp | 20 +- TAO/tao/Remote_Object_Proxy_Impl.h | 6 +- TAO/tao/RequestInfo_Util.cpp | 10 +- TAO/tao/RequestInfo_Util.h | 10 +- TAO/tao/Request_Dispatcher.cpp | 4 +- TAO/tao/Request_Dispatcher.h | 2 +- TAO/tao/Sequence.cpp | 2 +- TAO/tao/Sequence.h | 2 +- TAO/tao/Sequence_T.cpp | 8 +- TAO/tao/Sequence_T.h | 4 +- TAO/tao/Service_Callbacks.cpp | 6 +- TAO/tao/Service_Callbacks.h | 6 +- TAO/tao/Services.cpp | 4 +- TAO/tao/Strategies/DIOP_Connector.cpp | 4 +- TAO/tao/Strategies/DIOP_Connector.h | 4 +- TAO/tao/Strategies/DIOP_Profile.cpp | 6 +- TAO/tao/Strategies/DIOP_Profile.h | 6 +- TAO/tao/Strategies/SHMIOP_Connector.cpp | 4 +- TAO/tao/Strategies/SHMIOP_Connector.h | 4 +- TAO/tao/Strategies/SHMIOP_Profile.cpp | 6 +- TAO/tao/Strategies/SHMIOP_Profile.h | 6 +- TAO/tao/Strategies/UIOP_Acceptor.cpp | 2 +- TAO/tao/Strategies/UIOP_Connector.cpp | 8 +- TAO/tao/Strategies/UIOP_Connector.h | 4 +- TAO/tao/Strategies/UIOP_Profile.cpp | 6 +- TAO/tao/Strategies/UIOP_Profile.h | 6 +- TAO/tao/StringSeqC.cpp | 4 +- TAO/tao/Stub.cpp | 50 +- TAO/tao/Stub.h | 16 +- TAO/tao/Stub_Factory.h | 2 +- TAO/tao/TAOC.cpp | 12 +- TAO/tao/TAOC.h | 8 +- TAO/tao/TAOC.i | 4 +- TAO/tao/Thread_Lane_Resources.cpp | 4 +- TAO/tao/Thread_Lane_Resources.h | 2 +- TAO/tao/Thread_Lane_Resources_Manager.h | 2 +- TAO/tao/TimeBaseC.cpp | 4 +- TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp | 10 +- TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h | 44 +- TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl | 4 +- .../TypeCodeFactory_Adapter_Impl.cpp | 68 +- .../TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h | 34 +- TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp | 2 +- TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h | 2 +- TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp | 96 +- TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h | 50 +- TAO/tao/TypeCodeFactory_Adapter.cpp | 34 +- TAO/tao/TypeCodeFactory_Adapter.h | 34 +- TAO/tao/Typecode.cpp | 346 +- TAO/tao/Typecode.h | 94 +- TAO/tao/Typecode.i | 22 +- TAO/tao/WrongTransactionC.cpp | 4 +- TAO/tao/WrongTransactionC.h | 4 +- TAO/tao/append.cpp | 102 +- TAO/tao/corbafwd.h | 2 +- TAO/tao/orbconf.h | 123 +- TAO/tao/skip.cpp | 94 +- TAO/tests/AMI/ami_test_i.cpp | 8 +- TAO/tests/AMI/ami_test_i.h | 8 +- TAO/tests/AMI/client.cpp | 42 +- TAO/tests/AMI/server.cpp | 22 +- TAO/tests/AMI/simple_client.cpp | 52 +- TAO/tests/AMI_Buffering/AMI_Buffering.cpp | 14 +- TAO/tests/AMI_Buffering/AMI_Buffering.h | 8 +- TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp | 12 +- TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h | 10 +- TAO/tests/AMI_Buffering/Client_Task.cpp | 4 +- TAO/tests/AMI_Buffering/Reply_Handler.cpp | 18 +- TAO/tests/AMI_Buffering/Reply_Handler.h | 12 +- TAO/tests/AMI_Buffering/admin.cpp | 20 +- TAO/tests/AMI_Buffering/client.cpp | 154 +- TAO/tests/AMI_Buffering/server.cpp | 24 +- TAO/tests/AMI_Timeouts/client.cpp | 24 +- TAO/tests/AMI_Timeouts/server.cpp | 24 +- TAO/tests/AMI_Timeouts/timeout_client.cpp | 26 +- TAO/tests/AMI_Timeouts/timeout_i.cpp | 10 +- TAO/tests/AMI_Timeouts/timeout_i.h | 8 +- TAO/tests/BiDirectional/client.cpp | 30 +- TAO/tests/BiDirectional/server.cpp | 30 +- TAO/tests/BiDirectional/test_i.cpp | 20 +- TAO/tests/BiDirectional/test_i.h | 12 +- TAO/tests/BiDirectional_NestedUpcall/client.cpp | 30 +- TAO/tests/BiDirectional_NestedUpcall/server.cpp | 26 +- TAO/tests/BiDirectional_NestedUpcall/test_i.cpp | 16 +- TAO/tests/BiDirectional_NestedUpcall/test_i.h | 10 +- TAO/tests/Big_Oneways/Coordinator.cpp | 10 +- TAO/tests/Big_Oneways/Coordinator.h | 6 +- TAO/tests/Big_Oneways/Peer.cpp | 8 +- TAO/tests/Big_Oneways/Peer.h | 4 +- TAO/tests/Big_Oneways/Session.cpp | 38 +- TAO/tests/Big_Oneways/Session.h | 12 +- TAO/tests/Big_Oneways/Session_Control.cpp | 8 +- TAO/tests/Big_Oneways/Session_Control.h | 2 +- TAO/tests/Big_Oneways/client.cpp | 24 +- TAO/tests/Big_Oneways/server.cpp | 32 +- TAO/tests/Big_Reply/Big_Reply_i.cpp | 6 +- TAO/tests/Big_Reply/Big_Reply_i.h | 6 +- TAO/tests/Big_Reply/Client_Task.cpp | 4 +- TAO/tests/Big_Reply/client.cpp | 8 +- TAO/tests/Big_Reply/server.cpp | 16 +- TAO/tests/Big_Request_Muxing/Client_Task.cpp | 18 +- TAO/tests/Big_Request_Muxing/Client_Task.h | 2 +- TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp | 4 +- TAO/tests/Big_Request_Muxing/Payload_Receiver.h | 4 +- TAO/tests/Big_Request_Muxing/client.cpp | 12 +- TAO/tests/Big_Request_Muxing/server.cpp | 20 +- TAO/tests/Big_Twoways/Coordinator.cpp | 10 +- TAO/tests/Big_Twoways/Coordinator.h | 6 +- TAO/tests/Big_Twoways/Peer.cpp | 8 +- TAO/tests/Big_Twoways/Peer.h | 4 +- TAO/tests/Big_Twoways/Session.cpp | 30 +- TAO/tests/Big_Twoways/Session.h | 8 +- TAO/tests/Big_Twoways/Session_Control.cpp | 8 +- TAO/tests/Big_Twoways/Session_Control.h | 2 +- TAO/tests/Big_Twoways/client.cpp | 24 +- TAO/tests/Big_Twoways/server.cpp | 32 +- .../Blocking_Sync_None/Blocking_Sync_None.cpp | 6 +- TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h | 4 +- TAO/tests/Blocking_Sync_None/client.cpp | 22 +- TAO/tests/Blocking_Sync_None/server.cpp | 20 +- TAO/tests/CDR/basic_types.cpp | 2 +- TAO/tests/CDR/tc.cpp | 8 +- TAO/tests/Cache_Growth_Test/Hello.cpp | 6 +- TAO/tests/Cache_Growth_Test/Hello.h | 4 +- TAO/tests/Cache_Growth_Test/client.cpp | 12 +- TAO/tests/Cache_Growth_Test/server.cpp | 20 +- TAO/tests/Client_Leaks/Client_Task.cpp | 16 +- TAO/tests/Client_Leaks/Client_Task.h | 4 +- TAO/tests/Client_Leaks/Process.cpp | 6 +- TAO/tests/Client_Leaks/Process.h | 4 +- TAO/tests/Client_Leaks/Process_Factory.cpp | 20 +- TAO/tests/Client_Leaks/Process_Factory.h | 6 +- TAO/tests/Client_Leaks/Server_Task.cpp | 2 +- TAO/tests/Client_Leaks/Startup_Callback.cpp | 2 +- TAO/tests/Client_Leaks/Startup_Callback.h | 2 +- TAO/tests/Client_Leaks/child.cpp | 26 +- TAO/tests/Client_Leaks/client.cpp | 10 +- TAO/tests/Client_Leaks/server.cpp | 18 +- TAO/tests/Codec/client.cpp | 18 +- TAO/tests/Collocation/Collocation.cpp | 6 +- TAO/tests/Collocation/Collocation_Tester.cpp | 54 +- TAO/tests/Collocation/Collocation_Tester.h | 8 +- TAO/tests/Collocation/Diamond_i.cpp | 20 +- TAO/tests/Collocation/Diamond_i.h | 20 +- TAO/tests/Connection_Purging/client.cpp | 16 +- TAO/tests/Connection_Purging/server.cpp | 20 +- TAO/tests/Connection_Purging/test_i.cpp | 2 +- TAO/tests/Connection_Purging/test_i.h | 2 +- TAO/tests/Crash_On_Write/Oneway_Receiver.cpp | 2 +- TAO/tests/Crash_On_Write/Oneway_Receiver.h | 2 +- TAO/tests/Crash_On_Write/client.cpp | 14 +- TAO/tests/Crash_On_Write/server.cpp | 20 +- TAO/tests/Crashed_Callback/Crashed_Callback.cpp | 6 +- TAO/tests/Crashed_Callback/Crashed_Callback.h | 6 +- TAO/tests/Crashed_Callback/Service.cpp | 18 +- TAO/tests/Crashed_Callback/Service.h | 6 +- TAO/tests/Crashed_Callback/client.cpp | 34 +- TAO/tests/Crashed_Callback/server.cpp | 30 +- TAO/tests/DLL_ORB/Test_Client_Module.cpp | 18 +- TAO/tests/DLL_ORB/Test_Server_Module.cpp | 24 +- TAO/tests/DLL_ORB/Test_i.cpp | 6 +- TAO/tests/DLL_ORB/Test_i.h | 4 +- TAO/tests/DSI_Gateway/client.cpp | 14 +- TAO/tests/DSI_Gateway/gateway.cpp | 20 +- TAO/tests/DSI_Gateway/server.cpp | 16 +- TAO/tests/DSI_Gateway/test_dsi.cpp | 16 +- TAO/tests/DSI_Gateway/test_dsi.h | 6 +- TAO/tests/DSI_Gateway/test_i.cpp | 10 +- TAO/tests/DSI_Gateway/test_i.h | 8 +- TAO/tests/DynAny_Test/data.cpp | 12 +- TAO/tests/DynAny_Test/driver.cpp | 2 +- TAO/tests/DynAny_Test/test_dynany.cpp | 40 +- TAO/tests/DynAny_Test/test_dynarray.cpp | 34 +- TAO/tests/DynAny_Test/test_dynenum.cpp | 28 +- TAO/tests/DynAny_Test/test_dynsequence.cpp | 50 +- TAO/tests/DynAny_Test/test_dynstruct.cpp | 74 +- TAO/tests/DynAny_Test/test_dynunion.cpp | 56 +- TAO/tests/Explicit_Event_Loop/client.cpp | 10 +- TAO/tests/Explicit_Event_Loop/server.cpp | 22 +- TAO/tests/Explicit_Event_Loop/server.h | 2 +- TAO/tests/Exposed_Policies/Counter_i.cpp | 10 +- TAO/tests/Exposed_Policies/Counter_i.h | 12 +- TAO/tests/Exposed_Policies/Policy_Tester.cpp | 52 +- TAO/tests/Exposed_Policies/Policy_Tester.h | 8 +- TAO/tests/Exposed_Policies/Policy_Verifier.cpp | 40 +- TAO/tests/Exposed_Policies/Policy_Verifier.h | 6 +- TAO/tests/Exposed_Policies/RT_Properties.cpp | 2 +- TAO/tests/Exposed_Policies/RT_Properties.h | 2 +- TAO/tests/Exposed_Policies/client.cpp | 6 +- TAO/tests/Exposed_Policies/server.cpp | 6 +- TAO/tests/FL_Cube/client.cpp | 16 +- TAO/tests/FL_Cube/server.cpp | 14 +- TAO/tests/FL_Cube/test_i.cpp | 6 +- TAO/tests/FL_Cube/test_i.h | 6 +- TAO/tests/Faults/client.cpp | 30 +- TAO/tests/Faults/middle.cpp | 22 +- TAO/tests/Faults/ping.cpp | 32 +- TAO/tests/Faults/ping_i.cpp | 12 +- TAO/tests/Faults/ping_i.h | 8 +- TAO/tests/Faults/pong.cpp | 42 +- TAO/tests/Faults/server.cpp | 18 +- TAO/tests/Faults/test_i.cpp | 34 +- TAO/tests/Faults/test_i.h | 14 +- TAO/tests/File_IO/File_i.cpp | 46 +- TAO/tests/File_IO/File_i.h | 16 +- TAO/tests/File_IO/client.cpp | 18 +- TAO/tests/File_IO/server.cpp | 36 +- TAO/tests/Forwarding/client.cpp | 30 +- TAO/tests/Forwarding/server.cpp | 22 +- TAO/tests/Forwarding/test_i.cpp | 6 +- TAO/tests/Forwarding/test_i.h | 4 +- TAO/tests/Hello/Hello.cpp | 6 +- TAO/tests/Hello/Hello.h | 4 +- TAO/tests/Hello/client.cpp | 12 +- TAO/tests/Hello/server.cpp | 20 +- TAO/tests/IDL_Test/main.cpp | 18 +- TAO/tests/IORManipulation/IORTest.cpp | 58 +- TAO/tests/InterOp-Naming/INS_i.cpp | 2 +- TAO/tests/InterOp-Naming/INS_i.h | 4 +- TAO/tests/InterOp-Naming/INS_test_client.cpp | 12 +- TAO/tests/InterOp-Naming/INS_test_server.cpp | 4 +- TAO/tests/InterOp-Naming/Server_i.cpp | 16 +- TAO/tests/InterOp-Naming/Server_i.h | 4 +- TAO/tests/Leader_Followers/client.cpp | 18 +- TAO/tests/Leader_Followers/server.cpp | 20 +- TAO/tests/Leader_Followers/test_i.cpp | 6 +- TAO/tests/Leader_Followers/test_i.h | 4 +- TAO/tests/LongUpcalls/AMI_Manager.cpp | 28 +- TAO/tests/LongUpcalls/AMI_Manager.h | 12 +- TAO/tests/LongUpcalls/Controller.cpp | 4 +- TAO/tests/LongUpcalls/Controller.h | 4 +- TAO/tests/LongUpcalls/Manager.cpp | 12 +- TAO/tests/LongUpcalls/Manager.h | 4 +- TAO/tests/LongUpcalls/Manager_Handler.cpp | 8 +- TAO/tests/LongUpcalls/Manager_Handler.h | 4 +- TAO/tests/LongUpcalls/ami_client.cpp | 28 +- TAO/tests/LongUpcalls/ami_server.cpp | 20 +- TAO/tests/LongUpcalls/blocking_client.cpp | 24 +- TAO/tests/LongUpcalls/blocking_server.cpp | 20 +- TAO/tests/MProfile/client.cpp | 24 +- TAO/tests/MProfile/server.cpp | 18 +- TAO/tests/MProfile/test_i.cpp | 4 +- TAO/tests/MProfile/test_i.h | 4 +- TAO/tests/MProfile_Forwarding/Manager.cpp | 60 +- TAO/tests/MProfile_Forwarding/Manager.h | 10 +- TAO/tests/MProfile_Forwarding/Servant_Locator.cpp | 6 +- TAO/tests/MProfile_Forwarding/Servant_Locator.h | 4 +- TAO/tests/MProfile_Forwarding/client.cpp | 16 +- TAO/tests/MProfile_Forwarding/server.cpp | 18 +- TAO/tests/MProfile_Forwarding/test_i.cpp | 4 +- TAO/tests/MProfile_Forwarding/test_i.h | 4 +- TAO/tests/MT_Client/client.cpp | 20 +- TAO/tests/MT_Client/orb_creation.cpp | 16 +- TAO/tests/MT_Client/server.cpp | 20 +- TAO/tests/MT_Client/test_i.cpp | 6 +- TAO/tests/MT_Client/test_i.h | 4 +- TAO/tests/MT_Server/client.cpp | 10 +- TAO/tests/MT_Server/server.cpp | 18 +- TAO/tests/MT_Server/test_i.cpp | 6 +- TAO/tests/MT_Server/test_i.h | 4 +- TAO/tests/MT_Timeout/Client_Task.cpp | 22 +- TAO/tests/MT_Timeout/Client_Task.h | 6 +- TAO/tests/MT_Timeout/Server_Task.cpp | 4 +- TAO/tests/MT_Timeout/Sleep_Service.cpp | 6 +- TAO/tests/MT_Timeout/Sleep_Service.h | 4 +- TAO/tests/MT_Timeout/client.cpp | 12 +- TAO/tests/MT_Timeout/server.cpp | 18 +- TAO/tests/Multiple/Collocation_Tester.cpp | 42 +- TAO/tests/Multiple/Collocation_Tester.h | 12 +- TAO/tests/Multiple/Multiple_Impl.cpp | 34 +- TAO/tests/Multiple/Multiple_Impl.h | 20 +- TAO/tests/Multiple/client.cpp | 8 +- TAO/tests/Multiple/server.cpp | 14 +- .../Multiple_Inheritance/Multiple_Inheritance_i.h | 8 +- TAO/tests/Multiple_Inheritance/client.cpp | 32 +- TAO/tests/Multiple_Inheritance/server.cpp | 8 +- TAO/tests/Muxing/Client_Task.cpp | 4 +- TAO/tests/Muxing/Receiver.cpp | 4 +- TAO/tests/Muxing/Receiver.h | 4 +- TAO/tests/Muxing/Server_Task.cpp | 4 +- TAO/tests/Muxing/client.cpp | 10 +- TAO/tests/Muxing/server.cpp | 18 +- .../NestedUpcall/MT_Client_Test/MT_Object_i.cpp | 6 +- .../NestedUpcall/MT_Client_Test/MT_Object_i.h | 2 +- TAO/tests/NestedUpcall/MT_Client_Test/client.cpp | 24 +- .../NestedUpcall/MT_Client_Test/local_server.cpp | 24 +- TAO/tests/NestedUpcall/MT_Client_Test/server.cpp | 16 +- TAO/tests/NestedUpcall/MT_Client_Test/server.h | 4 +- TAO/tests/NestedUpcall/Simple/client.cpp | 22 +- TAO/tests/NestedUpcall/Simple/client_i.cpp | 4 +- TAO/tests/NestedUpcall/Simple/client_i.h | 2 +- TAO/tests/NestedUpcall/Simple/server.cpp | 20 +- TAO/tests/NestedUpcall/Simple/server_i.cpp | 12 +- TAO/tests/NestedUpcall/Simple/server_i.h | 6 +- TAO/tests/NestedUpcall/Simple/simple-client.cpp | 22 +- .../NestedUpcall/Triangle_Test/Initiator_i.cpp | 4 +- TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h | 2 +- .../NestedUpcall/Triangle_Test/Object_A_i.cpp | 6 +- TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h | 4 +- .../NestedUpcall/Triangle_Test/Object_B_i.cpp | 4 +- TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h | 2 +- TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp | 32 +- TAO/tests/NestedUpcall/Triangle_Test/initiator.h | 4 +- TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp | 16 +- TAO/tests/NestedUpcall/Triangle_Test/server_A.h | 4 +- TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp | 16 +- TAO/tests/NestedUpcall/Triangle_Test/server_B.h | 4 +- TAO/tests/Nested_Event_Loop/client.cpp | 22 +- TAO/tests/Nested_Event_Loop/server.cpp | 18 +- TAO/tests/Nested_Event_Loop/test_i.cpp | 40 +- TAO/tests/Nested_Event_Loop/test_i.h | 14 +- TAO/tests/OBV/Any/AnyS_impl.cpp | 6 +- TAO/tests/OBV/Any/AnyS_impl.h | 4 +- TAO/tests/OBV/Any/client.cpp | 44 +- TAO/tests/OBV/Any/server.cpp | 20 +- TAO/tests/OBV/Factory/FactoryS_impl.cpp | 10 +- TAO/tests/OBV/Factory/FactoryS_impl.h | 8 +- TAO/tests/OBV/Factory/client.cpp | 50 +- TAO/tests/OBV/Factory/server.cpp | 20 +- TAO/tests/OBV/Forward/Test_impl.cpp | 6 +- TAO/tests/OBV/Forward/Test_impl.h | 4 +- TAO/tests/OBV/Forward/client.cpp | 66 +- TAO/tests/OBV/Forward/server.cpp | 42 +- TAO/tests/ORB_destroy/ORB_destroy.cpp | 32 +- TAO/tests/ORB_init/ORB_init.cpp | 20 +- TAO/tests/ORB_init/Portspan/server.cpp | 14 +- TAO/tests/ORB_init/Portspan/simpleI.cpp | 2 +- TAO/tests/ORB_init/Portspan/simpleI.h | 2 +- TAO/tests/ORT/ORT_test_IORInterceptor.cpp | 10 +- TAO/tests/ORT/ORT_test_IORInterceptor.h | 16 +- .../ORT/ORT_test_IORInterceptor_ORBInitializer.cpp | 6 +- .../ORT/ORT_test_IORInterceptor_ORBInitializer.h | 4 +- TAO/tests/ORT/ORT_test_i.cpp | 2 +- TAO/tests/ORT/ORT_test_i.h | 2 +- TAO/tests/ORT/client.cpp | 8 +- TAO/tests/ORT/server.cpp | 38 +- TAO/tests/Object_Loader/Loader.cpp | 12 +- TAO/tests/Object_Loader/Loader.h | 2 +- TAO/tests/Object_Loader/Test_i.cpp | 12 +- TAO/tests/Object_Loader/Test_i.h | 6 +- TAO/tests/Object_Loader/driver.cpp | 20 +- TAO/tests/Objref_Sequence_Test/client.cpp | 14 +- TAO/tests/Objref_Sequence_Test/server.cpp | 36 +- TAO/tests/OctetSeq/OctetSeq.cpp | 4 +- TAO/tests/OctetSeq/client.cpp | 14 +- TAO/tests/OctetSeq/server.cpp | 20 +- TAO/tests/OctetSeq/test_i.cpp | 8 +- TAO/tests/OctetSeq/test_i.h | 8 +- TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp | 14 +- TAO/tests/Oneway_Buffering/Oneway_Buffering.h | 8 +- .../Oneway_Buffering/Oneway_Buffering_Admin.cpp | 12 +- .../Oneway_Buffering/Oneway_Buffering_Admin.h | 10 +- TAO/tests/Oneway_Buffering/admin.cpp | 20 +- TAO/tests/Oneway_Buffering/client.cpp | 134 +- TAO/tests/Oneway_Buffering/server.cpp | 24 +- TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp | 4 +- TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp | 6 +- TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h | 4 +- TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp | 8 +- TAO/tests/Oneways_Invoking_Twoways/Sender_i.h | 6 +- TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp | 4 +- TAO/tests/Oneways_Invoking_Twoways/client.cpp | 20 +- TAO/tests/Oneways_Invoking_Twoways/server.cpp | 18 +- TAO/tests/POA/Etherealization/Etherealization.cpp | 50 +- .../Excessive_Object_Deactivations.cpp | 50 +- TAO/tests/POA/Identity/Identity.cpp | 244 +- .../Non_Servant_Upcalls/Non_Servant_Upcalls.cpp | 24 +- .../Object_Reactivation/Object_Reactivation.cpp | 34 +- TAO/tests/POA/POA_Destruction/POA_Destruction.cpp | 24 +- .../Single_Threaded_POA/Single_Threaded_POA.cpp | 38 +- .../wait_for_completion/wait_for_completion.cpp | 32 +- TAO/tests/Param_Test/any.cpp | 16 +- TAO/tests/Param_Test/any.h | 6 +- TAO/tests/Param_Test/anyop.cpp | 8 +- TAO/tests/Param_Test/bd_array_seq.cpp | 14 +- TAO/tests/Param_Test/bd_array_seq.h | 6 +- TAO/tests/Param_Test/bd_long_seq.cpp | 14 +- TAO/tests/Param_Test/bd_long_seq.h | 6 +- TAO/tests/Param_Test/bd_short_seq.cpp | 14 +- TAO/tests/Param_Test/bd_short_seq.h | 6 +- TAO/tests/Param_Test/bd_str_seq.cpp | 14 +- TAO/tests/Param_Test/bd_str_seq.h | 6 +- TAO/tests/Param_Test/bd_string.cpp | 14 +- TAO/tests/Param_Test/bd_string.h | 6 +- TAO/tests/Param_Test/bd_struct_seq.cpp | 14 +- TAO/tests/Param_Test/bd_struct_seq.h | 6 +- TAO/tests/Param_Test/bd_wstr_seq.cpp | 14 +- TAO/tests/Param_Test/bd_wstr_seq.h | 6 +- TAO/tests/Param_Test/bd_wstring.cpp | 14 +- TAO/tests/Param_Test/bd_wstring.h | 6 +- TAO/tests/Param_Test/big_union.cpp | 26 +- TAO/tests/Param_Test/big_union.h | 6 +- TAO/tests/Param_Test/client.cpp | 14 +- TAO/tests/Param_Test/complex_any.cpp | 14 +- TAO/tests/Param_Test/complex_any.h | 6 +- TAO/tests/Param_Test/driver.cpp | 12 +- TAO/tests/Param_Test/except.cpp | 14 +- TAO/tests/Param_Test/except.h | 6 +- TAO/tests/Param_Test/fixed_array.cpp | 14 +- TAO/tests/Param_Test/fixed_array.h | 6 +- TAO/tests/Param_Test/fixed_struct.cpp | 14 +- TAO/tests/Param_Test/fixed_struct.h | 6 +- TAO/tests/Param_Test/multdim_array.cpp | 14 +- TAO/tests/Param_Test/multdim_array.h | 6 +- TAO/tests/Param_Test/nested_struct.cpp | 14 +- TAO/tests/Param_Test/nested_struct.h | 6 +- TAO/tests/Param_Test/objref.cpp | 42 +- TAO/tests/Param_Test/objref.h | 6 +- TAO/tests/Param_Test/objref_struct.cpp | 38 +- TAO/tests/Param_Test/objref_struct.h | 6 +- TAO/tests/Param_Test/param_test_i.cpp | 96 +- TAO/tests/Param_Test/param_test_i.h | 86 +- TAO/tests/Param_Test/recursive_struct.cpp | 14 +- TAO/tests/Param_Test/recursive_struct.h | 6 +- TAO/tests/Param_Test/recursive_union.cpp | 14 +- TAO/tests/Param_Test/recursive_union.h | 6 +- TAO/tests/Param_Test/results.cpp | 2 +- TAO/tests/Param_Test/results.h | 2 +- TAO/tests/Param_Test/server.cpp | 30 +- TAO/tests/Param_Test/short.cpp | 14 +- TAO/tests/Param_Test/short.h | 6 +- TAO/tests/Param_Test/small_union.cpp | 16 +- TAO/tests/Param_Test/small_union.h | 6 +- TAO/tests/Param_Test/typecode.cpp | 24 +- TAO/tests/Param_Test/typecode.h | 6 +- TAO/tests/Param_Test/ub_any_seq.cpp | 16 +- TAO/tests/Param_Test/ub_any_seq.h | 6 +- TAO/tests/Param_Test/ub_array_seq.cpp | 14 +- TAO/tests/Param_Test/ub_array_seq.h | 6 +- TAO/tests/Param_Test/ub_long_seq.cpp | 14 +- TAO/tests/Param_Test/ub_long_seq.h | 6 +- TAO/tests/Param_Test/ub_objref_seq.cpp | 32 +- TAO/tests/Param_Test/ub_objref_seq.h | 8 +- TAO/tests/Param_Test/ub_short_seq.cpp | 14 +- TAO/tests/Param_Test/ub_short_seq.h | 6 +- TAO/tests/Param_Test/ub_str_seq.cpp | 14 +- TAO/tests/Param_Test/ub_str_seq.h | 6 +- TAO/tests/Param_Test/ub_string.cpp | 14 +- TAO/tests/Param_Test/ub_string.h | 6 +- TAO/tests/Param_Test/ub_struct_seq.cpp | 28 +- TAO/tests/Param_Test/ub_struct_seq.h | 12 +- TAO/tests/Param_Test/ub_wstr_seq.cpp | 14 +- TAO/tests/Param_Test/ub_wstr_seq.h | 6 +- TAO/tests/Param_Test/ub_wstring.cpp | 14 +- TAO/tests/Param_Test/ub_wstring.h | 6 +- TAO/tests/Param_Test/ulonglong.cpp | 14 +- TAO/tests/Param_Test/ulonglong.h | 6 +- TAO/tests/Param_Test/var_array.cpp | 14 +- TAO/tests/Param_Test/var_array.h | 6 +- TAO/tests/Param_Test/var_struct.cpp | 14 +- TAO/tests/Param_Test/var_struct.h | 6 +- TAO/tests/Policies/Manipulation.cpp | 38 +- .../Benchmark/Client_ORBInitializer.cpp | 6 +- .../Benchmark/Client_ORBInitializer.h | 4 +- .../Benchmark/Server_ORBInitializer.cpp | 6 +- .../Benchmark/Server_ORBInitializer.h | 4 +- .../Portable_Interceptors/Benchmark/client.cpp | 20 +- .../Benchmark/interceptors.cpp | 184 +- .../Portable_Interceptors/Benchmark/interceptors.h | 112 +- .../Portable_Interceptors/Benchmark/server.cpp | 24 +- .../Portable_Interceptors/Benchmark/test_i.cpp | 10 +- TAO/tests/Portable_Interceptors/Benchmark/test_i.h | 8 +- .../Dynamic/Echo_Client_ORBInitializer.cpp | 6 +- .../Dynamic/Echo_Client_ORBInitializer.h | 4 +- .../Dynamic/Echo_Server_ORBInitializer.cpp | 6 +- .../Dynamic/Echo_Server_ORBInitializer.h | 4 +- TAO/tests/Portable_Interceptors/Dynamic/client.cpp | 22 +- .../Portable_Interceptors/Dynamic/interceptors.cpp | 66 +- .../Portable_Interceptors/Dynamic/interceptors.h | 28 +- TAO/tests/Portable_Interceptors/Dynamic/server.cpp | 24 +- TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp | 10 +- TAO/tests/Portable_Interceptors/Dynamic/test_i.h | 10 +- .../ForwardRequest/Client_ORBInitializer.cpp | 10 +- .../ForwardRequest/Client_ORBInitializer.h | 4 +- .../ForwardRequest/Client_Request_Interceptor.cpp | 28 +- .../ForwardRequest/Client_Request_Interceptor.h | 14 +- .../ForwardRequest/Server_ORBInitializer.cpp | 6 +- .../ForwardRequest/Server_ORBInitializer.h | 4 +- .../ForwardRequest/Server_Request_Interceptor.cpp | 24 +- .../ForwardRequest/Server_Request_Interceptor.h | 16 +- .../ForwardRequest/client.cpp | 14 +- .../ForwardRequest/server.cpp | 40 +- .../ForwardRequest/test_i.cpp | 6 +- .../Portable_Interceptors/ForwardRequest/test_i.h | 4 +- .../FOO_ClientRequestInterceptor.cpp | 16 +- .../IORInterceptor/FOO_ClientRequestInterceptor.h | 14 +- .../IORInterceptor/FOO_Client_ORBInitializer.cpp | 6 +- .../IORInterceptor/FOO_Client_ORBInitializer.h | 4 +- .../IORInterceptor/FOO_IORInterceptor.cpp | 16 +- .../IORInterceptor/FOO_IORInterceptor.h | 12 +- .../FOO_IORInterceptor_ORBInitializer.cpp | 6 +- .../FOO_IORInterceptor_ORBInitializer.h | 4 +- .../IORInterceptor/client.cpp | 12 +- .../IORInterceptor/server.cpp | 22 +- .../IORInterceptor/test_i.cpp | 4 +- .../Portable_Interceptors/IORInterceptor/test_i.h | 2 +- .../PICurrent/ServerORBInitializer.cpp | 8 +- .../PICurrent/ServerORBInitializer.h | 4 +- .../PICurrent/ServerRequestInterceptor.cpp | 22 +- .../PICurrent/ServerRequestInterceptor.h | 14 +- .../Portable_Interceptors/PICurrent/client.cpp | 14 +- .../Portable_Interceptors/PICurrent/server.cpp | 26 +- .../Portable_Interceptors/PICurrent/test_i.cpp | 10 +- TAO/tests/Portable_Interceptors/PICurrent/test_i.h | 4 +- .../Client_ORBInitializer.cpp | 10 +- .../Client_ORBInitializer.h | 4 +- .../Client_Request_Interceptor.cpp | 34 +- .../Client_Request_Interceptor.h | 12 +- .../Request_Interceptor.cpp | 4 +- .../Request_Interceptor_Flow/Request_Interceptor.h | 4 +- .../Server_ORBInitializer.cpp | 10 +- .../Server_ORBInitializer.h | 4 +- .../Server_Request_Interceptor.cpp | 32 +- .../Server_Request_Interceptor.h | 12 +- .../Request_Interceptor_Flow/client.cpp | 24 +- .../Request_Interceptor_Flow/server.cpp | 24 +- .../Request_Interceptor_Flow/test_i.cpp | 8 +- .../Request_Interceptor_Flow/test_i.h | 6 +- .../Client_ORBInitializer.cpp | 8 +- .../Client_ORBInitializer.h | 4 +- .../Server_ORBInitializer.cpp | 6 +- .../Server_ORBInitializer.h | 4 +- .../Service_Context_Manipulation/client.cpp | 22 +- .../Service_Context_Manipulation/interceptors.cpp | 82 +- .../Service_Context_Manipulation/interceptors.h | 28 +- .../Service_Context_Manipulation/server.cpp | 24 +- .../Service_Context_Manipulation/test_i.cpp | 12 +- .../Service_Context_Manipulation/test_i.h | 10 +- TAO/tests/QtTests/client.cpp | 16 +- TAO/tests/QtTests/client.h | 4 +- TAO/tests/QtTests/server.cpp | 16 +- TAO/tests/QtTests/test_i.cpp | 4 +- TAO/tests/QtTests/test_i.h | 4 +- TAO/tests/RTCORBA/Banded_Connections/client.cpp | 60 +- TAO/tests/RTCORBA/Banded_Connections/server.cpp | 88 +- .../Client_Propagated/Client_ORBInitializer.cpp | 8 +- .../Client_Propagated/Client_ORBInitializer.h | 4 +- TAO/tests/RTCORBA/Client_Propagated/client.cpp | 30 +- .../RTCORBA/Client_Propagated/interceptors.cpp | 26 +- TAO/tests/RTCORBA/Client_Propagated/interceptors.h | 14 +- TAO/tests/RTCORBA/Client_Propagated/server.cpp | 50 +- TAO/tests/RTCORBA/Client_Protocol/client.cpp | 50 +- TAO/tests/RTCORBA/Client_Protocol/server.cpp | 42 +- TAO/tests/RTCORBA/Collocation/Collocation.cpp | 142 +- .../Destroy_Thread_Pool/Destroy_Thread_Pool.cpp | 30 +- TAO/tests/RTCORBA/Explicit_Binding/client.cpp | 34 +- TAO/tests/RTCORBA/Explicit_Binding/server.cpp | 32 +- TAO/tests/RTCORBA/Linear_Priority/client.cpp | 30 +- TAO/tests/RTCORBA/Linear_Priority/readers.cpp | 18 +- TAO/tests/RTCORBA/Linear_Priority/server.cpp | 50 +- .../RTCORBA/MT_Client_Protocol_Priority/client.cpp | 38 +- .../RTCORBA/MT_Client_Protocol_Priority/server.cpp | 36 +- TAO/tests/RTCORBA/ORB_init/ORB_init.cpp | 8 +- TAO/tests/RTCORBA/Persistent_IOR/client.cpp | 10 +- TAO/tests/RTCORBA/Persistent_IOR/server.cpp | 84 +- TAO/tests/RTCORBA/Policy_Combinations/client.cpp | 22 +- TAO/tests/RTCORBA/Policy_Combinations/server.cpp | 252 +- TAO/tests/RTCORBA/Private_Connection/client.cpp | 40 +- TAO/tests/RTCORBA/Private_Connection/server.cpp | 34 +- TAO/tests/RTCORBA/RTMutex/server.cpp | 58 +- TAO/tests/RTCORBA/Server_Declared/client.cpp | 30 +- TAO/tests/RTCORBA/Server_Declared/server.cpp | 54 +- TAO/tests/RTCORBA/Server_Protocol/client.cpp | 8 +- TAO/tests/RTCORBA/Server_Protocol/server.cpp | 44 +- TAO/tests/RTCORBA/Thread_Pool/client.cpp | 10 +- TAO/tests/RTCORBA/Thread_Pool/server.cpp | 58 +- TAO/tests/RTCORBA/Thread_Pool/test_i.cpp | 8 +- TAO/tests/RTCORBA/Thread_Pool/test_i.h | 6 +- TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp | 14 +- TAO/tests/Reliable_Oneways/Oneway_Receiver.h | 6 +- TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp | 4 +- TAO/tests/Reliable_Oneways/Shutdown_Helper.h | 2 +- TAO/tests/Reliable_Oneways/client.cpp | 82 +- TAO/tests/Reliable_Oneways/server.cpp | 20 +- TAO/tests/Server_Leaks/Ping_Service.cpp | 6 +- TAO/tests/Server_Leaks/Ping_Service.h | 4 +- TAO/tests/Server_Leaks/client.cpp | 12 +- TAO/tests/Server_Leaks/server.cpp | 20 +- TAO/tests/Single_Read/client.cpp | 18 +- TAO/tests/Single_Read/server.cpp | 18 +- TAO/tests/Single_Read/test_i.cpp | 6 +- TAO/tests/Single_Read/test_i.h | 4 +- .../Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp | 6 +- .../Smart_Proxies/Benchmark/Smart_Proxy_Impl.h | 4 +- TAO/tests/Smart_Proxies/Benchmark/client.cpp | 16 +- TAO/tests/Smart_Proxies/Benchmark/server.cpp | 34 +- .../Smart_Proxies/Collocation/Coll_Tester.cpp | 48 +- TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h | 6 +- TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp | 20 +- TAO/tests/Smart_Proxies/Collocation/Diamond_i.h | 20 +- .../Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp | 6 +- .../Smart_Proxies/Collocation/Smart_Proxy_Impl.h | 4 +- TAO/tests/Smart_Proxies/Collocation/main.cpp | 4 +- .../Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp | 4 +- .../Smart_Proxies/On_Demand/Smart_Proxy_Impl.h | 2 +- .../Smart_Proxies/On_Demand/Smart_Test_Factory.cpp | 2 +- .../Smart_Proxies/On_Demand/Smart_Test_Factory.h | 2 +- TAO/tests/Smart_Proxies/On_Demand/client.cpp | 8 +- TAO/tests/Smart_Proxies/On_Demand/server.cpp | 28 +- .../Smart_Proxies/Policy/Smart_Proxy_Impl.cpp | 6 +- TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h | 4 +- TAO/tests/Smart_Proxies/Policy/client.cpp | 10 +- TAO/tests/Smart_Proxies/Policy/server.cpp | 30 +- TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp | 6 +- TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h | 4 +- TAO/tests/Smart_Proxies/client.cpp | 8 +- TAO/tests/Smart_Proxies/server.cpp | 28 +- TAO/tests/Strategies/client.cpp | 12 +- TAO/tests/Strategies/server.cpp | 20 +- TAO/tests/Strategies/simple_test_i.cpp | 4 +- TAO/tests/Strategies/simple_test_i.h | 4 +- TAO/tests/Timed_Buffered_Oneways/client.cpp | 48 +- TAO/tests/Timed_Buffered_Oneways/server.cpp | 18 +- TAO/tests/Timed_Buffered_Oneways/test_i.cpp | 6 +- TAO/tests/Timed_Buffered_Oneways/test_i.h | 4 +- TAO/tests/Timeout/client.cpp | 62 +- TAO/tests/Timeout/server.cpp | 16 +- TAO/tests/Timeout/test_i.cpp | 6 +- TAO/tests/Timeout/test_i.h | 4 +- TAO/tests/Two_Objects/First_i.cpp | 2 +- TAO/tests/Two_Objects/First_i.h | 2 +- TAO/tests/Two_Objects/Object_Factory_i.cpp | 8 +- TAO/tests/Two_Objects/Object_Factory_i.h | 4 +- TAO/tests/Two_Objects/Second_i.cpp | 6 +- TAO/tests/Two_Objects/Second_i.h | 4 +- TAO/tests/Two_Objects/client.cpp | 14 +- TAO/tests/Two_Objects/server.cpp | 18 +- TAO/tests/Two_Objects/worker.cpp | 4 +- TAO/tests/Xt_Stopwatch/Client.h | 2 +- TAO/tests/Xt_Stopwatch/client.cpp | 20 +- TAO/tests/Xt_Stopwatch/server.cpp | 16 +- TAO/tests/Xt_Stopwatch/test_i.cpp | 6 +- TAO/tests/Xt_Stopwatch/test_i.h | 6 +- TAO/tests/ior_corbaloc/client.cpp | 6 +- TAO/tests/ior_corbaloc/corbaname_client.cpp | 10 +- TAO/tests/ior_corbaloc/ior_corbaloc_client_i.cpp | 16 +- TAO/tests/ior_corbaloc/ior_corbaloc_client_i.h | 4 +- TAO/tests/ior_corbaloc/server.cpp | 22 +- TAO/tests/ior_corbaloc/status_i.cpp | 4 +- TAO/tests/ior_corbaloc/status_i.h | 4 +- TAO/utils/catior/catior.cpp | 16 +- TAO/utils/nslist/nsadd.cpp | 14 +- TAO/utils/nslist/nsdel.cpp | 10 +- TAO/utils/nslist/nslist.cpp | 34 +- TAO/utils/wxNamingViewer/wxViewIORDialog.cpp | 2 +- 2451 files changed, 47569 insertions(+), 44493 deletions(-) create mode 100644 TAO/performance-tests/AMI_Latency/Roundtrip.cpp create mode 100644 TAO/performance-tests/AMI_Latency/Roundtrip.h create mode 100644 TAO/performance-tests/AMI_Latency/Roundtrip_Handler.cpp create mode 100644 TAO/performance-tests/AMI_Latency/Roundtrip_Handler.h create mode 100644 TAO/performance-tests/AMI_Latency/Server_Task.cpp create mode 100644 TAO/performance-tests/AMI_Latency/client.cpp create mode 100644 TAO/performance-tests/AMI_Latency/server.cpp create mode 100644 TAO/performance-tests/DII_Latency/Roundtrip.cpp create mode 100644 TAO/performance-tests/DII_Latency/Roundtrip.h create mode 100644 TAO/performance-tests/DII_Latency/client.cpp create mode 100644 TAO/performance-tests/DII_Latency/server.cpp create mode 100644 TAO/performance-tests/DSI_Latency/Roundtrip.cpp create mode 100644 TAO/performance-tests/DSI_Latency/Roundtrip.h create mode 100644 TAO/performance-tests/DSI_Latency/client.cpp create mode 100644 TAO/performance-tests/DSI_Latency/server.cpp create mode 100644 TAO/performance-tests/Deferred_Latency/Roundtrip.cpp create mode 100644 TAO/performance-tests/Deferred_Latency/Roundtrip.h create mode 100644 TAO/performance-tests/Deferred_Latency/client.cpp create mode 100644 TAO/performance-tests/Deferred_Latency/server.cpp create mode 100644 TAO/performance-tests/Single_Threaded_Latency/Roundtrip.cpp create mode 100644 TAO/performance-tests/Single_Threaded_Latency/Roundtrip.h create mode 100644 TAO/performance-tests/Single_Threaded_Latency/client.cpp create mode 100644 TAO/performance-tests/Single_Threaded_Latency/server.cpp create mode 100644 TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.cpp create mode 100644 TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.h create mode 100644 TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.cpp create mode 100644 TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.h create mode 100644 TAO/performance-tests/Thread_Per_Connection_Latency/client.cpp create mode 100644 TAO/performance-tests/Thread_Per_Connection_Latency/server.cpp create mode 100644 TAO/performance-tests/Thread_Pool_Latency/Client_Task.cpp create mode 100644 TAO/performance-tests/Thread_Pool_Latency/Client_Task.h create mode 100644 TAO/performance-tests/Thread_Pool_Latency/Roundtrip.cpp create mode 100644 TAO/performance-tests/Thread_Pool_Latency/Roundtrip.h create mode 100644 TAO/performance-tests/Thread_Pool_Latency/Worker_Thread.cpp create mode 100644 TAO/performance-tests/Thread_Pool_Latency/client.cpp create mode 100644 TAO/performance-tests/Thread_Pool_Latency/server.cpp diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index f3a98f636e4..62411df6aff 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,15 @@ +Tue Jan 29 21:09:12 2002 Oliver Kellogg + + * tao/orbconf.h (TAO_ENV_*): + Deprecated. Instead, use the equivalent ACE_ENV_ macros from + $ACE_ROOT/ace/CORBA_macros.h. + + * (many source files): + Corresponding to the above change, changed all relevant source + files to use the new ACE_ENV_ARG macros instead of the TAO_ENV_ARG + macros. All exception related macros are now defined in + $ACE_ROOT/ace/CORBA_macros.h. + Tue Jan 29 09:01:41 2002 Carlos O'Ryan * TAO_IDL/be/be_interface.cpp: diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp index ea54e854ab2..92dfbee10c7 100644 --- a/TAO/TAO_IDL/be/be_interface.cpp +++ b/TAO/TAO_IDL/be/be_interface.cpp @@ -593,7 +593,7 @@ be_interface::gen_var_defn (char *interface_name) << "static " << interface_name << "_ptr tao_narrow (" << be_idt << be_idt_nl << "CORBA::Object *" << be_nl - << "TAO_ENV_ARG_DECL_NOT_USED" << be_uidt_nl + << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl << ");" << be_uidt_nl << "static CORBA::Object * tao_upcast (void *);" << be_uidt_nl << be_nl; @@ -808,11 +808,11 @@ be_interface::gen_var_impl (char *interface_local_name, *cs << "::" << interface_full_name << "_ptr" << be_nl << fname << "::tao_narrow (" << be_idt << be_idt_nl << "CORBA::Object *p" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl << "return ::" << interface_full_name - << "::_narrow (p TAO_ENV_ARG_PARAMETER);" + << "::_narrow (p ACE_ENV_ARG_PARAMETER);" << be_uidt_nl << "}" << be_nl << be_nl; @@ -2102,7 +2102,7 @@ be_interface::gen_skel_helper (be_interface *derived, << "TAO_ServerRequest &req, " << be_nl << "void *obj," << be_nl << "void *context" << be_nl - << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt << "\n\n"; } else @@ -2115,7 +2115,7 @@ be_interface::gen_skel_helper (be_interface *derived, << "TAO_ServerRequest &req," << be_nl << "void *obj," << be_nl << "void *context" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl; *os << ancestor->full_skel_name () @@ -2129,7 +2129,7 @@ be_interface::gen_skel_helper (be_interface *derived, << "(" << ancestor->full_skel_name () << "_ptr) impl," << be_nl << "context" << be_nl - << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl + << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "}\n"; } @@ -2153,7 +2153,7 @@ be_interface::gen_skel_helper (be_interface *derived, << "TAO_ServerRequest &req," << be_nl << "void *obj," << be_nl << "void *context" << be_nl - << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt << "\n\n"; } else @@ -2166,7 +2166,7 @@ be_interface::gen_skel_helper (be_interface *derived, << "TAO_ServerRequest &req," << be_nl << "void *obj," << be_nl << "void *context" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl << ancestor->full_skel_name () @@ -2180,7 +2180,7 @@ be_interface::gen_skel_helper (be_interface *derived, << "(" << ancestor->full_skel_name () << "_ptr) impl," << be_nl << "context" << be_nl - << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl + << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "}\n"; } @@ -2200,7 +2200,7 @@ be_interface::gen_skel_helper (be_interface *derived, << "TAO_ServerRequest &req," << be_nl << "void *obj," << be_nl << "void *context" << be_nl - << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt << "\n\n"; } else @@ -2214,7 +2214,7 @@ be_interface::gen_skel_helper (be_interface *derived, << "TAO_ServerRequest &req," << be_nl << "void *obj," << be_nl << "void *context" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl << ancestor->full_skel_name () @@ -2228,7 +2228,7 @@ be_interface::gen_skel_helper (be_interface *derived, << "(" << ancestor->full_skel_name () << "_ptr) impl," << be_nl << "context" << be_nl - << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl + << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "}\n"; } diff --git a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp index 14b2c3e0490..fe97d26c601 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp @@ -87,7 +87,7 @@ be_visitor_array_any_op_cs::visit_array (be_array *node) << "{" << be_idt_nl << "CORBA::TypeCode_var type = _tao_any.type ();" << be_nl << be_nl << "CORBA::Boolean result = type->equivalent (" << node->tc_name () - << " TAO_ENV_ARG_PARAMETER);" << be_nl + << " ACE_ENV_ARG_PARAMETER);" << be_nl << "ACE_TRY_CHECK;" << be_nl << be_nl << "if (!result)" << be_idt_nl << "return 0; // not equivalent" << be_uidt_nl << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp index 95c4ec70e3a..5e882bea301 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp @@ -72,7 +72,7 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node) << "{" << be_idt_nl << "CORBA::TypeCode_var type = _tao_any.type ();" << be_nl << be_nl << "CORBA::Boolean result = type->equivalent (" << node->tc_name () - << " TAO_ENV_ARG_PARAMETER);" << be_nl + << " ACE_ENV_ARG_PARAMETER);" << be_nl << "ACE_TRY_CHECK;" << be_nl << be_nl << "if (!result)" << be_idt_nl << "return 0; // not equivalent" << be_uidt_nl << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp index 5854f129730..e29be94d778 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp @@ -99,7 +99,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node) << "{" << be_idt_nl << "CORBA::TypeCode_var type = _tao_any.type ();" << be_nl << be_nl << "CORBA::Boolean result = type->equivalent (" << node->tc_name () - << " TAO_ENV_ARG_PARAMETER);" << be_nl + << " ACE_ENV_ARG_PARAMETER);" << be_nl << "ACE_TRY_CHECK;" << be_nl << be_nl << "if (!result)" << be_idt_nl << "return 0; // not equivalent" << be_uidt_nl << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp index 34394aa35ac..0fead89ad6c 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp @@ -86,11 +86,11 @@ int be_visitor_exception_ch::visit_exception (be_exception *node) *os << "virtual void _raise (void);\n" << be_nl << "virtual void _tao_encode (" << be_idt << be_idt_nl << "TAO_OutputCDR &" << be_nl - << "TAO_ENV_ARG_DECL_NOT_USED" << be_uidt_nl + << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl << ") const;" << be_uidt_nl << be_nl << "virtual void _tao_decode (" << be_idt << be_idt_nl << "TAO_InputCDR &" << be_nl - << "TAO_ENV_ARG_DECL_NOT_USED" << be_uidt_nl + << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl << ");" << be_uidt_nl << be_nl << "static " << node->local_name () << " *_downcast (CORBA::Exception *);\n\n"; diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp index 4f0f566a82e..63cd466cec8 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp @@ -182,7 +182,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) if (!node->is_local ()) { *os << "TAO_OutputCDR &cdr" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ") const" << be_uidt_nl << "{" << be_idt_nl << "if (cdr << *this)" << be_idt_nl @@ -204,7 +204,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) else { *os << "TAO_OutputCDR &" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ") const" << be_uidt_nl << "{" << be_idt_nl; @@ -226,7 +226,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) if (!node->is_local ()) { *os << "TAO_InputCDR &cdr" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl << "if (cdr >> *this)" << be_idt_nl @@ -248,7 +248,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) else { *os << "TAO_InputCDR &" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp index fce022ee17f..a9b511b3cbf 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp @@ -114,7 +114,7 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node) << be_nl << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl << "const char* logical_type_id" << be_nl - << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");\n" << be_uidt_nl; *os << "virtual void* _downcast (" << be_idt << be_idt_nl @@ -126,7 +126,7 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node) << "TAO_ServerRequest &req," << be_nl << "void *obj," << be_nl << "void *servant_upcall" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ");\n" << be_uidt_nl; // Add a skeleton for our _non_existent method. @@ -134,7 +134,7 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node) << "TAO_ServerRequest &req," << be_nl << "void *obj," << be_nl << "void *servant_upcall" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ");\n" << be_uidt_nl; // Add a skeleton for our _interface method. @@ -142,14 +142,14 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node) << "TAO_ServerRequest &req," << be_nl << "void *obj," << be_nl << "void *servant_upcall" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ");\n" << be_uidt_nl; // Add the dispatch method. *os << "virtual void _dispatch (" << be_idt << be_idt_nl << "TAO_ServerRequest &req," << be_nl << "void *_servant_upcall" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ");\n" << be_uidt_nl; this->this_method (node); @@ -355,6 +355,6 @@ be_visitor_amh_interface_sh::this_method (be_interface *node) // the type of the class, but the original class that "implied" the // AMH one. *os << non_amh_name.c_str () << " *_this (" << be_idt << be_idt_nl - << "TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");\n" << be_uidt; } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp index 94bf1737db1..a8a079ffe3e 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp @@ -70,9 +70,9 @@ be_visitor_amh_interface_ss::this_method (be_interface *node) *os << non_amh_name.c_str() << "*" << be_nl << full_skel_name - << "::_this (TAO_ENV_SINGLE_ARG_DECL)" << be_nl + << "::_this (ACE_ENV_SINGLE_ARG_DECL)" << be_nl << "{" << be_idt_nl // idt = 1 - << "TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);" + << "TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_nl << "ACE_CHECK_RETURN (0);" << be_nl << be_nl; @@ -109,14 +109,14 @@ be_visitor_amh_interface_ss::dispatch_method (be_interface *node) << full_skel_name << "::_dispatch (" << be_idt << be_idt_nl << "TAO_ServerRequest &req," << be_nl << "void *context" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl << "this->asynchronous_upcall_dispatch (" << be_idt << be_idt_nl << "req," << be_nl << "context," << be_nl << "this" << be_nl - << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl + << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "}" << be_nl; } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp index 5b8e64e50c2..0791620c497 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp @@ -82,7 +82,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node) << "_tao_elem = " << node->full_name () << "::_nil ();" << be_nl << "CORBA::TypeCode_var type = _tao_any.type ();" << be_nl << be_nl << "CORBA::Boolean result = type->equivalent (" << node->tc_name () - << " TAO_ENV_ARG_PARAMETER);" << be_nl + << " ACE_ENV_ARG_PARAMETER);" << be_nl << "ACE_TRY_CHECK;" << be_nl << be_nl << "if (!result)" << be_idt_nl << "return 0; // not equivalent" << be_uidt_nl << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp index 441b3330a6f..67068688a0d 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp @@ -48,7 +48,7 @@ be_visitor_interface_base_proxy_broker_ch::visit_interface (be_interface *node) << be_idt << be_idt_nl; *os << node->local_name () << " *object" << be_nl - << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ") = 0;" << be_uidt_nl // idt = 1 << be_uidt_nl; // idt = 0 diff --git a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp index f8fc999e4a2..f3c743a6dfa 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp @@ -91,7 +91,7 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node) << node->full_name () << "::_unchecked_narrow (" << be_idt << be_idt_nl << "obj.in ()" << be_nl - << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl + << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl << ");" << be_uidt << be_uidt_nl; *os << "ACE_TRY_CHECK;" << be_nl; *os << "return 1;" << be_uidt_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_sh.cpp index d16bf1fd7ed..fa2aebe35da 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_sh.cpp @@ -100,7 +100,7 @@ int be_visitor_interface_direct_collocated_sh::visit_interface (be_interface *no *os << "virtual CORBA::Boolean _is_a" << be_idt << "(" << be_idt_nl << "const CORBA::Char *logical_type_id" << be_nl - << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt_nl << be_nl; *os << "virtual void *_tao_QueryInterface (ptr_arith_t type);\n" @@ -118,7 +118,7 @@ int be_visitor_interface_direct_collocated_sh::visit_interface (be_interface *no *os << "virtual CORBA::Boolean _non_existent" << be_idt << "(" << be_idt_nl - << "TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt_nl << be_nl; if (this->visit_scope (node) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_ss.cpp index 0d87db8e818..1d9bb2bb34f 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_ss.cpp @@ -105,10 +105,10 @@ int be_visitor_interface_direct_collocated_ss::visit_interface (be_interface *no << "_is_a" << be_idt << "(" << be_idt_nl << "const CORBA::Char *logical_type_id" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl << be_nl; *os << "{" << be_idt_nl - << "return this->servant_->_is_a (logical_type_id TAO_ENV_ARG_PARAMETER);" + << "return this->servant_->_is_a (logical_type_id ACE_ENV_ARG_PARAMETER);" << be_uidt_nl << "}\n\n" << be_uidt_nl; @@ -155,10 +155,10 @@ int be_visitor_interface_direct_collocated_ss::visit_interface (be_interface *no *os << "CORBA::Boolean " << node->full_coll_name (be_interface::DIRECT) << "::" << "_non_existent" << be_idt << "(" << be_idt_nl - << "TAO_ENV_SINGLE_ARG_DECL" << be_uidt_nl + << "ACE_ENV_SINGLE_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl << be_nl; *os << "{" << be_idt_nl - << "return this->servant_->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);" + << "return this->servant_->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl << "}\n\n" << be_uidt_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp index aa9d82b1551..1bc260d140d 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp @@ -176,7 +176,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node) << "static " << node->local_name () << "_ptr " << "_narrow (" << be_idt << be_idt_nl << "CORBA::Object_ptr obj" << be_nl - << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt_nl << be_nl; // There's no need for an _unchecked_narrow for locality @@ -184,7 +184,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node) *os << "static " << node->local_name () << "_ptr " << "_unchecked_narrow (" << be_idt << be_idt_nl << "CORBA::Object_ptr obj" << be_nl - << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt_nl << be_nl; // This method is defined in the header file to workaround old @@ -218,7 +218,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node) { *os << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl << "const CORBA::Char *type_id" << be_nl - << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt_nl << be_nl; } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp index bb569badd4f..57786ac89e7 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp @@ -101,11 +101,11 @@ be_visitor_interface_cs::visit_interface (be_interface *node) << "tao_" << node->flat_name () << "_narrow (" << be_idt << be_idt_nl << "CORBA::Object *p" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl << "return " << node->full_name () - << "::_narrow (p TAO_ENV_ARG_PARAMETER);" + << "::_narrow (p ACE_ENV_ARG_PARAMETER);" << be_uidt_nl << "}" << be_nl << be_nl; @@ -127,7 +127,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_interface_cs::" "visit_interface - " - "codegen for _var failed\n"), + "codegen for _var failed\n"), -1); } @@ -137,7 +137,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_interface_cs::" "visit_interface - " - "codegen for _out failed\n"), + "codegen for _out failed\n"), -1); } @@ -301,7 +301,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) *os << node->full_name () << "_ptr " << node->full_name () << "::_narrow (" << be_idt << be_idt_nl << "CORBA::Object_ptr obj" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl; @@ -316,7 +316,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) *os << "if (! obj->_is_local ())" << be_idt_nl << "{" << be_idt_nl << "CORBA::Boolean is_a = obj->_is_a (\"" - << node->repoID () << "\" TAO_ENV_ARG_PARAMETER);" << be_nl + << node->repoID () << "\" ACE_ENV_ARG_PARAMETER);" << be_nl << "ACE_CHECK_RETURN (" << bt->nested_type_name (this->ctx_->scope ()) << "::_nil ());" << be_nl << "if (is_a == 0)" << be_idt_nl @@ -326,7 +326,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) } *os << "return " << bt->nested_type_name (this->ctx_->scope ()) - << "::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);" << be_uidt_nl + << "::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);" << be_uidt_nl << "}" << be_nl << be_nl; // The _unchecked_narrow method @@ -335,7 +335,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) << node->full_name () << "::_unchecked_narrow (" << be_idt << be_idt_nl << "CORBA::Object_ptr obj" << be_nl - << "TAO_ENV_ARG_DECL_NOT_USED" << be_uidt_nl + << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl << "if (CORBA::is_nil (obj))" << be_idt_nl @@ -452,7 +452,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) os->indent (); *os << "CORBA::Boolean " << node->full_name () << "::_is_a (" - << "const CORBA::Char *value TAO_ENV_ARG_DECL)" + << "const CORBA::Char *value ACE_ENV_ARG_DECL)" << be_nl << "{\n"; @@ -475,7 +475,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) *os << " return 1; // success using local knowledge\n"; os->decr_indent (); *os << "else" << be_nl; - *os << " return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);\n"; + *os << " return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);\n"; os->decr_indent (); *os << "}\n\n"; } @@ -493,7 +493,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_interface_cs::" "visit_interface - " - "_tao_QueryInterface method codegen failed\n"), + "_tao_QueryInterface method codegen failed\n"), -1); } @@ -522,7 +522,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_interface_cs::" "visit_interface - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp index b0062f701ee..bbb32209225 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp @@ -146,7 +146,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node) << be_nl << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl << "const char* logical_type_id" << be_nl - << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");\n" << be_uidt_nl; *os << "virtual void* _downcast (" << be_idt << be_idt_nl @@ -158,7 +158,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node) << "TAO_ServerRequest &req," << be_nl << "void *obj," << be_nl << "void *servant_upcall" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ");\n" << be_uidt_nl; // Add a skeleton for our _non_existent method. @@ -166,7 +166,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node) << "TAO_ServerRequest &req," << be_nl << "void *obj," << be_nl << "void *servant_upcall" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ");\n" << be_uidt_nl; // Add a skeleton for our _interface method. @@ -174,14 +174,14 @@ be_visitor_interface_sh::visit_interface (be_interface *node) << "TAO_ServerRequest &req," << be_nl << "void *obj," << be_nl << "void *servant_upcall" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ");\n" << be_uidt_nl; // Add the dispatch method. *os << "virtual void _dispatch (" << be_idt << be_idt_nl << "TAO_ServerRequest &req," << be_nl << "void *_servant_upcall" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ");\n" << be_uidt_nl; this->this_method (node); @@ -313,7 +313,7 @@ be_visitor_interface_sh::this_method (be_interface *node) // Print out the _this() method. *os << "::" << node->full_name () << " *_this (" << be_idt << be_idt_nl - << "TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");\n" << be_uidt; } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp index b6f3684674c..8686a4bf0ac 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp @@ -137,7 +137,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node) " copy ctor generation failed\n"), -1); } - + *os << " TAO_ServantBase (rhs)" << be_uidt_nl @@ -166,7 +166,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node) << "TAO_ServerRequest &_tao_server_request, " << be_nl << "void * _tao_object_reference," << be_nl << "void * /* Servant_Upcall */" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl; *os << "{" << be_idt_nl; *os << "TAO_InputCDR &_tao_in = _tao_server_request.incoming ();" << be_nl; @@ -185,7 +185,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node) *os << "ACE_THROW (CORBA::MARSHAL ());" << be_uidt_nl << be_nl; } - *os << "_tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);" + *os << "_tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);" << be_nl; *os << "ACE_CHECK;" << be_nl << be_nl; *os << "_tao_server_request.init_reply ();" << be_nl; @@ -212,13 +212,13 @@ be_visitor_interface_ss::visit_interface (be_interface *node) << "TAO_ServerRequest &_tao_server_request, " << be_nl << "void * _tao_object_reference," << be_nl << "void * /* Servant_Upcall */" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl; *os << "{" << be_idt_nl; *os << full_skel_name << " *_tao_impl = (" << full_skel_name << " *) _tao_object_reference;" << be_nl; *os << "CORBA::Boolean _tao_retval =" << be_idt_nl - << "_tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);" + << "_tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl; *os << "ACE_CHECK;" << be_nl << be_nl; *os << "_tao_server_request.init_reply ();" << be_nl; @@ -239,7 +239,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node) << "TAO_ServerRequest &_tao_server_request, " << be_nl << "void * _tao_object_reference," << be_nl << "void * /* Servant_Upcall */" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl; *os << "{" << be_idt_nl; *os << full_skel_name << " *_tao_impl = (" @@ -258,7 +258,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node) *os << "ACE_TRY" << be_idt_nl << "{" << be_idt_nl << "_tao_retval = " << be_idt_nl - << "_tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);" + << "_tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl << "ACE_TRY_CHECK;" << be_nl << be_nl << "_tao_server_request.init_reply ();" << be_nl << be_nl @@ -286,7 +286,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node) *os << "CORBA::Boolean " << full_skel_name << "::_is_a (" << be_idt << be_idt_nl << "const char* value" << be_nl - << "TAO_ENV_ARG_DECL_NOT_USED" << be_uidt_nl + << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl << "const char *base_id = \"IDL:org.omg/CORBA/Object:1.0\";" << be_nl @@ -360,9 +360,9 @@ be_visitor_interface_ss::this_method (be_interface *node) // the _this () operation *os << node->full_name () << "*" << be_nl << node->full_skel_name () - << "::_this (TAO_ENV_SINGLE_ARG_DECL)" << be_nl + << "::_this (ACE_ENV_SINGLE_ARG_DECL)" << be_nl << "{" << be_idt_nl // idt = 1 - << "TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);" + << "TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_nl << "ACE_CHECK_RETURN (0);" << be_nl << be_nl << "TAO_Stub_Auto_Ptr safe_stub (stub);" << be_nl << be_nl; @@ -398,13 +398,13 @@ be_visitor_interface_ss::dispatch_method (be_interface *node) << "::_dispatch (" << be_idt << be_idt_nl << "TAO_ServerRequest &req," << be_nl << "void *servant_upcall" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl; *os << "{" << be_idt_nl; *os << "this->synchronous_upcall_dispatch (req," << be_nl << " servant_upcall," << be_nl << " this" << be_nl - << " TAO_ENV_ARG_PARAMETER);" + << " ACE_ENV_ARG_PARAMETER);" << be_uidt_nl; *os << "}" << be_nl << be_nl; } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp index 61e98a47572..273530debd1 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp @@ -52,7 +52,7 @@ be_visitor_interface_remote_proxy_broker_ch::visit_interface (be_interface *node << be_idt << be_idt_nl; *os << node->local_name () << " *object" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ");" << be_uidt_nl << be_uidt_nl; *os << "private:" << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp index 717fb8d85e5..93fa5e34089 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp @@ -77,7 +77,7 @@ be_visitor_interface_remote_proxy_broker_cs::visit_interface (be_interface *node <full_remote_proxy_broker_name () << "::" << "select_proxy (" << be_idt_nl << "::" << node->full_name () << " *" << be_nl - << "TAO_ENV_ARG_DECL_NOT_USED" << be_uidt_nl << ")" + << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl // idt = 1 << "return this->remote_proxy_impl_;" << be_uidt_nl << "}" << be_nl << be_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp index f94b49ace25..fd4fd4987e8 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp @@ -80,7 +80,7 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node) << "_ptr create_proxy (" << be_idt << be_idt_nl << node->local_name () << "_ptr proxy" << be_nl - << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "};\n\n"; @@ -94,15 +94,15 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node) << "int register_proxy_factory (" << be_idt << be_idt_nl << "TAO_" << node->flat_name () << "_Default_Proxy_Factory *df,"<< be_nl << "int one_shot_factory = 1" << be_nl - << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt_nl << be_nl << "int unregister_proxy_factory (" << be_idt << be_idt_nl - << "TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt_nl << be_nl << node->local_name () << "_ptr create_proxy (" << be_idt << be_idt_nl << node->local_name () << "_ptr proxy" << be_nl - << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt << be_uidt_nl << be_nl << "protected:" << be_idt_nl << "TAO_" << node->flat_name () diff --git a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp index 6fefb52088a..aed69607090 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp @@ -101,7 +101,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) << "_Default_Proxy_Factory::create_proxy (" << be_idt << be_idt_nl << "::" << node->full_name () << "_ptr proxy" << be_nl - << "TAO_ENV_ARG_DECL_NOT_USED" << be_uidt_nl + << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl << ")" << be_uidt << be_uidt_nl << "{" << be_idt_nl << "return proxy;" << be_uidt << be_uidt_nl @@ -151,14 +151,14 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) << "TAO_" << node->flat_name () << "_Default_Proxy_Factory *df," << be_idt_nl << " int one_shot_factory" << be_nl - << " TAO_ENV_ARG_DECL" << be_idt_nl + << " ACE_ENV_ARG_DECL" << be_idt_nl << ")" << be_uidt << be_uidt << be_uidt_nl << "{" << be_idt_nl << "ACE_MT (ACE_GUARD_RETURN (" << "TAO_SYNCH_RECURSIVE_MUTEX, ace_mon," << be_idt_nl << "this->lock_, 0));" < and replace with the new one."<unregister_proxy_factory (TAO_ENV_SINGLE_ARG_PARAMETER);" << be_nl + << "this->unregister_proxy_factory (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_nl << "ACE_CHECK_RETURN (-1);" << be_nl << "this->proxy_factory_ = df;"<< be_nl << "this->one_shot_factory_ = one_shot_factory;" << be_uidt << be_uidt_nl @@ -175,7 +175,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) *os << "TAO_"<< node->flat_name () << "_Proxy_Factory_Adapter::unregister_proxy_factory (" << be_idt_nl - << "TAO_ENV_SINGLE_ARG_DECL_NOT_USED" << be_idt_nl + << "ACE_ENV_SINGLE_ARG_DECL_NOT_USED" << be_idt_nl << ")" << be_uidt << be_uidt_nl << "{" << be_idt_nl << "ACE_MT (ACE_GUARD_RETURN (" @@ -205,7 +205,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) << "_Proxy_Factory_Adapter::create_proxy (" << be_idt << be_idt_nl << "::" << node->full_name () << "_ptr proxy" << be_nl - << "TAO_ENV_ARG_DECL_NOT_USED" << be_uidt_nl + << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl << ")" << be_uidt << be_uidt_nl << "{" << be_idt_nl << "ACE_MT (ACE_GUARD_RETURN (" diff --git a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp index 6a861bcbacc..2b78387f443 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp @@ -48,7 +48,7 @@ be_visitor_interface_strategized_proxy_broker_sh::visit_interface (be_interface *os << "virtual " << "::" << node->full_base_proxy_impl_name () << " &" << "select_proxy (" << be_idt_nl; *os << "::" << node->full_name () << " *object" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ");" << be_uidt_nl << be_nl; @@ -56,7 +56,7 @@ be_visitor_interface_strategized_proxy_broker_sh::visit_interface (be_interface << "// Helper methods that takes care to create the proxy" << be_nl << "// as soon as their use is necessary." << be_nl << "void create_proxy (" << be_idt_nl << "int collocation_strategy" - << be_nl << "TAO_ENV_ARG_DECL" + << be_nl << "ACE_ENV_ARG_DECL" << be_uidt_nl << ");" << be_nl << be_nl << "// Caches the proxy implementations. The proxy implementation" << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp index e16ab575100..f67d173214d 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp @@ -70,7 +70,7 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (be_interface << "select_proxy (" << be_idt << be_idt_nl // idt = 2 << "::" << node->full_name () << " *object" << be_nl - << "TAO_ENV_ARG_DECL" + << "ACE_ENV_ARG_DECL" << be_uidt_nl // idt = 1 << ")" << be_uidt_nl // idt = 0 @@ -78,7 +78,7 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (be_interface << be_idt_nl // idt = 1 << "int strategy =" << be_idt_nl // idt = 2 - << "TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);" + << "TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);" << be_nl << "ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);" << be_uidt_nl << be_nl // idt = 1 @@ -86,7 +86,7 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (be_interface << be_idt_nl // idt = 2 << "return *this->proxy_cache_[strategy];" << be_uidt_nl << be_nl // idt = 1 - << "this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);" + << "this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);" << be_nl << "ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);" << be_nl << be_nl @@ -101,7 +101,7 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (be_interface << be_idt << be_idt_nl // idt = 2 << "int strategy" << be_nl - << "TAO_ENV_ARG_DECL" + << "ACE_ENV_ARG_DECL" << be_uidt_nl // idt = 1 << ")" << be_uidt_nl // idt = 0 diff --git a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_sh.cpp index e600e2e83a4..7193ad36241 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_sh.cpp @@ -89,12 +89,12 @@ int be_visitor_interface_thru_poa_collocated_sh::visit_interface (be_interface * *os << "virtual CORBA::Boolean _is_a" << be_idt << "(" << be_idt_nl << "const CORBA::Char *logical_type_id" << be_nl - << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt_nl << be_nl; *os << "virtual CORBA::Boolean _non_existent" << be_idt << "(" << be_idt_nl - << "TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt_nl << be_nl; if (this->visit_scope (node) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_ss.cpp index 277a6ec76e8..4a4c59bc34e 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_ss.cpp @@ -79,7 +79,7 @@ int be_visitor_interface_thru_poa_collocated_ss::visit_interface (be_interface * << "_is_a" << be_idt << "(" << be_idt_nl << "const CORBA::Char *logical_type_id" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl << be_nl << "{" << be_idt_nl; *os <<"TAO_Object_Adapter::Servant_Upcall servant_upcall (" @@ -93,7 +93,7 @@ int be_visitor_interface_thru_poa_collocated_ss::visit_interface (be_interface * << "this->_object_key ()," << be_nl << "\"" << "_is_a" << "\"," << be_nl << "forward_to.out ()" << be_nl - << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl + << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl << ");" << be_uidt_nl << "ACE_CHECK_RETURN (0);" << be_nl; *os << "return ACE_reinterpret_cast (" << be_idt << be_idt_nl @@ -101,14 +101,14 @@ int be_visitor_interface_thru_poa_collocated_ss::visit_interface (be_interface * << "servant_upcall.servant ()->_downcast (" << be_idt << be_idt_nl << "\"" << node->repoID () << "\"" << be_uidt_nl << ")" << be_uidt << be_uidt_nl - << ")->_is_a (logical_type_id TAO_ENV_ARG_PARAMETER);" << be_uidt << be_uidt_nl + << ")->_is_a (logical_type_id ACE_ENV_ARG_PARAMETER);" << be_uidt << be_uidt_nl << "}" << be_uidt_nl << be_nl << be_nl; // Generate _non_existent implementation. *os << "CORBA::Boolean " << node->full_coll_name (be_interface::THRU_POA) << "::" << "_non_existent" << be_idt << "(" << be_idt_nl - << "TAO_ENV_SINGLE_ARG_DECL" << be_uidt_nl + << "ACE_ENV_SINGLE_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl << be_nl << "{" << be_idt_nl; *os <<"TAO_Object_Adapter::Servant_Upcall servant_upcall (" @@ -122,7 +122,7 @@ int be_visitor_interface_thru_poa_collocated_ss::visit_interface (be_interface * << "this->_object_key ()," << be_nl << "\"" << "_non_existent" << "\"," << be_nl << "forward_to.out ()" << be_nl - << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl + << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl << ");" << be_uidt_nl << "ACE_CHECK_RETURN (0);" << be_nl; *os << "return ACE_reinterpret_cast (" << be_idt << be_idt_nl @@ -130,7 +130,7 @@ int be_visitor_interface_thru_poa_collocated_ss::visit_interface (be_interface * << "servant_upcall.servant ()->_downcast (" << be_idt << be_idt_nl << "\"" << node->repoID () << "\"" << be_uidt_nl << ")" << be_uidt << be_uidt_nl - << ")->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);" << be_uidt << be_uidt_nl + << ")->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_uidt << be_uidt_nl << "}" << be_uidt_nl << be_nl << be_nl; if (this->visit_scope (node) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp index 38fe9b00cf7..d8ecbb5d5a6 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp @@ -19,9 +19,9 @@ // // ============================================================================ -#include "idl.h" -#include "idl_extern.h" -#include "be.h" +#include "idl.h" +#include "idl_extern.h" +#include "be.h" #include "be_visitor_interface.h" @@ -118,7 +118,7 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node) << "// set the ownership" << be_nl << be_nl << "// overridden ServantBase operations" << be_nl << "PortableServer::POA_ptr _default_POA (" << be_idt << be_idt_nl - << "TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt << "\n"; if (node->traverse_inheritance_graph ( @@ -148,8 +148,8 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node) int be_visitor_interface_tie_sh::method_helper (be_interface *, - be_interface *node, - TAO_OutStream *os) + be_interface *node, + TAO_OutStream *os) { be_visitor_context ctx; ctx.state (TAO_CodeGen::TAO_INTERFACE_TIE_SH); @@ -161,8 +161,8 @@ be_visitor_interface_tie_sh::method_helper (be_interface *, { delete visitor; ACE_ERROR_RETURN ((LM_ERROR, - "be_visitor_interface_tie_sh::" - "method_helper\n"), -1); + "be_visitor_interface_tie_sh::" + "method_helper\n"), -1); } delete visitor; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp index b3256a1274c..7a42da46f21 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp @@ -19,9 +19,9 @@ // // ============================================================================ -#include "idl.h" -#include "idl_extern.h" -#include "be.h" +#include "idl.h" +#include "idl_extern.h" +#include "be.h" #include "be_visitor_interface.h" @@ -161,13 +161,13 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node) *os << "template ACE_INLINE " << "PortableServer::POA_ptr" << be_nl << fulltiename - << "::_default_POA (TAO_ENV_SINGLE_ARG_DECL)" << be_nl + << "::_default_POA (ACE_ENV_SINGLE_ARG_DECL)" << be_nl << "{" << be_idt_nl << "if (!CORBA::is_nil (this->poa_.in ()))" << be_idt_nl << "return PortableServer::POA::_duplicate (this->poa_.in ());\n" << be_uidt_nl << "return this->" << localskelname - << "::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl + << "::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl << "}\n\n"; if (node->traverse_inheritance_graph (be_visitor_interface_tie_si::method_helper, os) == -1) @@ -189,8 +189,8 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node) int be_visitor_interface_tie_si::method_helper (be_interface *derived, - be_interface *node, - TAO_OutStream *os) + be_interface *node, + TAO_OutStream *os) { be_visitor_context ctx; ctx.state (TAO_CodeGen::TAO_INTERFACE_TIE_SI); @@ -202,8 +202,8 @@ be_visitor_interface_tie_si::method_helper (be_interface *derived, { delete visitor; ACE_ERROR_RETURN ((LM_ERROR, - "be_visitor_interface_tie_sh::" - "method_helper\n"), -1); + "be_visitor_interface_tie_sh::" + "method_helper\n"), -1); } delete visitor; return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp index 2b53e07ae24..3df34d98d0d 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp @@ -84,7 +84,7 @@ be_visitor_amh_operation_sh::visit_operation (be_operation *node) } *os << be_nl; } - *os << "TAO_ENV_ARG_DECL" + *os << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt; if (be_global->use_raw_throw ()) @@ -116,7 +116,7 @@ be_visitor_amh_operation_sh::visit_attribute (be_attribute *node) if (!be_global->exception_support ()) { - *os << "TAO_ENV_SINGLE_ARG_DECL"; + *os << "ACE_ENV_SINGLE_ARG_DECL"; } *os << be_uidt_nl << ")" << be_uidt_nl << "ACE_THROW_SPEC ((CORBA::SystemException)) = 0;\n" << be_nl; @@ -141,7 +141,7 @@ be_visitor_amh_operation_sh::visit_attribute (be_attribute *node) if (!be_global->exception_support ()) { - *os << be_nl << "TAO_ENV_SINGLE_ARG_DECL"; + *os << be_nl << "ACE_ENV_SINGLE_ARG_DECL"; } *os << be_uidt_nl << ")" << be_uidt_nl << "ACE_THROW_SPEC ((CORBA::SystemException)) = 0;\n" << be_nl; @@ -164,7 +164,7 @@ be_visitor_amh_operation_sh::generate_shared_prologue (be_decl *node, << "TAO_ServerRequest &_tao_req," << be_nl << "void *_tao_obj," << be_nl << "void *_tao_servant_upcall" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ");" << be_uidt << "\n\n"; // We need the interface node in which this operation was defined. However, diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp index 7b5774e86b8..73a0a577385 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp @@ -153,7 +153,7 @@ be_visitor_amh_operation_ss::visit_operation (be_operation *node) } *os << be_nl; } - *os << "TAO_ENV_ARG_PARAMETER"; + *os << "ACE_ENV_ARG_PARAMETER"; } if (this->generate_shared_epilogue (os) == -1) @@ -175,7 +175,7 @@ be_visitor_amh_operation_ss::visit_attribute (be_attribute *node) if (this->generate_shared_section (node, os) == -1) return -1; - *os << "TAO_ENV_ARG_PARAMETER"; + *os << "ACE_ENV_ARG_PARAMETER"; if (this->generate_shared_epilogue (os) == -1) return -1; @@ -231,7 +231,7 @@ be_visitor_amh_operation_ss::visit_attribute (be_attribute *node) return -1; *os << ", " << node->local_name () - << be_nl << "TAO_ENV_ARG_PARAMETER"; + << be_nl << "ACE_ENV_ARG_PARAMETER"; if (this->generate_shared_epilogue (os) == -1) return -1; @@ -278,11 +278,11 @@ be_visitor_amh_operation_ss::generate_shared_prologue (be_decl *node, << "TAO_ServerRequest &_tao_server_request," << be_nl << "void *_tao_object_reference, " << be_nl << "void * /* context */ " << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl; // Generate the actual code for the skeleton. - // last argument - is always TAO_ENV_ARG_PARAMETER. + // last argument - is always ACE_ENV_ARG_PARAMETER. *os << "{" << be_idt_nl; // Get the right object implementation. diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp index 51e3fc4eb7b..a8577a4ac25 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp @@ -120,7 +120,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node) // Generate the actual code for the stub. However, if any of the argument // types is "native", we flag a MARSHAL exception. - // last argument - is always TAO_ENV_ARG_PARAMETER + // last argument - is always ACE_ENV_ARG_PARAMETER *os << "{" << be_idt_nl; *os << this->gen_environment_var () << be_nl; @@ -392,7 +392,7 @@ be_compiled_visitor_operation_ami_cs::gen_marshal_and_invoke (be_operation *node << "for (;;)" << be_nl << "{" << be_idt_nl; - *os << "_tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);" << be_nl; + *os << "_tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_nl; // Check if there is an exception. // Return type is void, so we know what to generate here. *os << "ACE_CHECK;" << be_nl; @@ -412,7 +412,7 @@ be_compiled_visitor_operation_ami_cs::gen_marshal_and_invoke (be_operation *node *os << be_nl << "_tao_call.prepare_header (" << be_idt << be_idt_nl - << "ACE_static_cast (CORBA::Octet, _tao_response_flag) TAO_ENV_ARG_PARAMETER" + << "ACE_static_cast (CORBA::Octet, _tao_response_flag) ACE_ENV_ARG_PARAMETER" << be_uidt_nl << ");" << be_uidt << "\n"; // Now make sure that we have some in and inout @@ -456,7 +456,7 @@ be_compiled_visitor_operation_ami_cs::gen_marshal_and_invoke (be_operation *node } *os << be_nl - << "int _invoke_status = _tao_call.invoke (TAO_ENV_SINGLE_ARG_PARAMETER);"; + << "int _invoke_status = _tao_call.invoke (ACE_ENV_SINGLE_ARG_PARAMETER);"; *os << be_uidt_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp index 7515239ac77..8bf51c89647 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp @@ -104,7 +104,7 @@ be_visitor_operation_ami_exception_holder_operation_cs::visit_operation (be_oper *os << node->local_name () << "("; if (!be_global->exception_support ()) - *os << "TAO_ENV_SINGLE_ARG_DECL"; + *os << "ACE_ENV_SINGLE_ARG_DECL"; *os << ")" << be_uidt; @@ -176,7 +176,7 @@ be_visitor_operation_ami_exception_holder_operation_cs::visit_operation (be_oper << "this->marshaled_exception ().length ()," << be_nl << "this->byte_order ()," << be_nl << "this->is_system_exception ()" << be_nl - << "TAO_ENV_ARG_PARAMETER);" << be_uidt << be_uidt_nl; + << "ACE_ENV_ARG_PARAMETER);" << be_uidt << be_uidt_nl; *os << "}\n\n"; return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp index e5a8b2c763a..64ed89f8ce9 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp @@ -80,7 +80,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_ch::visit_operation (be_op << "CORBA::ULong reply_status"; *os << be_nl - << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt_nl << be_nl; } return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp index 599429e8e43..1220c388552 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp @@ -113,13 +113,13 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation (be_op << "CORBA::ULong reply_status"; *os << be_nl - << "TAO_ENV_ARG_DECL"; + << "ACE_ENV_ARG_DECL"; *os << ")" << be_uidt << be_uidt_nl; // Generate the actual code for the stub. However, if any of the argument // types is "native", we flag a MARSHAL exception. - // last argument - is always TAO_ENV_ARG_PARAMETER + // last argument - is always ACE_ENV_ARG_PARAMETER *os << "{\n" << be_idt; // Generate any pre stub info if and only if none of our parameters is of the @@ -148,7 +148,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation (be_op << "_tao_reply_handler_object =" << be_idt_nl; *os << parent->full_name (); - *os << "::_narrow(_tao_reply_handler TAO_ENV_ARG_PARAMETER);" << be_uidt_nl; + *os << "::_narrow(_tao_reply_handler ACE_ENV_ARG_PARAMETER);" << be_uidt_nl; *os << "ACE_CHECK;" << be_nl << be_nl << "// Exception handling" << be_nl @@ -249,7 +249,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation (be_op if (!be_global->exception_support ()) { - *os << " TAO_ENV_ARG_PARAMETER"; + *os << " ACE_ENV_ARG_PARAMETER"; } *os << be_uidt_nl << ");" << be_uidt_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp b/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp index 0b5b69678dd..79fe13e262c 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp @@ -85,7 +85,7 @@ be_visitor_operation_argument::visit_operation (be_operation *node) } // if we are supporting the alternate mapping, we must pass the - // TAO_ENV_ARG_PARAMETER as the last parameter + // ACE_ENV_ARG_PARAMETER as the last parameter if (!be_global->exception_support ()) { switch (this->ctx_->state ()) @@ -94,12 +94,12 @@ be_visitor_operation_argument::visit_operation (be_operation *node) case TAO_CodeGen::TAO_OPERATION_COLLOCATED_ARG_UPCALL_SS: // applicable only to these cases where the actual upcall is made - // Use TAO_ENV_SINGLE_ARG_DECL or TAO_ENV_ARG_DECL depending on + // Use ACE_ENV_SINGLE_ARG_DECL or ACE_ENV_ARG_DECL depending on // whether the operation node has parameters. if (node->argument_count () > 0) - *os << " TAO_ENV_ARG_PARAMETER"; + *os << " ACE_ENV_ARG_PARAMETER"; else - *os << "TAO_ENV_SINGLE_ARG_PARAMETER"; + *os << "ACE_ENV_SINGLE_ARG_PARAMETER"; break; default: break; diff --git a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_arglist.cpp b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_arglist.cpp index 27fc52b8574..27499952058 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_arglist.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_arglist.cpp @@ -58,7 +58,7 @@ be_visitor_operation_interceptors_arglist::visit_operation (be_operation *node) -1); } - // generate the TAO_ENV_ARG_PARAMETER for the alternative mapping + // generate the ACE_ENV_ARG_PARAMETER for the alternative mapping if (!be_global->exception_support ()) { switch (this->ctx_->state ()) @@ -73,14 +73,14 @@ be_visitor_operation_interceptors_arglist::visit_operation (be_operation *node) case TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_INFO_ARGLIST_CS: case TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_INFO_ARGLIST_SS: { - *os << " TAO_ENV_ARG_PARAMETER"; + *os << " ACE_ENV_ARG_PARAMETER"; break; } case TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_ARGLIST_CS: case TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_ARGLIST_SS: { // last argument - is always CORBA::Environment - *os << " TAO_ENV_ARG_DECL_NOT_USED"; + *os << " ACE_ENV_ARG_DECL_NOT_USED"; break; } case TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_ARGLIST_CH: @@ -89,7 +89,7 @@ be_visitor_operation_interceptors_arglist::visit_operation (be_operation *node) // @@ Do it for all cases i.e arg count > = 0 // last argument - is always CORBA::Environment - *os << " TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl; + *os << " ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl; break; } default: diff --git a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_cs.cpp index 2979bc2edc5..122e9f3784c 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_cs.cpp @@ -185,17 +185,17 @@ be_visitor_operation_interceptors_cs:: // Here I still need to generate the other methods + private args. *os << "virtual Dynamic::ParameterList * arguments " - << "(TAO_ENV_SINGLE_ARG_DECL)" << be_idt_nl + << "(ACE_ENV_SINGLE_ARG_DECL)" << be_idt_nl << "ACE_THROW_SPEC ((CORBA::SystemException));" << be_uidt_nl << be_nl; *os << "virtual Dynamic::ExceptionList * exceptions " - << "(TAO_ENV_SINGLE_ARG_DECL)" << be_idt_nl + << "(ACE_ENV_SINGLE_ARG_DECL)" << be_idt_nl << "ACE_THROW_SPEC ((CORBA::SystemException));" << be_uidt_nl << be_nl; *os << "virtual CORBA::Any * result " - << "(TAO_ENV_SINGLE_ARG_DECL)" << be_idt_nl + << "(ACE_ENV_SINGLE_ARG_DECL)" << be_idt_nl << "ACE_THROW_SPEC ((CORBA::SystemException));\n" << be_uidt; @@ -574,7 +574,7 @@ be_visitor_operation_interceptors_cs:: } } - *os << "::arguments (TAO_ENV_SINGLE_ARG_DECL)" << be_idt_nl + *os << "::arguments (ACE_ENV_SINGLE_ARG_DECL)" << be_idt_nl << "ACE_THROW_SPEC ((CORBA::SystemException))"<< be_uidt_nl << "{" << be_idt_nl; @@ -582,7 +582,7 @@ be_visitor_operation_interceptors_cs:: { *os << "// Generate the argument list on demand." << be_nl << "Dynamic::ParameterList *parameter_list =" << be_idt_nl - << "TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);" + << "TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl << "ACE_CHECK_RETURN (0);" << be_nl << be_nl; @@ -693,7 +693,7 @@ be_visitor_operation_interceptors_cs:: } } - *os << "::exceptions (TAO_ENV_SINGLE_ARG_DECL)"<< be_idt_nl + *os << "::exceptions (ACE_ENV_SINGLE_ARG_DECL)"<< be_idt_nl << "ACE_THROW_SPEC ((CORBA::SystemException))" << be_uidt_nl << "{" << be_idt_nl; @@ -701,7 +701,7 @@ be_visitor_operation_interceptors_cs:: { *os << "// Generate the exception list on demand." << be_nl << "Dynamic::ExceptionList *exception_list =" << be_idt_nl - << "TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);" + << "TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl << "ACE_CHECK_RETURN (0);" << be_nl << be_nl; @@ -790,7 +790,7 @@ be_visitor_operation_interceptors_cs:: } } - *os << "::result (TAO_ENV_SINGLE_ARG_DECL)" << be_idt_nl + *os << "::result (ACE_ENV_SINGLE_ARG_DECL)" << be_idt_nl << "ACE_THROW_SPEC ((CORBA::SystemException))" << be_uidt_nl << "{" << be_idt_nl; @@ -805,7 +805,7 @@ be_visitor_operation_interceptors_cs:: // Return an Any with tk_void TypeCode. *os << "CORBA::Boolean tk_void_any = 1;" << be_nl << "CORBA::Any *result_any =" << be_idt_nl - << "TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);" + << "TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);" << be_uidt_nl << "ACE_CHECK_RETURN (0);" << be_nl << be_nl @@ -815,7 +815,7 @@ be_visitor_operation_interceptors_cs:: { *os << "CORBA::Boolean tk_void_any = 0;" << be_nl << "CORBA::Any *result_any =" << be_idt_nl - << "TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);" + << "TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);" << be_uidt_nl << "ACE_CHECK_RETURN (0);" << be_nl << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_ss.cpp index 0b141fb00f6..d651e62e77f 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_ss.cpp @@ -199,35 +199,35 @@ be_visitor_operation_interceptors_ss:: // Here I still need to generate the other methods + private args *os << "virtual Dynamic::ParameterList * arguments (" << be_idt << be_idt_nl - << "TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ")" << be_nl << "ACE_THROW_SPEC ((CORBA::SystemException));" << be_uidt_nl << be_nl; *os << "virtual Dynamic::ExceptionList * exceptions (" << be_idt << be_idt_nl - << "TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ")" << be_nl << "ACE_THROW_SPEC ((CORBA::SystemException));" << be_uidt_nl << be_nl; *os << "virtual CORBA::Any * result (" << be_idt << be_idt_nl - << "TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ")" << be_nl << "ACE_THROW_SPEC ((CORBA::SystemException));" << be_uidt_nl << be_nl; *os << "virtual char * target_most_derived_interface (" << be_idt << be_idt_nl - << "TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)" + << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)" << be_uidt_nl << "ACE_THROW_SPEC ((CORBA::SystemException));" << be_uidt_nl << be_nl; *os << "virtual CORBA::Boolean target_is_a (" << be_idt << be_idt_nl << "const char * id" << be_nl - << "TAO_ENV_ARG_DECL_WITH_DEFAULTS)" + << "ACE_ENV_ARG_DECL_WITH_DEFAULTS)" << be_uidt_nl << "ACE_THROW_SPEC ((CORBA::SystemException));\n" << be_uidt_nl; @@ -635,12 +635,12 @@ be_visitor_operation_interceptors_ss:: } } - *os << "::arguments (TAO_ENV_SINGLE_ARG_DECL)" << be_idt_nl + *os << "::arguments (ACE_ENV_SINGLE_ARG_DECL)" << be_idt_nl << "ACE_THROW_SPEC ((CORBA::SystemException))" << be_uidt_nl << "{" << be_idt_nl << "// Generate the argument list on demand." << be_nl << "Dynamic::ParameterList *parameter_list =" << be_idt_nl - << "TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);" + << "TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl << "ACE_CHECK_RETURN (0);" << be_nl << be_nl; @@ -737,7 +737,7 @@ be_visitor_operation_interceptors_ss:: } } - *os << "::exceptions (TAO_ENV_SINGLE_ARG_DECL)"<< be_idt_nl + *os << "::exceptions (ACE_ENV_SINGLE_ARG_DECL)"<< be_idt_nl << "ACE_THROW_SPEC ((CORBA::SystemException))" << be_uidt_nl << "{" << be_idt_nl; @@ -745,7 +745,7 @@ be_visitor_operation_interceptors_ss:: { *os << "// Generate the exception list on demand." << be_nl << "Dynamic::ExceptionList *exception_list =" << be_idt_nl - << "TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);" + << "TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl << "ACE_CHECK_RETURN (0);" << be_nl << be_nl; @@ -834,7 +834,7 @@ be_visitor_operation_interceptors_ss:: } } - *os << "::result (TAO_ENV_SINGLE_ARG_DECL)"<< be_idt_nl + *os << "::result (ACE_ENV_SINGLE_ARG_DECL)"<< be_idt_nl << "ACE_THROW_SPEC ((CORBA::SystemException))" << be_uidt_nl << "{" << be_idt_nl; @@ -849,7 +849,7 @@ be_visitor_operation_interceptors_ss:: // Return an Any with tk_void TypeCode. *os << "CORBA::Boolean tk_void_any = 1;" << be_nl << "CORBA::Any *result_any =" << be_idt_nl - << "TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);" + << "TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);" << be_uidt_nl << "ACE_CHECK_RETURN (0);" << be_nl << be_nl @@ -859,7 +859,7 @@ be_visitor_operation_interceptors_ss:: { *os << "CORBA::Boolean tk_void_any = 0;" << be_nl << "CORBA::Any *result_any =" << be_idt_nl - << "TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);" + << "TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);" << be_uidt_nl << "ACE_CHECK_RETURN (0);" << be_nl << be_nl @@ -941,7 +941,7 @@ be_visitor_operation_interceptors_ss:: *os << "::target_most_derived_interface (" << be_idt << be_idt_nl - << "TAO_ENV_SINGLE_ARG_DECL_NOT_USED)" << be_uidt_nl + << "ACE_ENV_SINGLE_ARG_DECL_NOT_USED)" << be_uidt_nl << "ACE_THROW_SPEC ((CORBA::SystemException))" << be_uidt_nl << "{" << be_idt_nl << "return" << be_idt_nl @@ -987,10 +987,10 @@ be_visitor_operation_interceptors_ss:: *os << "::target_is_a (" << be_idt << be_idt_nl << "const char * id" << be_nl - << "TAO_ENV_ARG_DECL)" << be_uidt_nl + << "ACE_ENV_ARG_DECL)" << be_uidt_nl << "ACE_THROW_SPEC ((CORBA::SystemException))" << be_uidt_nl << "{" << be_idt_nl - << "return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);" + << "return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);" << be_uidt_nl << "}" << be_nl << be_nl; // ----------------------------------------------------------------- diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp index 1a4df226278..05dddecb079 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp @@ -161,11 +161,11 @@ be_visitor_operation::gen_environment_decl (int argument_emitted, if (be_global->exception_support ()) return 0; - // Use TAO_ENV_SINGLE_ARG_DECL or TAO_ENV_ARG_DECL depending on + // Use ACE_ENV_SINGLE_ARG_DECL or ACE_ENV_ARG_DECL depending on // whether the operation node has parameters. - const char *env_decl = "TAO_ENV_SINGLE_ARG_DECL"; + const char *env_decl = "ACE_ENV_SINGLE_ARG_DECL"; if (argument_emitted || node->argument_count () > 0) - env_decl = "TAO_ENV_ARG_DECL"; + env_decl = "ACE_ENV_ARG_DECL"; *os << be_nl; switch (this->ctx_->state ()) @@ -180,7 +180,7 @@ be_visitor_operation::gen_environment_decl (int argument_emitted, case TAO_CodeGen::TAO_OPERATION_ARGLIST_IH: case TAO_CodeGen::TAO_OPERATION_ARGLIST_PROXY_IMPL_XH: case TAO_CodeGen::TAO_OPERATION_ARGLIST_BASE_PROXY_IMPL_CH: - // last argument - is always TAO_ENV_ARG_DECL + // last argument - is always ACE_ENV_ARG_DECL *os << env_decl; break; default: diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp index 829cf9a36b7..7b3d8a12ab8 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp @@ -171,7 +171,7 @@ be_visitor_operation_cs::visit_operation (be_operation *node) *os << intf->base_proxy_impl_name () << " &proxy = " << be_idt_nl << "this->the" << intf->base_proxy_broker_name () - << "_->select_proxy (this TAO_ENV_ARG_PARAMETER);" << be_uidt_nl; + << "_->select_proxy (this ACE_ENV_ARG_PARAMETER);" << be_uidt_nl; if (!this->void_return_type (bt)) { @@ -249,7 +249,7 @@ be_visitor_operation_cs::visit_operation (be_operation *node) if (!be_global->exception_support ()) { - *os << " TAO_ENV_ARG_PARAMETER"; + *os << " ACE_ENV_ARG_PARAMETER"; } *os << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "}\n\n"; diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp index 0aa4c6c2729..096fc8a6633 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp @@ -138,7 +138,7 @@ be_visitor_operation_sh::visit_operation (be_operation *node) << "TAO_ServerRequest &_tao_req," << be_nl << "void *_tao_obj," << be_nl << "void *_tao_servant_upcall" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ");" << be_uidt << "\n\n"; } diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp index 35606d79667..af39de154e1 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp @@ -127,7 +127,7 @@ be_visitor_operation_ss::visit_operation (be_operation *node) << "TAO_ServerRequest &_tao_server_request," << be_nl << "void *_tao_object_reference," << be_nl << "void *_tao_servant_upcall" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl; // Generate the actual code for the skeleton. However, if any of the argument @@ -295,7 +295,7 @@ be_visitor_operation_ss::visit_operation (be_operation *node) << be_nl << be_nl; // Invoke the receive_request() interception point. - *os << "_tao_vfr.receive_request (&_tao_ri TAO_ENV_ARG_PARAMETER);" << be_nl + *os << "_tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);" << be_nl << "ACE_TRY_CHECK;" << be_nl; *os << "\n#endif /* TAO_HAS_INTERCEPTORS */\n"; @@ -404,7 +404,7 @@ be_visitor_operation_ss::visit_operation (be_operation *node) } *os << "_tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);" << be_nl - << "_tao_vfr.send_reply (&_tao_ri TAO_ENV_ARG_PARAMETER);"<< be_nl + << "_tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);"<< be_nl << "ACE_TRY_CHECK;" << be_uidt_nl; *os << "}" << be_uidt_nl @@ -414,7 +414,7 @@ be_visitor_operation_ss::visit_operation (be_operation *node) *os << "_tao_ri.exception (&ACE_ANY_EXCEPTION);"<< be_nl << "_tao_vfr.send_exception (" << be_idt << be_idt_nl << "&_tao_ri" << be_nl - << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl + << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl << ");" << be_uidt_nl << "ACE_TRY_CHECK;" << be_nl; @@ -423,7 +423,7 @@ be_visitor_operation_ss::visit_operation (be_operation *node) // exception. *os << be_nl << "PortableInterceptor::ReplyStatus _tao_status =" << be_idt_nl - << "_tao_ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl + << "_tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl << "ACE_TRY_CHECK;" << be_nl; *os << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp index 969b8c081c1..9e0cefca478 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp @@ -103,7 +103,7 @@ be_visitor_operation_remote_proxy_impl_cs::visit_operation (be_operation *node) // Generate the actual code for the stub. However, if any of the argument // types is "native", we flag a MARSHAL exception. - // last argument - is always TAO_ENV_ARG_PARAMETER + // last argument - is always ACE_ENV_ARG_PARAMETER *os << "{" << be_idt_nl; /* This shall go away as soon as we drop the include_env switch @@ -467,7 +467,7 @@ be_visitor_operation_remote_proxy_impl_cs::gen_marshal_and_invoke ( // i.e. this is an optimization. *os << "_tao_vfr.send_request (" << be_idt_nl << "&_tao_ri" << be_nl - << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl + << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl << ");" << be_nl << "ACE_TRY_CHECK;" << be_nl; @@ -493,7 +493,7 @@ be_visitor_operation_remote_proxy_impl_cs::gen_marshal_and_invoke ( *os << be_nl - << "_tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);" << be_nl; + << "_tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_nl; // check if there is an exception if (this->gen_check_interceptor_exception (bt) == -1) { @@ -507,7 +507,7 @@ be_visitor_operation_remote_proxy_impl_cs::gen_marshal_and_invoke ( *os << be_nl << "_tao_call.prepare_header (" << be_idt << be_idt_nl << "ACE_static_cast (CORBA::Octet, _tao_response_flag)" << be_nl - << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl + << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl << ");" << be_uidt_nl; // check if there is an exception @@ -569,7 +569,7 @@ be_visitor_operation_remote_proxy_impl_cs::gen_marshal_and_invoke ( if (node->flags () == AST_Operation::OP_oneway) { // Oneway operation. - *os << "_tao_call.invoke (TAO_ENV_SINGLE_ARG_PARAMETER);"; + *os << "_tao_call.invoke (ACE_ENV_SINGLE_ARG_PARAMETER);"; } else { @@ -578,11 +578,11 @@ be_visitor_operation_remote_proxy_impl_cs::gen_marshal_and_invoke ( *os << "_tao_call.invoke (_tao_" << node->flat_name () << "_exceptiondata, " << node->exceptions ()->length () - << " TAO_ENV_ARG_PARAMETER);"; + << " ACE_ENV_ARG_PARAMETER);"; } else { - *os << "_tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);"; + *os << "_tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);"; } } @@ -626,7 +626,7 @@ be_visitor_operation_remote_proxy_impl_cs::gen_marshal_and_invoke ( << "_tao_ri.reply_status (_invoke_status);" << be_nl << "_tao_vfr.receive_other (" << be_idt_nl << "&_tao_ri" << be_nl - << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl + << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl << ");" << be_nl << "ACE_TRY_CHECK;" << be_uidt_nl << ")" << be_nl @@ -811,7 +811,7 @@ be_visitor_operation_remote_proxy_impl_cs::gen_marshal_and_invoke ( << "_tao_ri.reply_status (_invoke_status);" << be_nl << "_tao_vfr.receive_reply (" << be_idt_nl << "&_tao_ri" << be_nl - << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl + << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl << ");" << be_nl; } else if (node->flags () == AST_Operation::OP_oneway) @@ -821,7 +821,7 @@ be_visitor_operation_remote_proxy_impl_cs::gen_marshal_and_invoke ( << "_tao_ri.reply_status (_invoke_status);" << be_nl << "_tao_vfr.receive_other (" << be_idt_nl << "&_tao_ri" << be_nl - << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl + << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl << ");" << be_nl; } @@ -844,7 +844,7 @@ be_visitor_operation_remote_proxy_impl_cs::gen_marshal_and_invoke ( *os << "_tao_vfr.receive_exception (" << be_idt_nl << "&_tao_ri" << be_nl - << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl + << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl << ");" << be_nl << "ACE_TRY_CHECK;" << be_nl; @@ -854,7 +854,7 @@ be_visitor_operation_remote_proxy_impl_cs::gen_marshal_and_invoke ( // caught exception. *os << be_nl << "PortableInterceptor::ReplyStatus _tao_status =" << be_idt_nl - << "_tao_ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl + << "_tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl << "ACE_TRY_CHECK;" << be_nl; *os << be_nl @@ -887,7 +887,7 @@ be_visitor_operation_remote_proxy_impl_cs::gen_marshal_and_invoke ( // ClientRequestInfo object. *os << be_nl << "PortableInterceptor::ReplyStatus _tao_status =" << be_idt_nl - << "_tao_ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl; + << "_tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl; if (this->gen_check_exception (bt) == -1) { diff --git a/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_collocated_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_collocated_ss.cpp index 2b67da969ad..45a3a6b8d77 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_collocated_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_collocated_ss.cpp @@ -140,7 +140,7 @@ int be_visitor_operation_thru_poa_collocated_ss::visit_operation (be_operation * << "\"" << node->original_local_name () << "\"," << be_nl << "forward_to.out ()"; if (!be_global->exception_support ()) - *os << " TAO_ENV_ARG_PARAMETER);\n" << be_uidt_nl << be_uidt; + *os << " ACE_ENV_ARG_PARAMETER);\n" << be_uidt_nl << be_uidt; else *os << be_uidt_nl << ");\n" << be_uidt; diff --git a/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp index 8d2b61b6eae..84fdaac5823 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp @@ -149,7 +149,7 @@ be_visitor_operation_thru_poa_proxy_impl_ss::visit_operation (be_operation *node << "forward_to.out ()"; if (!be_global->exception_support ()) *os << be_nl - << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl + << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl << ");" << be_nl << be_uidt; else *os << be_uidt_nl << ");" << be_uidt_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_root/root.cpp b/TAO/TAO_IDL/be/be_visitor_root/root.cpp index 608ac0254ab..2bea93a0734 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root.cpp @@ -129,7 +129,7 @@ int be_visitor_root::visit_root (be_root *node) << "tao_" << ifwd->flat_name () << "_narrow (" << be_idt << be_idt_nl << "CORBA::Object *" << be_nl - << "TAO_ENV_ARG_DECL_NOT_USED" << be_uidt_nl + << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl << ");" << be_uidt_nl << be_global->stub_export_macro () << be_nl << "CORBA::Object *" << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp index 08eb44a58a0..5f832013e69 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp @@ -102,7 +102,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) << "{" << be_idt_nl << "CORBA::TypeCode_var type = _tao_any.type ();" << be_nl << be_nl << "CORBA::Boolean result = type->equivalent (" << node->tc_name () - << " TAO_ENV_ARG_PARAMETER);" << be_nl + << " ACE_ENV_ARG_PARAMETER);" << be_nl << "ACE_TRY_CHECK;" << be_nl << be_nl << "if (!result)" << be_idt_nl << "return 0; // not equivalent" << be_uidt_nl << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp index ffdbd9d742d..460cb93d1bc 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp @@ -191,7 +191,7 @@ be_visitor_sequence_ch::gen_bounded_obj_sequence (be_sequence *node) *os << "virtual void _downcast (" << be_idt << be_idt_nl << "void* target," << be_nl << "CORBA_Object *src" << be_nl - << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt_nl; *os << "virtual CORBA_Object* _upcast (void *src) const;"; diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp index 09ca692b39e..f144dd55c62 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp @@ -230,7 +230,7 @@ be_visitor_sequence_cs::gen_bounded_obj_sequence (be_sequence *node) << full_class_name << "::_downcast (" << be_idt << be_idt_nl << "void* target," << be_nl << "CORBA_Object *src" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl; @@ -247,12 +247,12 @@ be_visitor_sequence_cs::gen_bounded_obj_sequence (be_sequence *node) { bt->accept (visitor); - *os << "::_narrow (src TAO_ENV_ARG_PARAMETER);"; + *os << "::_narrow (src ACE_ENV_ARG_PARAMETER);"; } else { *os << "tao_" << pt->flat_name () - << "_narrow (src TAO_ENV_ARG_PARAMETER);"; + << "_narrow (src ACE_ENV_ARG_PARAMETER);"; } *os << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp index e2f621e3aff..d7b421b58d7 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp @@ -196,7 +196,7 @@ be_visitor_sequence_ch::gen_unbounded_obj_sequence (be_sequence *node) *os << "virtual void _downcast (" << be_idt << be_idt_nl << "void* target," << be_nl << "CORBA_Object *src" << be_nl - << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt_nl; *os << "virtual CORBA_Object* _upcast (void *src) const;"; diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp index 00d7afbae3b..b9e9880dbdd 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp @@ -300,7 +300,7 @@ be_visitor_sequence_cs::gen_unbounded_obj_sequence (be_sequence *node) << full_class_name << "::_downcast (" << be_idt << be_idt_nl << "void* target," << be_nl << "CORBA_Object *src" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl; @@ -317,12 +317,12 @@ be_visitor_sequence_cs::gen_unbounded_obj_sequence (be_sequence *node) { bt->accept (visitor); - *os << "::_narrow (src TAO_ENV_ARG_PARAMETER);"; + *os << "::_narrow (src ACE_ENV_ARG_PARAMETER);"; } else { *os << "tao_" << pt->flat_name () - << "_narrow (src TAO_ENV_ARG_PARAMETER);"; + << "_narrow (src ACE_ENV_ARG_PARAMETER);"; } *os << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp index fbb5cac423f..76635942a48 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp @@ -97,7 +97,7 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node) << "{" << be_idt_nl << "CORBA::TypeCode_var type = _tao_any.type ();" << be_nl << be_nl << "CORBA::Boolean result = type->equivalent (" << node->tc_name () - << " TAO_ENV_ARG_PARAMETER);" << be_nl + << " ACE_ENV_ARG_PARAMETER);" << be_nl << "ACE_TRY_CHECK;" << be_nl << be_nl << "if (!result)" << be_idt_nl << "return 0; // not equivalent" << be_uidt_nl << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp index f91f85da940..560aa5bab7c 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp @@ -110,7 +110,7 @@ be_visitor_union_any_op_cs::visit_union (be_union *node) << "{" << be_idt_nl << "CORBA::TypeCode_var type = _tao_any.type ();" << be_nl << be_nl << "CORBA::Boolean result = type->equivalent (" << node->tc_name () - << " TAO_ENV_ARG_PARAMETER);" << be_nl + << " ACE_ENV_ARG_PARAMETER);" << be_nl << "ACE_TRY_CHECK;" << be_nl << be_nl << "if (!result)" << be_idt_nl << "return 0; // not equivalent" << be_uidt_nl << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp index e4d67bf3c2a..495807a45f9 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp @@ -73,7 +73,7 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node) *os << be_global->stub_export_macro () << "void" << be_nl << "operator<<= (CORBA::Any &any, " << node->name () - << " **value) // non-copying" << be_nl + << " **value) // non-copying" << be_nl << "{" << be_idt_nl << "TAO_OutputCDR stream;" << be_nl << "if (stream << *value)" << be_nl @@ -84,7 +84,7 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node) << "stream.begin ()," << be_nl << "1," << be_nl << "*value," << be_nl - << node->name () << "::_tao_any_destructor);" + << node->name () << "::_tao_any_destructor);" << be_uidt << be_uidt << be_uidt_nl << "}" << be_uidt_nl << "}" << be_nl << be_nl; @@ -99,7 +99,7 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node) << "value = 0;" << be_nl << "CORBA::TypeCode_var type = any.type ();" << be_nl << be_nl << "CORBA::Boolean result = type->equivalent (" << node->tc_name () - << " TAO_ENV_ARG_PARAMETER);" << be_nl + << " ACE_ENV_ARG_PARAMETER);" << be_nl << "ACE_TRY_CHECK;" << be_nl << be_nl << "if (!result)" << be_nl << "{" << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp index dd6db9e8716..b53c4daf8be 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp @@ -62,24 +62,24 @@ be_visitor_obv_operation_arglist::visit_operation (be_operation *node) -1); } - // Generate the TAO_ENV_ARG_DECL parameter for the alternative mapping. + // Generate the ACE_ENV_ARG_DECL parameter for the alternative mapping. if (!be_global->exception_support ()) { - // Use TAO_ENV_SINGLE_ARG_DECL or TAO_ENV_ARG_DECL depending on + // Use ACE_ENV_SINGLE_ARG_DECL or ACE_ENV_ARG_DECL depending on // whether the operation node has parameters. const char *env_decl = (node->argument_count () > 0 ? - " TAO_ENV_ARG_DECL" : "TAO_ENV_SINGLE_ARG_DECL"); + " ACE_ENV_ARG_DECL" : "ACE_ENV_SINGLE_ARG_DECL"); switch (this->ctx_->state ()) { case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_CH: case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_OBV_CH: case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_IMPL_CH: - // Last argument - is always TAO_ENV_ARG_DECL. + // Last argument - is always ACE_ENV_ARG_DECL. *os << env_decl << "_WITH_DEFAULTS" << be_uidt_nl; break; case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_IMPL_CS: - // Last argument - is always TAO_ENV_ARG_DECL. + // Last argument - is always ACE_ENV_ARG_DECL. *os << env_decl << be_uidt_nl; break; default: diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h index 76f2faa5227..88e9a1ed4ac 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h @@ -58,7 +58,7 @@ public: virtual int gen_environment_decl (int argument_emitted, be_operation *node); - // generate the TAO_ENV_ARG declaration, needs to know if there was + // generate the ACE_ENV_ARG declaration, needs to know if there was // at least one argument emitted to deal with all the commas. virtual const char *gen_environment_var (void); diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h b/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h index 4650afc561a..819c4ed0cb5 100644 --- a/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h +++ b/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h @@ -14,8 +14,8 @@ public: void connect (CosEventChanneAdmin::ConsumerAdmin_ptr consumer_admin); - void push (const CORBA::Any& data TAO_ENV_ARG_DECL_NOT_USED); - void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + void push (const CORBA::Any& data ACE_ENV_ARG_DECL_NOT_USED); + void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); private: }; diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp index e02c36336de..efadfaa1e30 100644 --- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp +++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp @@ -31,7 +31,7 @@ Stock_Consumer::disconnect () void Stock_Consumer::push (const CORBA::Any& data - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) throw (CORBA::SystemException) { Quoter::Event *event; @@ -45,7 +45,7 @@ Stock_Consumer::push (const CORBA::Any& data } void -Stock_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Stock_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) throw (CORBA::SystemException) { this->supplier_proxy_ = CosEventChannelAdmin::ProxyPushSupplier::_nil (); diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h index f3659626a57..d5de84958cd 100644 --- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h +++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h @@ -18,9 +18,9 @@ public: void disconnect (); // Disconnect from the event channel. - void push (const CORBA::Any& data TAO_ENV_ARG_DECL_NOT_USED) + void push (const CORBA::Any& data ACE_ENV_ARG_DECL_NOT_USED) throw (CORBA::SystemException); - void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) throw (CORBA::SystemException); private: diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.cpp b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.cpp index 1a6f7ec52b6..b4cb4937eae 100644 --- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.cpp +++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.cpp @@ -46,7 +46,7 @@ Quoter_Stock_i::set_price (CORBA::Double new_price) } void -Quoter_Stock_i::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Quoter_Stock_i::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) throw (CORBA::SystemException) { // Forget about the consumer it is not there anymore diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h index 995dabddc7a..d6e82748c82 100644 --- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h +++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h @@ -23,7 +23,7 @@ public: CORBA::Double price () throw (CORBA::SystemException); void set_price (CORBA::Double new_price) throw (CORBA::SystemException); - void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) throw (CORBA::SystemException); void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin); diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.cpp b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.cpp index 99eb940ad6e..ab075fcfcf7 100644 --- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.cpp +++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.cpp @@ -14,7 +14,7 @@ Quoter_Stock_Factory_Locator_i::preinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr, const char *, void * & cookie - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) throw (CORBA::SystemException, PortableServer::ForwardRequest) { @@ -49,7 +49,7 @@ Quoter_Stock_Factory_Locator_i::postinvoke (const PortableServer::ObjectId &, const char *, void * cookie, PortableServer::Servant servant - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) throw (CORBA::SystemException) { diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h index 4405c865fcd..cd0a6e1178a 100644 --- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h +++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h @@ -18,7 +18,7 @@ class Quoter_Stock_Factory_Locator_i : public PortableServer::ServantLocator PortableServer::POA_ptr poa, const char * operation, void * & cookie - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) throw (CORBA::SystemException, PortableServer::ForwardRequest); // Postinvoke function @@ -27,7 +27,7 @@ class Quoter_Stock_Factory_Locator_i : public PortableServer::ServantLocator const char * operation, void * cookie, PortableServer::Servant servant - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) throw (CORBA::SystemException); private: diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.cpp index 62f89416c49..0260584501c 100644 --- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.cpp +++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.cpp @@ -33,7 +33,7 @@ Stock_Consumer::disconnect () void Stock_Consumer::push (const RtecEventComm::EventSet &data - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) throw (CORBA::SystemException) { for (CORBA::ULong i = 0; i != data.length (); ++i) { @@ -51,7 +51,7 @@ Stock_Consumer::push (const RtecEventComm::EventSet &data } void -Stock_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Stock_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) throw (CORBA::SystemException) { this->supplier_proxy_ = diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h index 2348b9b1a2d..a82044836bc 100644 --- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h +++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h @@ -20,9 +20,9 @@ public: void disconnect (); // Disconnect from the event channel. - void push (const RtecEventComm::EventSet& data TAO_ENV_ARG_DECL_NOT_USED) + void push (const RtecEventComm::EventSet& data ACE_ENV_ARG_DECL_NOT_USED) throw (CORBA::SystemException); - void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) throw (CORBA::SystemException); private: diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp index 672e06cb7f9..a8ca6402a64 100644 --- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp +++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp @@ -18,12 +18,12 @@ protected: ref_count_(0) {} public: - virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL) + virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL) { ++this->ref_count_; } - virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL) + virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL) { CORBA::ULong new_count = --this->ref_count_; @@ -95,7 +95,7 @@ Quoter_Stock_i::set_price (CORBA::Double new_price) } void -Quoter_Stock_i::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Quoter_Stock_i::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) throw (CORBA::SystemException) { // Forget about the consumer it is not there anymore diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h index 3d074a8e31a..7ec530709eb 100644 --- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h +++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h @@ -24,7 +24,7 @@ public: CORBA::Double price () throw (CORBA::SystemException); void set_price (CORBA::Double new_price) throw (CORBA::SystemException); - void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) throw (CORBA::SystemException); void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin); diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.cpp b/TAO/examples/AMI/FL_Callback/Peer_i.cpp index fb81056443c..59f3cbfaae1 100644 --- a/TAO/examples/AMI/FL_Callback/Peer_i.cpp +++ b/TAO/examples/AMI/FL_Callback/Peer_i.cpp @@ -15,36 +15,36 @@ Peer_Handler_i::Peer_Handler_i (Peer_i *peer) void Peer_Handler_i::request (CORBA::Long retval - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { static int i = 0; i++; if (i % 100 == 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) %d replies received\n", i)); - this->peer_->reply (retval TAO_ENV_ARG_PARAMETER); + this->peer_->reply (retval ACE_ENV_ARG_PARAMETER); } void Peer_Handler_i::request_excep ( AMI_PeerExceptionHolder * excep_holder - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_UNUSED_ARG (excep_holder); - TAO_ENV_ARG_NOT_USED; + ACE_ENV_ARG_NOT_USED; } void -Peer_Handler_i::start (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Peer_Handler_i::start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } void -Peer_Handler_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Peer_Handler_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -63,32 +63,32 @@ void Peer_i::init (CORBA::ORB_ptr orb, Progress_ptr progress, const ACE_Time_Value &delay - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_ = CORBA::ORB::_duplicate (orb); this->progress_ = Progress::_duplicate (progress); this->delay_ = delay; - Peer_var peer = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + Peer_var peer = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "Peer (%P|%t) - binding\n")); - this->id_ = this->progress_->bind (peer.in () TAO_ENV_ARG_PARAMETER); + this->id_ = this->progress_->bind (peer.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void Peer_i::reply (CORBA::Long result - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->progress_->recv_reply (result TAO_ENV_ARG_PARAMETER); + this->progress_->recv_reply (result ACE_ENV_ARG_PARAMETER); } CORBA::Long Peer_i::request (CORBA::Long id - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Time_Value tv = this->delay_; @@ -100,11 +100,11 @@ Peer_i::request (CORBA::Long id void Peer_i::start (const PeerSet &the_peers, CORBA::Long iterations - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { AMI_PeerHandler_var handler = - this->reply_handler_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->reply_handler_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // @@ Report errors as exceptions... @@ -118,10 +118,10 @@ Peer_i::start (const PeerSet &the_peers, } void -Peer_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Peer_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } // **************************************************************** @@ -151,11 +151,11 @@ Peer_Task::svc (void) { this->the_peers_[j]->sendc_request (this->handler_.in (), this->id_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->progress_->sent_request (this->id_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.h b/TAO/examples/AMI/FL_Callback/Peer_i.h index 8f95390f898..c0583be398c 100644 --- a/TAO/examples/AMI/FL_Callback/Peer_i.h +++ b/TAO/examples/AMI/FL_Callback/Peer_i.h @@ -28,17 +28,17 @@ public: // The peer virtual void request (CORBA::Long retval - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void request_excep (AMI_PeerExceptionHolder * excep_holder - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void start (TAO_ENV_SINGLE_ARG_DECL) + virtual void start (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -58,26 +58,26 @@ public: void init (CORBA::ORB_ptr orb, Progress_ptr progress, const ACE_Time_Value &delay - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); void reply (CORBA::Long result - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Used by the Reply_Handler to indicate that a reply has been // received. // = See test.idl for an explanation of these methods. CORBA::Long request (CORBA::Long id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); void start (const PeerSet& the_peers, CORBA::Long iterations - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL) + void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/examples/AMI/FL_Callback/Progress_i.cpp b/TAO/examples/AMI/FL_Callback/Progress_i.cpp index bbadc2933d4..678847e328c 100644 --- a/TAO/examples/AMI/FL_Callback/Progress_i.cpp +++ b/TAO/examples/AMI/FL_Callback/Progress_i.cpp @@ -20,7 +20,7 @@ Progress_i::Progress_i (Progress_Window *window) void Progress_i::sent_request (CORBA::Long id - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { //ACE_DEBUG ((LM_DEBUG, "Progress (%t) - sent request %d\n", id)); @@ -29,7 +29,7 @@ Progress_i::sent_request (CORBA::Long id void Progress_i::recv_reply (CORBA::Long id - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->window_->recv_reply (id); @@ -37,11 +37,11 @@ Progress_i::recv_reply (CORBA::Long id CORBA::Long Progress_i::bind (Peer_ptr a_peer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Progress (%t) - peer bound\n")); - return this->window_->bind (a_peer TAO_ENV_ARG_PARAMETER); + return this->window_->bind (a_peer ACE_ENV_ARG_PARAMETER); } // **************************************************************** @@ -132,7 +132,7 @@ Progress_Window::recv_reply (CORBA::Long id) CORBA::Long Progress_Window::bind (Peer_ptr a_peer - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { CORBA::ULong l = this->peers_.length (); this->peers_.length (l + 1); @@ -155,14 +155,14 @@ Progress_Window::start () if (this->peers_.length () < CORBA::ULong (this->n_peers_)) return; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; for (CORBA::ULong i = 0; i != this->peers_.length (); ++i) { ACE_TRY { this->peers_[i]->start (this->peers_, this->n_iterations_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/AMI/FL_Callback/Progress_i.h b/TAO/examples/AMI/FL_Callback/Progress_i.h index 8ffc57f0aac..e382d928147 100644 --- a/TAO/examples/AMI/FL_Callback/Progress_i.h +++ b/TAO/examples/AMI/FL_Callback/Progress_i.h @@ -37,7 +37,7 @@ public: // Keep track of the progress on each peer CORBA::Long bind (Peer_ptr a_peer - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // One of the peers has bound to the server void start (void); @@ -77,13 +77,13 @@ public: // = The Progress methods. void sent_request (CORBA::Long id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); void recv_reply (CORBA::Long id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Long bind (Peer_ptr a_peer - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/examples/AMI/FL_Callback/peer.cpp b/TAO/examples/AMI/FL_Callback/peer.cpp index 4107d860a18..1bb06563a62 100644 --- a/TAO/examples/AMI/FL_Callback/peer.cpp +++ b/TAO/examples/AMI/FL_Callback/peer.cpp @@ -100,11 +100,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -113,25 +113,25 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var progress_object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Progress_var progress = - Progress::_narrow (progress_object.in () TAO_ENV_ARG_PARAMETER); + Progress::_narrow (progress_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Time_Value delay (0, interval); @@ -140,7 +140,7 @@ main (int argc, char *argv[]) peer.init (orb.in (), progress.in (), delay - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Worker worker (orb.in ()); diff --git a/TAO/examples/AMI/FL_Callback/progress.cpp b/TAO/examples/AMI/FL_Callback/progress.cpp index 715382edd46..8246bf37552 100644 --- a/TAO/examples/AMI/FL_Callback/progress.cpp +++ b/TAO/examples/AMI/FL_Callback/progress.cpp @@ -62,11 +62,11 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -91,7 +91,7 @@ main (int argc, char *argv[]) sw.show (); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -100,24 +100,24 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Progress_i server_impl (&sw); Progress_var server = - server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); diff --git a/TAO/examples/Advanced/ch_12/server.cpp b/TAO/examples/Advanced/ch_12/server.cpp index da02c606a7b..d38195dcebb 100644 --- a/TAO/examples/Advanced/ch_12/server.cpp +++ b/TAO/examples/Advanced/ch_12/server.cpp @@ -564,7 +564,7 @@ preinvoke (const PortableServer::ObjectId & oid, PortableServer::POA_ptr /*poa*/, const char * operation, void * & /*cookie*/ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) throw (CORBA::SystemException, PortableServer::ForwardRequest) { // Convert object id into asset number. diff --git a/TAO/examples/Advanced/ch_12/server.h b/TAO/examples/Advanced/ch_12/server.h index 89b18973856..5aff30fa960 100644 --- a/TAO/examples/Advanced/ch_12/server.h +++ b/TAO/examples/Advanced/ch_12/server.h @@ -190,7 +190,7 @@ public: PortableServer::POA_ptr poa, const char * operation, void * & cookie - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) throw (CORBA::SystemException, PortableServer::ForwardRequest); virtual void @@ -199,7 +199,7 @@ public: const char * /*operation*/, void * /*cookie*/, PortableServer::Servant /*servant*/ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) throw (CORBA::SystemException) {} private: Controller_impl * m_ctrl; diff --git a/TAO/examples/Buffered_AMI/client.cpp b/TAO/examples/Buffered_AMI/client.cpp index bce2bb155d6..84efc422e73 100644 --- a/TAO/examples/Buffered_AMI/client.cpp +++ b/TAO/examples/Buffered_AMI/client.cpp @@ -49,7 +49,7 @@ class Reply_Handler : public POA_AMI_testHandler { public: void method (CORBA::ULong reply_number - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -62,12 +62,12 @@ public: } void method_excep (AMI_testExceptionHolder *holder - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { - holder->raise_method (TAO_ENV_SINGLE_ARG_PARAMETER); + holder->raise_method (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH(CORBA::SystemException, ex) @@ -77,18 +77,18 @@ public: ACE_ENDTRY; } - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } void shutdown_excep (AMI_testExceptionHolder *holder - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { - holder->raise_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + holder->raise_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH(CORBA::SystemException, ex) @@ -178,17 +178,17 @@ parse_args (int argc, char **argv) void setup_buffering_constraints (CORBA::ORB_ptr orb - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Obtain PolicyCurrent. CORBA::Object_var object = orb->resolve_initial_references ("PolicyCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Narrow down to correct type. CORBA::PolicyCurrent_var policy_current = CORBA::PolicyCurrent::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Start off with no constraints. @@ -210,17 +210,17 @@ setup_buffering_constraints (CORBA::ORB_ptr orb buffering_constraint_policy_list[0] = orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE, buffering_constraint_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Setup the constraints (at the ORB level). policy_current->set_policy_overrides (buffering_constraint_policy_list, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // We are done with the policy. - buffering_constraint_policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + buffering_constraint_policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Setup the none sync scope policy, i.e., the ORB will buffer AMI @@ -239,24 +239,24 @@ setup_buffering_constraints (CORBA::ORB_ptr orb sync_none_policy_list[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, sync_none_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Setup the none sync scope (at the ORB level). policy_current->set_policy_overrides (sync_none_policy_list, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // We are now done with these policies. - sync_none_policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + sync_none_policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -265,7 +265,7 @@ main (int argc, char **argv) CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize options based on command-line arguments. @@ -275,39 +275,39 @@ main (int argc, char **argv) CORBA::Object_var base = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (base.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get an object reference from the argument string. base = orb->string_to_object (IOR - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Try to narrow the object reference to a reference. test_var test_object = test::_narrow (base.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Reply_Handler reply_handler_servant; - AMI_testHandler_var reply_handler_object = reply_handler_servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); + AMI_testHandler_var reply_handler_object = reply_handler_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (setup_buffering) { setup_buffering_constraints (orb.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -322,7 +322,7 @@ main (int argc, char **argv) // Invoke the AMI method. test_object->sendc_method (reply_handler_object.in (), i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else @@ -332,7 +332,7 @@ main (int argc, char **argv) // Invoke the regular method. test_object->method (i, reply_number - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -344,7 +344,7 @@ main (int argc, char **argv) ACE_Time_Value sleep_interval (0, interval * 1000); - orb->run (sleep_interval TAO_ENV_ARG_PARAMETER); + orb->run (sleep_interval ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -357,13 +357,13 @@ main (int argc, char **argv) // Shutdown server. if (shutdown_server) { - test_object->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + test_object->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } root_poa->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Destroy the ORB. On some platforms, e.g., Win32, the socket @@ -372,7 +372,7 @@ main (int argc, char **argv) // static destructors to flush the queues, it will be too late. // Therefore, we use explicit destruction here and flush the // queues before main() ends. - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Buffered_AMI/server.cpp b/TAO/examples/Buffered_AMI/server.cpp index e23c785c2e4..61e8cd0bc78 100644 --- a/TAO/examples/Buffered_AMI/server.cpp +++ b/TAO/examples/Buffered_AMI/server.cpp @@ -42,21 +42,21 @@ main (int argc, char *argv[]) CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -65,12 +65,12 @@ main (int argc, char *argv[]) test_i servant (orb.in ()); test_var server = - servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); + servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (server.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -84,17 +84,17 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Buffered_AMI/test_i.cpp b/TAO/examples/Buffered_AMI/test_i.cpp index 2cf8850817b..0b3d8ffd45e 100644 --- a/TAO/examples/Buffered_AMI/test_i.cpp +++ b/TAO/examples/Buffered_AMI/test_i.cpp @@ -12,7 +12,7 @@ test_i::test_i (CORBA::ORB_ptr orb) void test_i::method (CORBA::ULong request_number, CORBA::ULong_out reply_number - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -23,9 +23,9 @@ test_i::method (CORBA::ULong request_number, } void -test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/examples/Buffered_AMI/test_i.h b/TAO/examples/Buffered_AMI/test_i.h index c83114c88d0..e42bb2e1bcd 100644 --- a/TAO/examples/Buffered_AMI/test_i.h +++ b/TAO/examples/Buffered_AMI/test_i.h @@ -30,10 +30,10 @@ public: // = The test interface methods. void method (CORBA::ULong request_number, CORBA::ULong_out reply_number - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/examples/Buffered_Oneways/client.cpp b/TAO/examples/Buffered_Oneways/client.cpp index afd3337e212..5668e5f9c05 100644 --- a/TAO/examples/Buffered_Oneways/client.cpp +++ b/TAO/examples/Buffered_Oneways/client.cpp @@ -115,7 +115,7 @@ parse_args (int argc, char **argv) int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -124,7 +124,7 @@ main (int argc, char **argv) CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize options based on command-line arguments. @@ -135,23 +135,23 @@ main (int argc, char **argv) // Get an object reference from the argument string. CORBA::Object_var base = orb->string_to_object (IOR - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Try to narrow the object reference to a reference. test_var test_object = test::_narrow (base.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain PolicyCurrent. base = orb->resolve_initial_references ("PolicyCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow down to correct type. CORBA::PolicyCurrent_var policy_current = CORBA::PolicyCurrent::_narrow (base.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Setup the none sync scope policy, i.e., the ORB will buffer @@ -170,17 +170,17 @@ main (int argc, char **argv) sync_none_policy_list[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, sync_none_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Setup the none sync scope. policy_current->set_policy_overrides (sync_none_policy_list, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // We are now done with this policy. - sync_none_policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + sync_none_policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Start off with no constraints. @@ -226,13 +226,13 @@ main (int argc, char **argv) buffering_constraint_policy_list[0] = orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE, buffering_constraint_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Setup the constraints. policy_current->set_policy_overrides (buffering_constraint_policy_list, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // @@ -259,7 +259,7 @@ main (int argc, char **argv) buffering_flush_policy_list[0] = orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE, buffering_flush_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // @@ -275,7 +275,7 @@ main (int argc, char **argv) // Setup explicit flushing. policy_current->set_policy_overrides (buffering_flush_policy_list, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -284,13 +284,13 @@ main (int argc, char **argv) // Invoke the oneway method. test_object->method (i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Reset buffering policy. policy_current->set_policy_overrides (buffering_constraint_policy_list, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else @@ -301,7 +301,7 @@ main (int argc, char **argv) // Invoke the oneway method. test_object->method (i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -309,23 +309,23 @@ main (int argc, char **argv) ACE_Time_Value sleep_interval (0, interval * 1000); - orb->run (sleep_interval TAO_ENV_ARG_PARAMETER); + orb->run (sleep_interval ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } // Shutdown server. if (shutdown_server) { - test_object->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + test_object->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } // We are done with the policy. - buffering_constraint_policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + buffering_constraint_policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // We are done with the policy. - buffering_flush_policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + buffering_flush_policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Destroy the ORB. On some platforms, e.g., Win32, the socket @@ -334,7 +334,7 @@ main (int argc, char **argv) // static destructors to flush the queues, it will be too late. // Therefore, we use explicit destruction here and flush the // queues before main() ends. - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Buffered_Oneways/server.cpp b/TAO/examples/Buffered_Oneways/server.cpp index 76e98cac2e8..31d6a5a42af 100644 --- a/TAO/examples/Buffered_Oneways/server.cpp +++ b/TAO/examples/Buffered_Oneways/server.cpp @@ -42,21 +42,21 @@ main (int argc, char *argv[]) CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -65,12 +65,12 @@ main (int argc, char *argv[]) test_i servant (orb.in ()); test_var server = - servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); + servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (server.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -84,17 +84,17 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Buffered_Oneways/test_i.cpp b/TAO/examples/Buffered_Oneways/test_i.cpp index 74b1323a4df..95972fe8939 100644 --- a/TAO/examples/Buffered_Oneways/test_i.cpp +++ b/TAO/examples/Buffered_Oneways/test_i.cpp @@ -11,7 +11,7 @@ test_i::test_i (CORBA::ORB_ptr orb) void test_i::method (CORBA::ULong request_number - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -20,9 +20,9 @@ test_i::method (CORBA::ULong request_number } void -test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/examples/Buffered_Oneways/test_i.h b/TAO/examples/Buffered_Oneways/test_i.h index cbe1b31e777..c8a79e05bb3 100644 --- a/TAO/examples/Buffered_Oneways/test_i.h +++ b/TAO/examples/Buffered_Oneways/test_i.h @@ -29,10 +29,10 @@ public: // = The test interface methods. void method (CORBA::ULong request_number - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp index 647b643db66..4aeab0b4941 100644 --- a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp +++ b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp @@ -161,7 +161,7 @@ Consumer_Handler::parse_args (void) int Consumer_Handler::via_naming_service (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialization of the naming service. @@ -177,14 +177,14 @@ Consumer_Handler::via_naming_service (void) CORBA::Object_var notifier_obj = this->naming_services_client_->resolve (notifier_ref_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // The CORBA::Object_var object is downcast to Notifier_var using // the <_narrow> method. this->server_ = Notifier::_narrow (notifier_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -211,14 +211,14 @@ Consumer_Handler::init (int argc, char **argv) // Register our to handle STDIN events, which will // trigger the method to process these events. - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Retrieve the ORB. this->orb_ = CORBA::ORB_init (this->argc_, this->argv_, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -281,7 +281,7 @@ Consumer_Handler::init (int argc, char **argv) CORBA::Object_var server_object = this->orb_->string_to_object (this->ior_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server_object.in ())) @@ -292,7 +292,7 @@ Consumer_Handler::init (int argc, char **argv) // The downcasting from CORBA::Object_var to Notifier_var is // done using the <_narrow> method. this->server_ = Notifier::_narrow (server_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -312,23 +312,23 @@ int Consumer_Handler::run (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Obtain and activate the RootPOA. CORBA::Object_var obj = - this->orb_->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager= - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_NEW_RETURN (this->consumer_servant_, @@ -339,7 +339,7 @@ Consumer_Handler::run (void) // Get the consumer stub (i.e consumer object) pointer. this->consumer_var_ = - this->consumer_servant_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_servant_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (this->interactive_ == 0) @@ -349,7 +349,7 @@ Consumer_Handler::run (void) this->server_->register_callback (this->stock_name_, this->threshold_value_, this->consumer_var_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Note the registration. @@ -361,7 +361,7 @@ Consumer_Handler::run (void) } // Run the ORB. - this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/examples/Callback_Quoter/Consumer_Input_Handler.cpp b/TAO/examples/Callback_Quoter/Consumer_Input_Handler.cpp index c98a8522314..a06a4267cf3 100644 --- a/TAO/examples/Callback_Quoter/Consumer_Input_Handler.cpp +++ b/TAO/examples/Callback_Quoter/Consumer_Input_Handler.cpp @@ -102,7 +102,7 @@ Consumer_Input_Handler::register_consumer () this->consumer_handler_->threshold_value_ = ACE_OS::atoi (needed_stock_value); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -111,7 +111,7 @@ Consumer_Input_Handler::register_consumer () this->consumer_handler_->server_->register_callback (this->consumer_handler_->stock_name_, this->consumer_handler_->threshold_value_, this->consumer_handler_->consumer_var_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Note the registration. @@ -165,7 +165,7 @@ Consumer_Input_Handler::quit_consumer_process () // Only if the consumer is registered and wants to shut // down, its necessary to unregister and then shutdown. - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -173,9 +173,9 @@ Consumer_Input_Handler::quit_consumer_process () { // If the notifier has exited and the consumer tries to call // the unregister_callback method tehn an execption will be - // raised. Hence check for this case using TAO_ENV_SINGLE_ARG_PARAMETER. + // raised. Hence check for this case using ACE_ENV_SINGLE_ARG_PARAMETER. this->consumer_handler_->server_->unregister_callback (this->consumer_handler_->consumer_var_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -183,7 +183,7 @@ Consumer_Input_Handler::quit_consumer_process () consumer_handler_->unregistered_ = 0; consumer_handler_->registered_ = 0; } - this->consumer_handler_->consumer_servant_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_handler_->consumer_servant_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -196,7 +196,7 @@ Consumer_Input_Handler::quit_consumer_process () ACE_TRY_EX (block1) { - this->consumer_handler_->consumer_servant_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_handler_->consumer_servant_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX (block1); } ACE_CATCHANY diff --git a/TAO/examples/Callback_Quoter/Consumer_Signal_Handler.cpp b/TAO/examples/Callback_Quoter/Consumer_Signal_Handler.cpp index d78291ee729..5fe25a265f6 100644 --- a/TAO/examples/Callback_Quoter/Consumer_Signal_Handler.cpp +++ b/TAO/examples/Callback_Quoter/Consumer_Signal_Handler.cpp @@ -39,7 +39,7 @@ Consumer_Signal_Handler::handle_signal (int /* signum */, " Exiting on receiving ^C\n")); quit_on_signal (); - + return 0; } @@ -66,13 +66,13 @@ Consumer_Signal_Handler::quit_on_signal (void) { if (consumer_handler_->unregistered_ != 1 && consumer_handler_->registered_ == 1) - { - this->consumer_handler_->server_->unregister_callback + { + this->consumer_handler_->server_->unregister_callback (this->consumer_handler_->consumer_var_.in ()); - ACE_DEBUG ((LM_DEBUG, - "Consumer Unregistered\n")); + ACE_DEBUG ((LM_DEBUG, + "Consumer Unregistered\n")); } - this->consumer_handler_->consumer_servant_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_handler_->consumer_servant_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Callback_Quoter/Consumer_i.cpp b/TAO/examples/Callback_Quoter/Consumer_i.cpp index 380ff65ecfe..b892a31372c 100644 --- a/TAO/examples/Callback_Quoter/Consumer_i.cpp +++ b/TAO/examples/Callback_Quoter/Consumer_i.cpp @@ -29,7 +29,7 @@ Consumer_i::~Consumer_i (void) void Consumer_i::push (const Callback_Quoter::Info &data - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // On getting the needed information you now proceed to the next @@ -42,7 +42,7 @@ Consumer_i::push (const Callback_Quoter::Info &data } void -Consumer_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Consumer_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/examples/Callback_Quoter/Consumer_i.h b/TAO/examples/Callback_Quoter/Consumer_i.h index 3e7a28df332..839f2768c6a 100644 --- a/TAO/examples/Callback_Quoter/Consumer_i.h +++ b/TAO/examples/Callback_Quoter/Consumer_i.h @@ -40,11 +40,11 @@ public: // Destructor. void push (const Callback_Quoter::Info & data - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Gets the stock information from the Notifier. - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Used to get the consumer to shut down. diff --git a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp index b117ea3d1ab..edaff2abfee 100644 --- a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp +++ b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp @@ -52,7 +52,7 @@ Notifier_Input_Handler::~Notifier_Input_Handler (void) // the object name is bound to the naming server. int -Notifier_Input_Handler::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) +Notifier_Input_Handler::init_naming_service (ACE_ENV_SINGLE_ARG_DECL) { CORBA::ORB_var orb = this->orb_manager_.orb (); @@ -69,15 +69,15 @@ Notifier_Input_Handler::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) // (re)Bind the object. ACE_TRY { - Notifier_var notifier_obj = notifier_i_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + Notifier_var notifier_obj = notifier_i_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; naming_server_->rebind (notifier_obj_name, notifier_obj.in() - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -142,7 +142,7 @@ Notifier_Input_Handler::parse_args (void) int Notifier_Input_Handler::init (int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Call the init of to initialize the ORB and @@ -154,7 +154,7 @@ Notifier_Input_Handler::init (int argc, if (this->orb_manager_.init_child_poa (this->argc_, this->argv_, "child_poa" - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "init_child_poa"), @@ -187,7 +187,7 @@ Notifier_Input_Handler::init (int argc, CORBA::String_var str = this->orb_manager_.activate_under_child_poa ("Notifier", &this->notifier_i_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, @@ -204,14 +204,14 @@ Notifier_Input_Handler::init (int argc, if (this->using_naming_service_) { - this->init_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER); + this->init_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } return 0; } int -Notifier_Input_Handler::run (TAO_ENV_SINGLE_ARG_DECL) +Notifier_Input_Handler::run (ACE_ENV_SINGLE_ARG_DECL) { // Run the main event loop for the ORB. @@ -219,7 +219,7 @@ Notifier_Input_Handler::run (TAO_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, " Type \"q\" to quit \n ")); - int result = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER); + int result = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (result == -1) @@ -237,7 +237,7 @@ Notifier_Input_Handler::handle_input (ACE_HANDLE) { char buf[BUFSIZ]; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -259,7 +259,7 @@ Notifier_Input_Handler::handle_input (ACE_HANDLE) { // @@ Please remove this call if it's not used. // (this->notifier_i_.consumer_map_).close(); - this->notifier_i_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->notifier_i_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h index 4012a86e4a1..f9b1a091ed6 100644 --- a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h +++ b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h @@ -45,10 +45,10 @@ public: int init (int argc, char *argv[] - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize the Notifier who plays the role of the server here. - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the ORB. virtual int handle_input (ACE_HANDLE); @@ -62,7 +62,7 @@ private: int parse_args (void); // Parses the command line arguments. - int init_naming_service (TAO_ENV_SINGLE_ARG_DECL); + int init_naming_service (ACE_ENV_SINGLE_ARG_DECL); // Initialises the name server and registers the Notifier object // name with the name server. diff --git a/TAO/examples/Callback_Quoter/Notifier_i.cpp b/TAO/examples/Callback_Quoter/Notifier_i.cpp index 470f4bf315b..632820180a4 100644 --- a/TAO/examples/Callback_Quoter/Notifier_i.cpp +++ b/TAO/examples/Callback_Quoter/Notifier_i.cpp @@ -38,7 +38,7 @@ void Notifier_i::register_callback (const char *stock_name, CORBA::Long threshold_value, Callback_Quoter::Consumer_ptr consumer_handler - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Callback_Quoter::Invalid_Stock)) { @@ -107,7 +107,7 @@ Notifier_i::orb (CORBA::ORB_ptr orb) void Notifier_i::unregister_callback (Callback_Quoter::Consumer_ptr consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Callback_Quoter::Invalid_Handle)) { @@ -154,7 +154,7 @@ Notifier_i::unregister_callback (Callback_Quoter::Consumer_ptr consumer void Notifier_i::market_status (const char *stock_name, CORBA::Long stock_value - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -202,7 +202,7 @@ Notifier_i::market_status (const char *stock_name, } void -Notifier_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Notifier_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { if ( this->consumer_map_.close () > 0) diff --git a/TAO/examples/Callback_Quoter/Notifier_i.h b/TAO/examples/Callback_Quoter/Notifier_i.h index d3d326e3e58..9c99934879e 100644 --- a/TAO/examples/Callback_Quoter/Notifier_i.h +++ b/TAO/examples/Callback_Quoter/Notifier_i.h @@ -52,28 +52,28 @@ public: virtual void register_callback (const char *stock_name, CORBA::Long threshold_value, Callback_Quoter::Consumer_ptr consumer_handler - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Callback_Quoter::Invalid_Stock)); // Register a distributed callback handler that is invoked when the // given stock reaches the desired threshold value. virtual void unregister_callback (Callback_Quoter::Consumer_ptr consumer_handler - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Callback_Quoter::Invalid_Handle)); // Remove the consumer object. virtual void market_status (const char *stock_name, CORBA::Long stock_value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the market status. void orb (CORBA::ORB_ptr orb); // Get the orb pointer. - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Shutdown the Notifier. diff --git a/TAO/examples/Callback_Quoter/Supplier_i.cpp b/TAO/examples/Callback_Quoter/Supplier_i.cpp index a01dec538d8..b3b3072d046 100644 --- a/TAO/examples/Callback_Quoter/Supplier_i.cpp +++ b/TAO/examples/Callback_Quoter/Supplier_i.cpp @@ -153,7 +153,7 @@ int Supplier::send_market_status (const char *stock_name, long value) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -161,7 +161,7 @@ Supplier::send_market_status (const char *stock_name, // Make the RMI. this->notifier_->market_status (stock_name, value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) @@ -229,14 +229,14 @@ Supplier::via_naming_service (void) CORBA::Object_var notifier_obj = this->naming_services_client_->resolve (notifier_ref_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // The CORBA::Object_var object is downcast to Notifier_var // using the <_narrow> method. this->notifier_ = Notifier::_narrow (notifier_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) @@ -270,7 +270,7 @@ Supplier::init (int argc, char **argv) this->orb_ = CORBA::ORB_init (this->argc_, this->argv_, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse command line and verify parameters. @@ -294,7 +294,7 @@ Supplier::init (int argc, char **argv) -1); CORBA::Object_var notifier_object = this->orb_->string_to_object (this->ior_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (notifier_object.in ())) @@ -305,7 +305,7 @@ Supplier::init (int argc, char **argv) // The downcasting from CORBA::Object_var to Notifier_var is // done using the <_narrow> method. this->notifier_ = Notifier::_narrow (notifier_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) diff --git a/TAO/examples/Callback_Quoter/notifier.cpp b/TAO/examples/Callback_Quoter/notifier.cpp index 246f16e2ccd..44f07d70cd1 100644 --- a/TAO/examples/Callback_Quoter/notifier.cpp +++ b/TAO/examples/Callback_Quoter/notifier.cpp @@ -14,17 +14,17 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "\n\tNotifier\n\n")); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - int rc = notifier.init (argc, argv TAO_ENV_ARG_PARAMETER); + int rc = notifier.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (rc == -1) return 1; else { - notifier.run (TAO_ENV_SINGLE_ARG_PARAMETER); + notifier.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp index a382f854632..9e64c8a1409 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp @@ -26,7 +26,7 @@ Content_Iterator_i::~Content_Iterator_i (void) CORBA::Boolean Content_Iterator_i::next_chunk (CORBA::ULong offset, Web_Server::Chunk_Type_out chunk - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Initialize/allocate the Chunk_Type sequence @@ -105,23 +105,23 @@ Content_Iterator_i::next_chunk (CORBA::ULong offset, } void -Content_Iterator_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +Content_Iterator_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { (void) this->file_io_.close (); // Get the POA used when activating the Content_Iterator object. PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Get the object ID associated with this servant. PortableServer::ObjectId_var oid = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Now deactivate the iterator object. - poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Decrease the reference count on our selves. diff --git a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h index edf2fae0b71..bff3baf702a 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h +++ b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h @@ -63,12 +63,12 @@ public: virtual CORBA::Boolean next_chunk (CORBA::ULong offset, Web_Server::Chunk_Type_out chunk - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This operation returns the next of the file starting at // . If there are no more bindings, false is returned. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Destroy the iterator. 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 b7bac2b09f6..50062c1baf1 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp @@ -12,7 +12,7 @@ void Iterator_Factory_i::get_iterator (const char *pathname, Web_Server::Content_Iterator_out contents, Web_Server::Metadata_Type_out metadata - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result)) { ACE_DEBUG ((LM_DEBUG, @@ -44,7 +44,7 @@ Iterator_Factory_i::get_iterator (const char *pathname, // Activate the Content_Iterator object. Web_Server::Content_Iterator_var iterator = - iterator_servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + iterator_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Web_Server::Metadata_Type *tmp = 0; diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h index 71599ff6347..93584967c63 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h +++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h @@ -45,7 +45,7 @@ public: virtual void get_iterator (const char *pathname, Web_Server::Content_Iterator_out contents, Web_Server::Metadata_Type_out metadata - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result)); // This factory method returns a that can be used diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp index 46f896a5c8c..faa76c5bd5e 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp @@ -30,7 +30,7 @@ Iterator_Handler::~Iterator_Handler (void) void Iterator_Handler::next_chunk (CORBA::Boolean pending_data, const Web_Server::Chunk_Type &chunk_data - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (pending_data) @@ -53,7 +53,7 @@ Iterator_Handler::next_chunk (CORBA::Boolean pending_data, this->contents_->sendc_next_chunk (this->ami_handler_.in (), this->offset_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -67,7 +67,7 @@ Iterator_Handler::next_chunk (CORBA::Boolean pending_data, // Done with the iterator, so destroy it. this->contents_->sendc_destroy (this->ami_handler_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // File retrieval has completed, so spawn an external viewer to @@ -77,11 +77,11 @@ Iterator_Handler::next_chunk (CORBA::Boolean pending_data, } } void -Iterator_Handler::destroy (TAO_ENV_SINGLE_ARG_DECL) +Iterator_Handler::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Deactivate this reply handler. - this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -90,7 +90,7 @@ void Iterator_Handler::run (int *request_count, const char *pathname, Web_Server::Iterator_Factory_ptr factory - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result)) { @@ -102,17 +102,17 @@ Iterator_Handler::run (int *request_count, // Initialize the Content Iterator this->initialize_content_iterator (pathname, factory - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Activate this Reply Handler. - this->ami_handler_ = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->ami_handler_ = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Begin the asynchronous invocation. this->contents_->sendc_next_chunk (this->ami_handler_.in (), this->offset_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -120,7 +120,7 @@ void Iterator_Handler::initialize_content_iterator (const char *pathname, Web_Server::Iterator_Factory_ptr factory - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result)) { @@ -128,7 +128,7 @@ Iterator_Handler::initialize_content_iterator factory->get_iterator (pathname, this->contents_, this->metadata_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Create a temporary file to store the retrieved data. @@ -149,21 +149,21 @@ Iterator_Handler::initialize_content_iterator } void -Iterator_Handler::deactivate (TAO_ENV_SINGLE_ARG_DECL) +Iterator_Handler::deactivate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Get the POA used when activating the Reply Handler object. PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Get the object ID associated with this servant. PortableServer::ObjectId_var oid = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Now deactivate the iterator object. - poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h index e64986ca215..2aee54552da 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h +++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h @@ -64,26 +64,26 @@ public: virtual void next_chunk (CORBA::Boolean pending_data, const Web_Server::Chunk_Type & chunk - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void next_chunk_excep ( Web_Server::AMI_Content_IteratorExceptionHolder * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) {} - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void destroy_excep ( Web_Server::AMI_Content_IteratorExceptionHolder * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) {} void run (int *request_count, const char *pathname, Web_Server::Iterator_Factory_ptr factory - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result)); // Activate and run this Reply Handler. The contents (not the @@ -98,12 +98,12 @@ private: void initialize_content_iterator (const char *pathname, Web_Server::Iterator_Factory_ptr factory - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result)); // Initialize the Content Iterator used to retrieve the file. - void deactivate (TAO_ENV_SINGLE_ARG_DECL) + void deactivate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Deactivate this reply handler. diff --git a/TAO/examples/Content_Server/AMI_Iterator/client.cpp b/TAO/examples/Content_Server/AMI_Iterator/client.cpp index 3ac86a85b96..756603eaf7a 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/client.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/client.cpp @@ -13,19 +13,19 @@ ACE_RCSID (AMI_Iterator, client, "$Id$") // Obtain reference to Iterator_Factory Web_Server::Iterator_Factory_ptr get_iterator (CORBA::ORB_ptr orb - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Perform file requests void invoke_requests (int argc, char *argv[], int *request_count, Web_Server::Iterator_Factory_ptr f - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { if (argc < 2) @@ -37,28 +37,28 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "Mighty ORB" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the Root POA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Activate the POA manager. PortableServer::POAManager_var mgr = poa->the_POAManager (); - mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get an Iterator_Factory reference. Web_Server::Iterator_Factory_var factory = ::get_iterator (orb.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (factory.in ())) @@ -80,7 +80,7 @@ main (int argc, char *argv[]) argv, &request_count, factory.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Run the ORB event loop. @@ -88,22 +88,22 @@ main (int argc, char *argv[]) { CORBA::Boolean more_work; - more_work = orb->work_pending (TAO_ENV_SINGLE_ARG_PARAMETER); + more_work = orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (more_work) { - orb->perform_work (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } else ACE_OS::sleep (tv); } - orb->shutdown (0 TAO_ENV_ARG_PARAMETER); + orb->shutdown (0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (Web_Server::Error_Result, exc) @@ -131,19 +131,19 @@ main (int argc, char *argv[]) Web_Server::Iterator_Factory_ptr get_iterator (CORBA::ORB_ptr o - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::ORB_var orb = CORBA::ORB::_duplicate (o); // Get a reference to the Name Service. CORBA::Object_var obj = orb->resolve_initial_references ("NameService" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Web_Server::Iterator_Factory::_nil ()); // Narrow to a Naming Context CosNaming::NamingContext_var nc = - CosNaming::NamingContext::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Web_Server::Iterator_Factory::_nil ()); if (CORBA::is_nil (obj.in ())) @@ -159,7 +159,7 @@ get_iterator (CORBA::ORB_ptr o name[0].id = CORBA::string_dup ("Iterator_Factory"); name[0].kind = CORBA::string_dup (""); - obj = nc->resolve (name TAO_ENV_ARG_PARAMETER); + obj = nc->resolve (name ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Web_Server::Iterator_Factory::_nil ()); Web_Server::Iterator_Factory_ptr factory = @@ -172,7 +172,7 @@ void invoke_requests (int argc, char *argv[], int *request_count, Web_Server::Iterator_Factory_ptr f - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Web_Server::Iterator_Factory_var factory = Web_Server::Iterator_Factory::_duplicate (f); @@ -195,7 +195,7 @@ void invoke_requests (int argc, handler->run (request_count, argv[i + 1], factory.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/examples/Content_Server/AMI_Iterator/server.cpp b/TAO/examples/Content_Server/AMI_Iterator/server.cpp index c711edf8594..fab8f391270 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/server.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/server.cpp @@ -13,46 +13,46 @@ ACE_RCSID (AMI_Iterator, server, "$Id$") int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "Mighty ORB" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the Root POA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Activate the POA manager. PortableServer::POAManager_var mgr = poa->the_POAManager (); - mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Create the Iterator_Factory servant and object. // It activates and deactivates the Content_Iterator object. Iterator_Factory_i factory_servant; Web_Server::Iterator_Factory_var factory = - factory_servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); + factory_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get a reference to the Name Service. obj = orb->resolve_initial_references ("NameService" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow to a Naming Context CosNaming::NamingContext_var nc = - CosNaming::NamingContext::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create a name. @@ -61,12 +61,12 @@ main (int argc, char *argv[]) name[0].id = CORBA::string_dup ("Iterator_Factory"); name[0].kind = CORBA::string_dup (""); - nc->bind (name, factory.in () TAO_ENV_ARG_PARAMETER); + nc->bind (name, factory.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Some debugging output. CORBA::String_var IOR = orb->object_to_string (factory.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Bound <%s> to <%s> in Name Service.\n"), @@ -77,7 +77,7 @@ main (int argc, char *argv[]) ACE_TEXT ("Accepting requests.\n"))); // Accept requests. - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp index 61774035f58..d26e6b5569c 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp @@ -28,12 +28,12 @@ Callback_Handler::~Callback_Handler (void) } void -Callback_Handler::next_chunk (TAO_ENV_SINGLE_ARG_DECL) +Callback_Handler::next_chunk (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->last_chunk_ == 1) { - this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; return; @@ -80,25 +80,25 @@ Callback_Handler::next_chunk (TAO_ENV_SINGLE_ARG_DECL) this->callback_->sendc_next_chunk (this->ami_handler_.in (), this->chunk_.in (), this->last_chunk_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void Callback_Handler::next_chunk_excep (Web_Server::AMI_CallbackExceptionHolder *excep_holder - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->last_chunk_ = 1; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - excep_holder->raise_next_chunk (TAO_ENV_SINGLE_ARG_PARAMETER); + excep_holder->raise_next_chunk (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -111,27 +111,27 @@ Callback_Handler::next_chunk_excep } void -Callback_Handler::run (TAO_ENV_SINGLE_ARG_DECL) +Callback_Handler::run (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result)) { // Open the file to be downloaded - this->open_file (TAO_ENV_SINGLE_ARG_PARAMETER); + this->open_file (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Activate this Reply Handler. - this->ami_handler_ = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->ami_handler_ = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Begin the asynchronous invocation. Note that the AMI // "sendc_next_chunk()" call is done within the following call, // since data must first be read into the Chunk. - this->next_chunk (TAO_ENV_SINGLE_ARG_PARAMETER); + this->next_chunk (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Callback_Handler::open_file (TAO_ENV_SINGLE_ARG_DECL) +Callback_Handler::open_file (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result)) { @@ -149,23 +149,23 @@ Callback_Handler::open_file (TAO_ENV_SINGLE_ARG_DECL) } void -Callback_Handler::deactivate (TAO_ENV_SINGLE_ARG_DECL) +Callback_Handler::deactivate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Close the file that was sent to the client. (void) this->file_io_.close (); // Get the POA used when activating the Reply Handler object. - PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Get the object ID associated with this servant. PortableServer::ObjectId_var oid = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Now deactivate the AMI_CallbackHandler object. - poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h index fe87b50c854..d65c2968650 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h +++ b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h @@ -87,15 +87,15 @@ public: // Constructor that creates a content iterator corresponding to the // name of the file being retrieved from the web server. - virtual void next_chunk (TAO_ENV_SINGLE_ARG_DECL) + virtual void next_chunk (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // The callback for this reply handler. virtual void next_chunk_excep (Web_Server::AMI_CallbackExceptionHolder * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void run (TAO_ENV_SINGLE_ARG_DECL) + void run (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result)); // Activate and run this Reply Handler. The contents (not the @@ -108,12 +108,12 @@ private: // Destructor (private to ensure that Callback_Handler is allocated // on the heap). - void open_file (TAO_ENV_SINGLE_ARG_DECL) + void open_file (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result)); // Open the file to be uploaded to the client callback. - void deactivate (TAO_ENV_SINGLE_ARG_DECL) + void deactivate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Deactivate this reply handler. diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp index a6299288c56..2f52e21c41c 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp @@ -47,7 +47,7 @@ Callback_i::~Callback_i (void) void Callback_i::next_chunk (const Web_Server::Chunk_Type & chunk_data, CORBA::Boolean last_chunk - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (!last_chunk) @@ -93,7 +93,7 @@ Callback_i::next_chunk (const Web_Server::Chunk_Type & chunk_data, if (this->metadata_received ()) { (void) this->file_io_.close (); - this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; (void) this->spawn_viewer (); @@ -104,7 +104,7 @@ Callback_i::next_chunk (const Web_Server::Chunk_Type & chunk_data, void Callback_i::metadata (const Web_Server::Metadata_Type &metadata) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { { @@ -126,7 +126,7 @@ Callback_i::metadata (const Web_Server::Metadata_Type &metadata) // an external viewer to display it. if (this->content_received ()) { - this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; (void) this->spawn_viewer (); @@ -273,19 +273,19 @@ Callback_i::spawn_viewer (void) } void -Callback_i::deactivate (TAO_ENV_SINGLE_ARG_DECL) +Callback_i::deactivate (ACE_ENV_SINGLE_ARG_DECL) { // Get the POA used when activating the Reply Handler object. - PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Get the object ID associated with this servant. PortableServer::ObjectId_var oid = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Now deactivate the iterator object. - poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_i.h b/TAO/examples/Content_Server/AMI_Observer/Callback_i.h index 7a9ea118094..19625ed64a8 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Callback_i.h +++ b/TAO/examples/Content_Server/AMI_Observer/Callback_i.h @@ -72,7 +72,7 @@ public: virtual void next_chunk (const Web_Server::Chunk_Type &chunk, CORBA::Boolean last_chunk - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This operation returns the next of the file starting at // . If there are no more bindings, false is returned. @@ -102,7 +102,7 @@ private: private: - void deactivate (TAO_ENV_SINGLE_ARG_DECL); + void deactivate (ACE_ENV_SINGLE_ARG_DECL); // Deactivate this Callback servant. private: 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 aa7b3e0e064..ba648843736 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 @@ -12,7 +12,7 @@ Web_Server::Metadata_Type * Push_Iterator_Factory_i::register_callback (const char *pathname, Web_Server::Callback_ptr client_callback - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result)) { if (CORBA::is_nil (client_callback)) // @@ Will it ever be nil? @@ -43,7 +43,7 @@ Push_Iterator_Factory_i::register_callback PortableServer::ServantBase_var tmp (handler); // Start sending data to the client callback object. - handler->run (TAO_ENV_SINGLE_ARG_PARAMETER); + handler->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_stat file_status; diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.h b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.h index ee2d114c915..4870062e7e9 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.h +++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.h @@ -53,7 +53,7 @@ public: Web_Server::Metadata_Type *register_callback (const char *pathname, Web_Server::Callback_ptr client_callback - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result)); // This registration method passes a that the Web server diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp index f2b0cee21e2..96a7b7c0b88 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp @@ -26,13 +26,13 @@ Push_Iterator_Handler::~Push_Iterator_Handler (void) void Push_Iterator_Handler::register_callback (const Web_Server::Metadata_Type &metadata - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->callback_servant_->metadata (metadata); // This handler is no longer needed, so deactivate it. - this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -40,7 +40,7 @@ void Push_Iterator_Handler::run (int *request_count, const char *pathname, Web_Server::Iterator_Factory_ptr factory - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result)) { @@ -54,37 +54,37 @@ Push_Iterator_Handler::run (int *request_count, // Activate the Callback. this->callback_ = - this->callback_servant_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->callback_servant_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Activate this Reply Handler. this->ami_handler_ = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Register the client callback with the server asynchronously. factory->sendc_register_callback (this->ami_handler_.in (), pathname, this->callback_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -Push_Iterator_Handler::deactivate (TAO_ENV_SINGLE_ARG_DECL) +Push_Iterator_Handler::deactivate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Get the POA used when activating the Reply Handler object. - PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Get the object ID associated with this servant. PortableServer::ObjectId_var oid = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Now deactivate the AMI_CallbackHandler object. - poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h index caa91026a62..e1b04c94f5a 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h +++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h @@ -73,7 +73,7 @@ public: void run (int *request_count, const char *pathname, Web_Server::Iterator_Factory_ptr factory - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result)); // Activate and run this Reply Handler. The contents (not the @@ -89,17 +89,17 @@ private: virtual void register_callback (const Web_Server::Metadata_Type &metadata - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // AMI callback that is invoked when a response from the // corresponding server method is received. virtual void register_callback_excep (Web_Server::AMI_Iterator_FactoryExceptionHolder * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) {} - void deactivate (TAO_ENV_SINGLE_ARG_DECL) + void deactivate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Deactivate this handler. diff --git a/TAO/examples/Content_Server/AMI_Observer/client.cpp b/TAO/examples/Content_Server/AMI_Observer/client.cpp index 306a86b7910..9c0465ac1c1 100644 --- a/TAO/examples/Content_Server/AMI_Observer/client.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/client.cpp @@ -13,19 +13,19 @@ ACE_RCSID (AMI_Observer, client, "$Id$") // Obtain reference to Iterator_Factory Web_Server::Iterator_Factory_ptr get_iterator (CORBA::ORB_ptr orb - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Perform file requests void invoke_requests (int argc, char *argv[], int *request_count, Web_Server::Iterator_Factory_ptr f - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { if (argc < 2) @@ -38,28 +38,28 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "Mighty ORB" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the Root POA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Activate the POA manager. PortableServer::POAManager_var mgr = poa->the_POAManager (); - mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get an Iterator_Factory reference. Web_Server::Iterator_Factory_var factory = ::get_iterator (orb.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (factory.in ())) @@ -81,7 +81,7 @@ main (int argc, char *argv[]) argv, &request_count, factory.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // 1 millisecond delay to reduce "busy waiting" in ORB event @@ -93,22 +93,22 @@ main (int argc, char *argv[]) { CORBA::Boolean more_work; - more_work = orb->work_pending (TAO_ENV_SINGLE_ARG_PARAMETER); + more_work = orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (more_work) { - orb->perform_work (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } else ACE_OS::sleep (tv); } - orb->shutdown (0 TAO_ENV_ARG_PARAMETER); + orb->shutdown (0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - //orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + //orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); //ACE_TRY_CHECK; } ACE_CATCH (Web_Server::Error_Result, exc) @@ -136,19 +136,19 @@ main (int argc, char *argv[]) Web_Server::Iterator_Factory_ptr get_iterator (CORBA::ORB_ptr o - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::ORB_var orb = CORBA::ORB::_duplicate (o); // Get a reference to the Name Service. CORBA::Object_var obj = orb->resolve_initial_references ("NameService" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Web_Server::Iterator_Factory::_nil ()); // Narrow to a Naming Context CosNaming::NamingContext_var nc = - CosNaming::NamingContext::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Web_Server::Iterator_Factory::_nil ()); if (CORBA::is_nil (obj.in ())) @@ -164,7 +164,7 @@ get_iterator (CORBA::ORB_ptr o name[0].id = CORBA::string_dup ("Push_Iterator_Factory"); name[0].kind = CORBA::string_dup (""); - obj = nc->resolve (name TAO_ENV_ARG_PARAMETER); + obj = nc->resolve (name ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Web_Server::Iterator_Factory::_nil ()); Web_Server::Iterator_Factory_ptr factory = @@ -177,7 +177,7 @@ void invoke_requests (int argc, char *argv[], int *request_count, Web_Server::Iterator_Factory_ptr f - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Web_Server::Iterator_Factory_var factory = Web_Server::Iterator_Factory::_duplicate (f); @@ -200,7 +200,7 @@ void invoke_requests (int argc, handler->run (request_count, argv[i + 1], factory.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/examples/Content_Server/AMI_Observer/server.cpp b/TAO/examples/Content_Server/AMI_Observer/server.cpp index 5a59ffd5e91..55854e56c83 100644 --- a/TAO/examples/Content_Server/AMI_Observer/server.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/server.cpp @@ -12,45 +12,45 @@ ACE_RCSID (AMI_Observer, server, "$Id$") int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "Mighty ORB" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the Root POA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Activate the POA manager. PortableServer::POAManager_var mgr = poa->the_POAManager (); - mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Create the Iterator_Factory servant and object. Push_Iterator_Factory_i factory_servant; Web_Server::Iterator_Factory_var factory = - factory_servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); + factory_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get a reference to the Name Service. obj = orb->resolve_initial_references ("NameService" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow to a Naming Context CosNaming::NamingContext_var nc = - CosNaming::NamingContext::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create a name. @@ -59,12 +59,12 @@ main (int argc, char *argv[]) name[0].id = CORBA::string_dup ("Push_Iterator_Factory"); name[0].kind = CORBA::string_dup (""); - nc->bind (name, factory.in () TAO_ENV_ARG_PARAMETER); + nc->bind (name, factory.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Some debugging output. CORBA::String_var IOR = orb->object_to_string (factory.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Bound <%s> to <%s> in Name Service.\n"), @@ -75,7 +75,7 @@ main (int argc, char *argv[]) ACE_TEXT ("Accepting requests.\n"))); // Accept requests. - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp index ffa637debb2..1f60aaaea0f 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp +++ b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp @@ -27,7 +27,7 @@ Content_Iterator_i::~Content_Iterator_i (void) CORBA::Boolean Content_Iterator_i::next_chunk (CORBA::ULong offset, Web_Server::Chunk_Type_out chunk - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Initialize/allocate the Chunk_Type sequence @@ -117,23 +117,23 @@ Content_Iterator_i::next_chunk (CORBA::ULong offset, } void -Content_Iterator_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +Content_Iterator_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { (void) this->file_io_.close (); // Get the POA used when activating the Content_Iterator object. - PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Get the object ID associated with this servant. PortableServer::ObjectId_var oid = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Now deactivate the iterator object. - poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Decrease the reference count on our selves. diff --git a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h index 09bbfa3ddc0..5dbc57a999b 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h +++ b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h @@ -63,12 +63,12 @@ public: virtual CORBA::Boolean next_chunk (CORBA::ULong offset, Web_Server::Chunk_Type_out chunk - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This operation returns the next of the file starting at // . If there are no more bindings, false is returned. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Destroy the iterator. 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 4257ddb5581..9fc9c724f24 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp +++ b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp @@ -12,7 +12,7 @@ void Iterator_Factory_i::get_iterator (const char *pathname, Web_Server::Content_Iterator_out contents, Web_Server::Metadata_Type_out metadata - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result)) { ACE_DEBUG ((LM_DEBUG, @@ -50,7 +50,7 @@ Iterator_Factory_i::get_iterator (const char *pathname, // Activate the Content_Iterator object. Web_Server::Content_Iterator_var iterator = - iterator_servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + iterator_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Web_Server::Metadata_Type *tmp = 0; diff --git a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h index adad7bc5b1e..5b879e0dd85 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h +++ b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h @@ -47,7 +47,7 @@ public: virtual void get_iterator (const char *pathname, Web_Server::Content_Iterator_out contents, Web_Server::Metadata_Type_out metadata - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result)); // This factory method returns a that can be used diff --git a/TAO/examples/Content_Server/SMI_Iterator/client.cpp b/TAO/examples/Content_Server/SMI_Iterator/client.cpp index c6c3e47d613..7c8cb92ce27 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/client.cpp +++ b/TAO/examples/Content_Server/SMI_Iterator/client.cpp @@ -14,7 +14,7 @@ ACE_RCSID(SMI_Iterator, client, "$Id$") // Retrieve the data from the server int retrieve_data (const char *content_type, Web_Server::Content_Iterator_ptr contents - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Map content type to viewer. @@ -29,7 +29,7 @@ int spawn_viewer (const char *content_type, int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { if (argc < 2) @@ -41,18 +41,18 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "Mighty ORB" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get a reference to the Name Service. CORBA::Object_var obj = orb->resolve_initial_references ("NameService" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow to a Naming Context CosNaming::NamingContext_var nc = - CosNaming::NamingContext::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (obj.in ())) @@ -69,7 +69,7 @@ main (int argc, char *argv[]) name[0].id = CORBA::string_dup ("Iterator_Factory"); name[0].kind = CORBA::string_dup (""); - obj = nc->resolve (name TAO_ENV_ARG_PARAMETER); + obj = nc->resolve (name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Now narrow to an Iterator_Factory reference. @@ -93,7 +93,7 @@ main (int argc, char *argv[]) factory->get_iterator (pathname, contents, metadata - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_INFO, @@ -107,20 +107,20 @@ main (int argc, char *argv[]) int result = ::retrieve_data (metadata->content_type.in (), contents.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) return -1; // Done with the Content_Iterator, so destroy it. - contents->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + contents->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->shutdown (0 TAO_ENV_ARG_PARAMETER); + orb->shutdown (0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - // orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + // orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); // ACE_TRY_CHECK; } ACE_CATCH (Web_Server::Error_Result, exc) @@ -149,7 +149,7 @@ main (int argc, char *argv[]) int retrieve_data (const char *content_type, Web_Server::Content_Iterator_ptr iterator - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Web_Server::Content_Iterator_var contents = Web_Server::Content_Iterator::_duplicate (iterator); @@ -179,7 +179,7 @@ int retrieve_data (const char *content_type, for (;;) { - rc = contents->next_chunk (offset, chunk TAO_ENV_ARG_PARAMETER); + rc = contents->next_chunk (offset, chunk ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (!rc) diff --git a/TAO/examples/Content_Server/SMI_Iterator/server.cpp b/TAO/examples/Content_Server/SMI_Iterator/server.cpp index 0ff14a044c1..733b3e71dfc 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/server.cpp +++ b/TAO/examples/Content_Server/SMI_Iterator/server.cpp @@ -13,46 +13,46 @@ ACE_RCSID(SMI_Iterator, server, "$Id$") int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "Mighty ORB" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the Root POA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Activate the POA manager. PortableServer::POAManager_var mgr = poa->the_POAManager (); - mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Create the Iterator_Factory servant and object. // It activates and deactivates the Content_Iterator object. Iterator_Factory_i factory_servant; Web_Server::Iterator_Factory_var factory = - factory_servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); + factory_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get a reference to the Name Service. obj = orb->resolve_initial_references ("NameService" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow to a Naming Context CosNaming::NamingContext_var nc; - nc = CosNaming::NamingContext::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + nc = CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create a name. @@ -61,12 +61,12 @@ main (int argc, char *argv[]) name[0].id = CORBA::string_dup ("Iterator_Factory"); name[0].kind = CORBA::string_dup (""); - nc->bind (name, factory.in () TAO_ENV_ARG_PARAMETER); + nc->bind (name, factory.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Some debugging output. CORBA::String_var IOR = orb->object_to_string (factory.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Bound <%s> to <%s> in Name Service.\n"), @@ -77,7 +77,7 @@ main (int argc, char *argv[]) ACE_TEXT ("Accepting requests.\n"))); // Accept requests. - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Event_Comm/Consumer_Handler.cpp b/TAO/examples/Event_Comm/Consumer_Handler.cpp index cc5c529d9ca..b71951cf34b 100644 --- a/TAO/examples/Event_Comm/Consumer_Handler.cpp +++ b/TAO/examples/Event_Comm/Consumer_Handler.cpp @@ -39,24 +39,24 @@ Consumer_Handler::init (int argc, this->orb_ = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = this->orb_->resolve_initial_references("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = PortableServer::POA::_narrow (poa_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Save the Shutdown callback. @@ -67,7 +67,7 @@ Consumer_Handler::init (int argc, // Start the servant. this->receiver_ = - this->receiver_i_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->receiver_i_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -80,7 +80,7 @@ Consumer_Handler::init (int argc, // Subscribe ourselves with the notifier's broker. this->notifier_->subscribe (this->receiver_.in (), filtering_criteria - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_CATCHANY { @@ -111,14 +111,14 @@ Consumer_Handler::get_notifier (void) CORBA::Object_var notifier_obj = this->naming_services_client_->resolve (notifier_ref_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // The CORBA::Object_var object is downcast to Notifier_var // using the <_narrow> method. this->notifier_ = Event_Comm::Notifier::_narrow (notifier_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -153,10 +153,10 @@ Consumer_Handler::run (void) "Running the Consumer...\n")); // Run the ORB. - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp b/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp index 56c065f735e..697408dfa36 100644 --- a/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp +++ b/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp @@ -55,7 +55,7 @@ Consumer_Input_Handler::close (void) if (notifier != 0) notifier->unsubscribe (receiver, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -138,7 +138,7 @@ Consumer_Input_Handler::handle_input (ACE_HANDLE h) event.tag_ = ACE_OS::strdup (buf); - notifier->push (event TAO_ENV_ARG_PARAMETER); + notifier->push (event ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Event_Comm/Event_Comm_i.cpp b/TAO/examples/Event_Comm/Event_Comm_i.cpp index ece9cc4de9f..d9d7cad9412 100644 --- a/TAO/examples/Event_Comm/Event_Comm_i.cpp +++ b/TAO/examples/Event_Comm/Event_Comm_i.cpp @@ -157,7 +157,7 @@ The filtering criteria will not work.\n")); void Notifier_i::subscribe (Event_Comm::Consumer_ptr consumer_ref, const char *filtering_criteria - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, Event_Comm::Notifier::CannotSubscribe @@ -219,7 +219,7 @@ Notifier_i::subscribe (Event_Comm::Consumer_ptr consumer_ref, void Notifier_i::unsubscribe (Event_Comm::Consumer_ptr consumer_ref, const char *filtering_criteria - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, Event_Comm::Notifier::CannotUnsubscribe @@ -275,7 +275,7 @@ Notifier_i::unsubscribe (Event_Comm::Consumer_ptr consumer_ref, void Notifier_i::disconnect (const char *reason - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -302,7 +302,7 @@ Notifier_i::disconnect (const char *reason ACE_TRY { consumer_ref->disconnect (reason - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -330,7 +330,7 @@ Notifier_i::disconnect (const char *reason void Notifier_i::push (const Event_Comm::Event &event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -368,7 +368,7 @@ Notifier_i::push (const Event_Comm::Event &event ACE_TRY { consumer_ref->push (event - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -405,7 +405,7 @@ Consumer_i::~Consumer_i (void) void Consumer_i::push (const Event_Comm::Event &event - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { const char *tmpstr = event.tag_; @@ -420,7 +420,7 @@ Consumer_i::push (const Event_Comm::Event &event void Consumer_i::disconnect (const char *reason - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/examples/Event_Comm/Event_Comm_i.h b/TAO/examples/Event_Comm/Event_Comm_i.h index ec27c355bab..e58adc4da1d 100644 --- a/TAO/examples/Event_Comm/Event_Comm_i.h +++ b/TAO/examples/Event_Comm/Event_Comm_i.h @@ -57,12 +57,12 @@ public: // set the to use when quitting. virtual void push (const Event_Comm::Event & event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Pass the to the . virtual void disconnect (const char * reason - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Disconnect the from the , giving it the @@ -94,19 +94,19 @@ public: // Initialize a Notifier_i object with the specified size hint. virtual void disconnect (const char *reason - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Disconnect all the receivers, giving them the . virtual void push (const Event_Comm::Event &event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Send the to all the consumers who have subscribed and who // match the filtering criteria. virtual void subscribe (Event_Comm::Consumer_ptr Consumer, const char * filtering_criteria - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, Event_Comm::Notifier::CannotSubscribe @@ -116,7 +116,7 @@ public: void unsubscribe (Event_Comm::Consumer *consumer, const char *filtering_criteria - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, Event_Comm::Notifier::CannotUnsubscribe diff --git a/TAO/examples/Event_Comm/Notifier_Handler.cpp b/TAO/examples/Event_Comm/Notifier_Handler.cpp index f540f1fd367..b2cb6b53f94 100644 --- a/TAO/examples/Event_Comm/Notifier_Handler.cpp +++ b/TAO/examples/Event_Comm/Notifier_Handler.cpp @@ -91,24 +91,24 @@ Notifier_Handler::init (int argc, this->orb_ = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = this->orb_->resolve_initial_references("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = PortableServer::POA::_narrow (poa_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialization of the naming service. @@ -125,7 +125,7 @@ Notifier_Handler::init (int argc, CORBA::Object_var notifier_obj = this->naming_client_->resolve (notifier_ref_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -133,7 +133,7 @@ Notifier_Handler::init (int argc, // using the <_narrow> method. this->notifier_ = Event_Comm::Notifier::_narrow (notifier_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Event_Comm/Notifier_Server.cpp b/TAO/examples/Event_Comm/Notifier_Server.cpp index 40451d57576..fb57174dff1 100644 --- a/TAO/examples/Event_Comm/Notifier_Server.cpp +++ b/TAO/examples/Event_Comm/Notifier_Server.cpp @@ -28,7 +28,7 @@ Notifier_Server::close (void) { // disconnect all the consumers. this->servant_.disconnect ("notifier shutdown." - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Name the object. @@ -38,7 +38,7 @@ Notifier_Server::close (void) CORBA::string_dup (NOTIFIER_BIND_NAME); this->naming_server_->unbind (notifier_obj_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Instruct the ORB to shutdown. @@ -57,7 +57,7 @@ Notifier_Server::close (void) // the object name is bound to the naming server. int -Notifier_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) +Notifier_Server::init_naming_service (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { @@ -76,7 +76,7 @@ Notifier_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) // Register the object implementation with the POA. Event_Comm::Notifier_var notifier_obj = - this->servant_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->servant_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Name the object. @@ -89,7 +89,7 @@ Notifier_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) // Now, attach the object name to the context. this->naming_server_->bind (notifier_obj_name, notifier_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -108,7 +108,7 @@ Notifier_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) int Notifier_Server::init (int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Call the init of to initialize the ORB and // create the child poa under the root POA. @@ -116,7 +116,7 @@ Notifier_Server::init (int argc, if (this->orb_manager_.init_child_poa (argc, argv, "child_poa" - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", @@ -124,26 +124,26 @@ Notifier_Server::init (int argc, -1); ACE_CHECK_RETURN (-1); - this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Activate the servant in the POA. CORBA::String_var str = this->orb_manager_.activate_under_child_poa (NOTIFIER_BIND_NAME, &this->servant_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); - return this->init_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->init_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER); } int -Notifier_Server::run (TAO_ENV_SINGLE_ARG_DECL) +Notifier_Server::run (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "Running the notifier server...\n")); // Run the main event loop for the ORB. - this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; diff --git a/TAO/examples/Event_Comm/Notifier_Server.h b/TAO/examples/Event_Comm/Notifier_Server.h index 8f09294582d..e5f3f38b8e1 100644 --- a/TAO/examples/Event_Comm/Notifier_Server.h +++ b/TAO/examples/Event_Comm/Notifier_Server.h @@ -35,10 +35,10 @@ public: ~Notifier_Server (void); // Destructor. - int init (int argc, char *argv[] TAO_ENV_ARG_DECL); + int init (int argc, char *argv[] ACE_ENV_ARG_DECL); // Initialize the Server state. - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the orb. int close (void); @@ -48,7 +48,7 @@ public: // Reactor accessor. private: - int init_naming_service (TAO_ENV_SINGLE_ARG_DECL); + int init_naming_service (ACE_ENV_SINGLE_ARG_DECL); // Initialises the name server and registers the Notifier server // object name with the name server. diff --git a/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp b/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp index 64953cb2dbb..73847bd2ce9 100644 --- a/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp +++ b/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp @@ -109,7 +109,7 @@ Supplier_Input_Handler::handle_input (ACE_HANDLE) // reference... event.value_ = ... // Forward to all . - notifier->push (event TAO_ENV_ARG_PARAMETER); + notifier->push (event ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Event_Comm/notifier.cpp b/TAO/examples/Event_Comm/notifier.cpp index bb8ea19c6fb..8e348b1df5b 100644 --- a/TAO/examples/Event_Comm/notifier.cpp +++ b/TAO/examples/Event_Comm/notifier.cpp @@ -22,7 +22,7 @@ Notifier::run (void) { ACE_TRY_NEW_ENV { - ns_.run (TAO_ENV_SINGLE_ARG_PARAMETER); + ns_.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -36,7 +36,7 @@ Notifier::Notifier (int argc, char *argv[]) { ACE_TRY_NEW_ENV { - ns_.init (argc, argv TAO_ENV_ARG_PARAMETER); + ns_.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Load_Balancing/Identity_Client.cpp b/TAO/examples/Load_Balancing/Identity_Client.cpp index 70f499475d3..4fb31825759 100644 --- a/TAO/examples/Load_Balancing/Identity_Client.cpp +++ b/TAO/examples/Load_Balancing/Identity_Client.cpp @@ -73,12 +73,12 @@ Identity_Client::init (int argc, { int result; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { result = this->orb_manager_.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) return result; @@ -100,7 +100,7 @@ Identity_Client::init (int argc, } int -Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL) +Identity_Client::run (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "Identity_Client: Initialized \n")); @@ -108,11 +108,11 @@ Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL) CORBA::ORB_var orb = orb_manager_.orb (); CORBA::Object_var obj = orb->string_to_object (this->group_factory_ior_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); Load_Balancer::Object_Group_Factory_var factory = Load_Balancer::Object_Group_Factory::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (factory.in ())) @@ -131,11 +131,11 @@ Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL) "with id <%s>\n", group_name)); Load_Balancer::Object_Group_var object_group = factory->resolve (group_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // List 's id. - CORBA::String_var id = object_group->id (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var id = object_group->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (ACE_OS::strcmp (id.in (), group_name) != 0) @@ -150,7 +150,7 @@ Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL) group_name)); Load_Balancer::Member_ID_List_var id_list = - object_group->members (TAO_ENV_SINGLE_ARG_PARAMETER); + object_group->members (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, @@ -177,11 +177,11 @@ Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL) for (size_t ind = 0; ind < this->number_of_invocations_; ++ind) { - obj = object_group->resolve (TAO_ENV_SINGLE_ARG_PARAMETER); + obj = object_group->resolve (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); identity_object = Identity::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (identity_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -189,7 +189,7 @@ Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL) " to \n"), -1); identity_object->get_name (identity.out () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } @@ -212,10 +212,10 @@ main (int argc, char *argv[]) if (client.init (argc, argv) == -1) return 1; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - result = client.run (TAO_ENV_SINGLE_ARG_PARAMETER); + result = client.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Load_Balancing/Identity_Client.h b/TAO/examples/Load_Balancing/Identity_Client.h index 86b76d1bfc3..371c41c17bd 100644 --- a/TAO/examples/Load_Balancing/Identity_Client.h +++ b/TAO/examples/Load_Balancing/Identity_Client.h @@ -54,7 +54,7 @@ public: int init (int argc, char *argv[]); // Initializes , and parses commandline arguments. - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // See TITLE. private: diff --git a/TAO/examples/Load_Balancing/Identity_Server.cpp b/TAO/examples/Load_Balancing/Identity_Server.cpp index 27640d49433..dfc94035395 100644 --- a/TAO/examples/Load_Balancing/Identity_Server.cpp +++ b/TAO/examples/Load_Balancing/Identity_Server.cpp @@ -69,12 +69,12 @@ Identity_Server::init (int argc, { int result; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { result = this->orb_manager_.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) return result; @@ -89,11 +89,11 @@ Identity_Server::init (int argc, CORBA::ORB_var orb = orb_manager_.orb (); CORBA::Object_var obj = orb->string_to_object (this->group_factory_ior_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Load_Balancer::Object_Group_Factory_var factory = Load_Balancer::Object_Group_Factory::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (factory.in ())) @@ -108,7 +108,7 @@ Identity_Server::init (int argc, Load_Balancer::Object_Group_var random_group = factory->make_random ("Identity, Random" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -117,7 +117,7 @@ Identity_Server::init (int argc, Load_Balancer::Object_Group_var rr_group = factory->make_round_robin ("Identity, Round Robin" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create the requested number of objects, and @@ -130,7 +130,7 @@ Identity_Server::init (int argc, random_objects_)); create_objects (random_objects_, random_group.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -139,7 +139,7 @@ Identity_Server::init (int argc, random_objects_)); create_objects (rr_objects_, rr_group.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -156,7 +156,7 @@ Identity_Server::init (int argc, void Identity_Server::create_objects (size_t number_of_objects, Load_Balancer::Object_Group_ptr group - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Create the specified number of servants, and register each one // with the provided . @@ -176,29 +176,29 @@ Identity_Server::create_objects (size_t number_of_objects, ACE_CHECK; PortableServer::ServantBase_var s = identity_servant; orb_manager_.activate (identity_servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; Load_Balancer::Member member; member.id = CORBA::string_dup (id); - member.obj = identity_servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + member.obj = identity_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Bind the servant in the . - group->bind (member TAO_ENV_ARG_PARAMETER); + group->bind (member ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } int -Identity_Server::run (TAO_ENV_SINGLE_ARG_DECL) +Identity_Server::run (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "Identity_Server: Initialized \n")); int result; - result = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER); + result = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return result; @@ -217,10 +217,10 @@ main (int argc, char *argv[]) if (server.init (argc, argv) == -1) return 1; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - result = server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + result = server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Load_Balancing/Identity_Server.h b/TAO/examples/Load_Balancing/Identity_Server.h index 698d5c89806..5b9249f8fac 100644 --- a/TAO/examples/Load_Balancing/Identity_Server.h +++ b/TAO/examples/Load_Balancing/Identity_Server.h @@ -49,7 +49,7 @@ public: // Performs all the initializations necessary before going into the // ORB event loop. - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the server. private: @@ -58,7 +58,7 @@ private: void create_objects (size_t number_of_objects, Load_Balancer::Object_Group_ptr group - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Creates the specified number of identity objects, and registers // each one with the provided . Identity servants are // given names diff --git a/TAO/examples/Load_Balancing/Identity_i.cpp b/TAO/examples/Load_Balancing/Identity_i.cpp index ff364494541..69a168f2e63 100644 --- a/TAO/examples/Load_Balancing/Identity_i.cpp +++ b/TAO/examples/Load_Balancing/Identity_i.cpp @@ -25,7 +25,7 @@ Identity_i::~Identity_i (void) void Identity_i::get_name (CORBA::String_out name - TAO_ENV_ARG_DECL_NOT_USED ) + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { name = this->name_.in (); diff --git a/TAO/examples/Load_Balancing/Identity_i.h b/TAO/examples/Load_Balancing/Identity_i.h index 281ca40f138..568f798f1b5 100644 --- a/TAO/examples/Load_Balancing/Identity_i.h +++ b/TAO/examples/Load_Balancing/Identity_i.h @@ -37,7 +37,7 @@ public: // Destructor. virtual void get_name (CORBA::String_out name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns the name of this object. diff --git a/TAO/examples/Load_Balancing/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing/Load_Balancer_i.cpp index 9bc3e9a90ba..78537a45bd4 100644 --- a/TAO/examples/Load_Balancing/Load_Balancer_i.cpp +++ b/TAO/examples/Load_Balancing/Load_Balancer_i.cpp @@ -33,30 +33,30 @@ Object_Group_Factory_i::remove_group (const ACE_CString &id, Load_Balancer::Object_Group_ptr Object_Group_Factory_i::make_round_robin (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)) { return make_group (0, id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } Load_Balancer::Object_Group_ptr Object_Group_Factory_i::make_random (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)) { return make_group (1, id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } Load_Balancer::Object_Group_ptr Object_Group_Factory_i::make_group (int random, const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)) { @@ -89,10 +89,10 @@ Object_Group_Factory_i::make_group (int random, ACE_Auto_Basic_Ptr temp (group_servant); // Register with the poa, begin using ref. counting. - group = group_servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + group = group_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (group._retn ()); - group_servant->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + group_servant->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (Load_Balancer::Object_Group::_nil ()); temp.release (); @@ -123,7 +123,7 @@ Object_Group_Factory_i::make_group (int random, Load_Balancer::Object_Group_ptr Object_Group_Factory_i::resolve (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_group)) { @@ -140,7 +140,7 @@ Object_Group_Factory_i::resolve (const char * id Load_Balancer::Group_List * Object_Group_Factory_i::list_groups (int random - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Load_Balancer::Group_List * list; @@ -181,17 +181,17 @@ Object_Group_Factory_i::list_groups (int random } Load_Balancer::Group_List * -Object_Group_Factory_i::round_robin_groups (TAO_ENV_SINGLE_ARG_DECL) +Object_Group_Factory_i::round_robin_groups (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return list_groups (0 TAO_ENV_ARG_PARAMETER); + return list_groups (0 ACE_ENV_ARG_PARAMETER); } Load_Balancer::Group_List * -Object_Group_Factory_i::random_groups (TAO_ENV_SINGLE_ARG_DECL) +Object_Group_Factory_i::random_groups (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return list_groups (1 TAO_ENV_ARG_PARAMETER); + return list_groups (1 ACE_ENV_ARG_PARAMETER); } Object_Group_i::Object_Group_i (const char * id, @@ -214,7 +214,7 @@ Object_Group_i::~Object_Group_i (void) } char * -Object_Group_i::id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Object_Group_i::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (id_.c_str ()); @@ -222,7 +222,7 @@ Object_Group_i::id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Object_Group_i::bind (const Load_Balancer::Member & member - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_member)) { @@ -257,7 +257,7 @@ Object_Group_i::bind (const Load_Balancer::Member & member void Object_Group_i::unbind (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)) { @@ -287,7 +287,7 @@ Object_Group_i::unbind (const char * id CORBA::Object_ptr Object_Group_i::resolve_with_id (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)) { @@ -302,7 +302,7 @@ Object_Group_i::resolve_with_id (const char * id } Load_Balancer::Member_ID_List * -Object_Group_i::members (TAO_ENV_SINGLE_ARG_DECL) +Object_Group_i::members (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Load_Balancer::Member_ID_List * list; @@ -331,21 +331,21 @@ Object_Group_i::members (TAO_ENV_SINGLE_ARG_DECL) } void -Object_Group_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +Object_Group_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Deregister with POA. PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -366,18 +366,18 @@ Random_Object_Group::~Random_Object_Group (void) } void -Random_Object_Group::destroy (TAO_ENV_SINGLE_ARG_DECL) +Random_Object_Group::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { //Deregisters this with its // . my_factory_->remove_group (id_, 1); - Object_Group_i::destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + Object_Group_i::destroy (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::Object_ptr -Random_Object_Group::resolve (TAO_ENV_SINGLE_ARG_DECL) +Random_Object_Group::resolve (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)) { @@ -416,18 +416,18 @@ RR_Object_Group::~RR_Object_Group (void) } void -RR_Object_Group::destroy (TAO_ENV_SINGLE_ARG_DECL) +RR_Object_Group::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { //Deregisters this with its // . my_factory_->remove_group (id_, 0); - Object_Group_i::destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + Object_Group_i::destroy (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::Object_ptr -RR_Object_Group::resolve (TAO_ENV_SINGLE_ARG_DECL) +RR_Object_Group::resolve (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)) { @@ -459,7 +459,7 @@ RR_Object_Group::resolve (TAO_ENV_SINGLE_ARG_DECL) void RR_Object_Group::unbind (const char *id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)) { diff --git a/TAO/examples/Load_Balancing/Load_Balancer_i.h b/TAO/examples/Load_Balancing/Load_Balancer_i.h index cf997db1d6c..55a649c273e 100644 --- a/TAO/examples/Load_Balancing/Load_Balancer_i.h +++ b/TAO/examples/Load_Balancing/Load_Balancer_i.h @@ -59,7 +59,7 @@ public: // = Load_Balancer::Object_Group_Factory idl methods. Load_Balancer::Object_Group_ptr make_round_robin (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)); // Creates an that resolves requests for arbitrary @@ -69,7 +69,7 @@ public: // exception is thrown. Load_Balancer::Object_Group_ptr make_random (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)); // Creates an that resolves requests for arbitrary @@ -79,21 +79,21 @@ public: // exception is thrown. Load_Balancer::Object_Group_ptr resolve (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_group)); // Locates and returns an by its . If // no has of , throw a // exception. - Load_Balancer::Group_List * round_robin_groups (TAO_ENV_SINGLE_ARG_DECL) + Load_Balancer::Group_List * round_robin_groups (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Lists all the round robin s which were created // by this factory, and haven't been destroyed yet, i.e., return // a sequence of s of all existing round robin // s created by this factory. - Load_Balancer::Group_List * random_groups (TAO_ENV_SINGLE_ARG_DECL) + Load_Balancer::Group_List * random_groups (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Lists all the random s which were created // by this factory, and haven't been destroyed yet, i.e., return @@ -116,7 +116,7 @@ private: Load_Balancer::Object_Group_ptr make_group (int random, const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)); // This function factors out common code in and @@ -124,7 +124,7 @@ private: // set to 1 and round robin if it is 0. Load_Balancer::Group_List * list_groups (int random - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // This function factors out common code in and // . Returns a sequence of its random // groups if parameter is set to 1 and a sequence of its @@ -170,12 +170,12 @@ public: // = Load_Balancer::Object_Group idl methods. - char * id (TAO_ENV_SINGLE_ARG_DECL) + char * id (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get group's id. void bind (const Load_Balancer::Member & member - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_member)); // Adds a new to the . Note that each @@ -184,14 +184,14 @@ public: // exceptions is thrown. void unbind (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)); // Removes a member with the specified from the // . If none of the group's members have a // Member_ID of , exception is thrown. - CORBA::Object_ptr resolve (TAO_ENV_SINGLE_ARG_DECL) + CORBA::Object_ptr resolve (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)) = 0; // Returns a member object from this in accordance with @@ -200,18 +200,18 @@ public: // exception is thrown. CORBA::Object_ptr resolve_with_id (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)); // Returns an object with the specified . If this // contains no members with the specified // , exception is thrown. - Load_Balancer::Member_ID_List * members (TAO_ENV_SINGLE_ARG_DECL) + Load_Balancer::Member_ID_List * members (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Return a sequence of s of all of its members. - void destroy (TAO_ENV_SINGLE_ARG_DECL) + void destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Cleanup the resources associated with this . // Subsequent calls to this should fail, and its @@ -265,13 +265,13 @@ public: ~Random_Object_Group (void); // Destructor. - CORBA::Object_ptr resolve (TAO_ENV_SINGLE_ARG_DECL) + CORBA::Object_ptr resolve (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)); // Returns a member object from this in accordance with // the "random" load balancing policy. - void destroy (TAO_ENV_SINGLE_ARG_DECL) + void destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Cleanup the resources associated with this . // Subsequent calls to this should fail, and its @@ -295,20 +295,20 @@ public: // Destructor. void unbind (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)); // We need to override the implementation of from // Object_Group_i to make sure // works correctly. - CORBA::Object_ptr resolve (TAO_ENV_SINGLE_ARG_DECL) + CORBA::Object_ptr resolve (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)); // Returns a member object from this in accordance with // the "round robin" load balancing policy. - void destroy (TAO_ENV_SINGLE_ARG_DECL) + void destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Cleanup the resources associated with this . // Subsequent calls to this should fail, and its diff --git a/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp b/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp index 9011b0d388d..fc4df170ef7 100644 --- a/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp +++ b/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp @@ -65,12 +65,12 @@ Load_Balancing_Service::init (int argc, int result; CORBA::String_var ior; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { result = this->orb_manager_.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) return result; @@ -87,7 +87,7 @@ Load_Balancing_Service::init (int argc, -1); PortableServer::ServantBase_var s = factory_servant; ior = orb_manager_.activate (factory_servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ior.in () == 0) @@ -118,14 +118,14 @@ Load_Balancing_Service::init (int argc, int -Load_Balancing_Service::run (TAO_ENV_SINGLE_ARG_DECL) +Load_Balancing_Service::run (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "Load_Balancer: Initialized \n")); int result; - result = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER); + result = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return result; @@ -144,10 +144,10 @@ main (int argc, char *argv[]) if (factory.init (argc, argv) == -1) return 1; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - result = factory.run (TAO_ENV_SINGLE_ARG_PARAMETER); + result = factory.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Load_Balancing/Load_Balancing_Service.h b/TAO/examples/Load_Balancing/Load_Balancing_Service.h index c9aea348aa8..eb42bb8375a 100644 --- a/TAO/examples/Load_Balancing/Load_Balancing_Service.h +++ b/TAO/examples/Load_Balancing/Load_Balancing_Service.h @@ -44,7 +44,7 @@ public: // Initialize the : initializes the ORB, parses // arguments, creates a servant ... - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the server. private: diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp index 5f58ee660d2..d8843235965 100755 --- a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp +++ b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp @@ -82,7 +82,7 @@ Identity_Client::init (int argc, { result = this->orb_manager_.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) return result; @@ -104,13 +104,13 @@ Identity_Client::init (int argc, } int -Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL) +Identity_Client::run (ACE_ENV_SINGLE_ARG_DECL) { // Contact the to obtain an . CORBA::ORB_var orb = orb_manager_.orb (); CORBA::Object_var obj = orb->string_to_object (this->group_factory_ior_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (obj.in () == 0) @@ -121,7 +121,7 @@ Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL) Load_Balancer::Object_Group_Factory_var factory = Load_Balancer::Object_Group_Factory::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (factory.in ())) @@ -157,7 +157,7 @@ Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL) // Remote call object_group = factory->resolve (group_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::String_var iorstring = @@ -187,13 +187,13 @@ Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL) } // List 's id. - CORBA::String_var id = object_group->id (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var id = object_group->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, "Object Group's id is: %s\n\n", id.in ())); // List all s members. Load_Balancer::Member_ID_List_var id_list = - object_group->members (TAO_ENV_SINGLE_ARG_PARAMETER); + object_group->members (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, "The group contains %d members:\n", @@ -211,15 +211,15 @@ Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL) for (size_t ind = 0; ind < this->number_of_invocations_; ++ind) { - objref = object_group->resolve (TAO_ENV_SINGLE_ARG_PARAMETER); + objref = object_group->resolve (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); obj = orb->string_to_object (objref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); identity_object = Identity::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (identity_object.in ())) @@ -256,7 +256,7 @@ main (int argc, char *argv[]) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - result = client.run (TAO_ENV_SINGLE_ARG_PARAMETER); + result = client.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Client.h b/TAO/examples/Load_Balancing_persistent/Identity_Client.h index 64c168016e4..ceafcc5067f 100755 --- a/TAO/examples/Load_Balancing_persistent/Identity_Client.h +++ b/TAO/examples/Load_Balancing_persistent/Identity_Client.h @@ -54,7 +54,7 @@ public: int init (int argc, char *argv[]); // Initializes , and parses commandline arguments. - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // See TITLE. private: diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp index 3857e58845d..5b2aa19c32a 100755 --- a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp +++ b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp @@ -62,7 +62,7 @@ Identity_Server::init (int argc, { result = this->orb_manager_.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) return result; @@ -73,19 +73,19 @@ Identity_Server::init (int argc, // Lifespan policy policies[0] = this->orb_manager_.root_poa()->create_lifespan_policy (PortableServer::PERSISTENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policies[1] = this->orb_manager_.root_poa()->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->persistent_POA_ = this->orb_manager_.root_poa()->create_POA ("persistent_server", this->orb_manager_.poa_manager (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -94,7 +94,7 @@ Identity_Server::init (int argc, i < policies.length (); ++i) { - policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -112,7 +112,7 @@ Identity_Server::init (int argc, } int -Identity_Server::register_groups (TAO_ENV_SINGLE_ARG_DECL) +Identity_Server::register_groups (ACE_ENV_SINGLE_ARG_DECL) { @@ -122,12 +122,12 @@ Identity_Server::register_groups (TAO_ENV_SINGLE_ARG_DECL) CORBA::ORB_var orb = orb_manager_.orb (); CORBA::Object_var obj = orb->string_to_object (this->group_factory_ior_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); Load_Balancer::Object_Group_Factory_var factory = Load_Balancer::Object_Group_Factory::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (factory.in ())) @@ -141,7 +141,7 @@ Identity_Server::register_groups (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY_EX (UNBIND_RANDOM) { factory->unbind_random ("Random group" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (UNBIND_RANDOM); } ACE_CATCHANY @@ -155,7 +155,7 @@ Identity_Server::register_groups (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY_EX (UNBIND_ROUND) { factory->unbind_round_robin ("Round Robin group" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (UNBIND_ROUND); } ACE_CATCHANY @@ -169,12 +169,12 @@ Identity_Server::register_groups (TAO_ENV_SINGLE_ARG_DECL) // We want to make two groups Random & Round Robin. Load_Balancer::Object_Group_var random_group = factory->make_random ("Random group" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); Load_Balancer::Object_Group_var rr_group = factory->make_round_robin ("Round Robin group" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); @@ -183,13 +183,13 @@ Identity_Server::register_groups (TAO_ENV_SINGLE_ARG_DECL) // s. this->create_objects (random_objects_, random_group.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->create_objects (rr_objects_, rr_group.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -198,7 +198,7 @@ Identity_Server::register_groups (TAO_ENV_SINGLE_ARG_DECL) void Identity_Server::create_objects (size_t number_of_objects, Load_Balancer::Object_Group_ptr group - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Create the specified number of servants, and register each one // with the provided . @@ -218,23 +218,23 @@ Identity_Server::create_objects (size_t number_of_objects, ACE_CHECK; PortableServer::ServantBase_var s = identity_servant; - this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::Object_var obj = identity_servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Object_var obj = identity_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Load_Balancer::Member member; member.id = CORBA::string_dup (id); member.obj = this->orb_manager_.orb ()->object_to_string (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Do an unbind and then bind ACE_TRY_EX (UNBIND) { - group->unbind (id TAO_ENV_ARG_PARAMETER); + group->unbind (id ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (UNBIND); } ACE_CATCHANY @@ -245,18 +245,18 @@ Identity_Server::create_objects (size_t number_of_objects, ACE_ENDTRY; // Bind the servant in the random . - group->bind (member TAO_ENV_ARG_PARAMETER); + group->bind (member ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } int - Identity_Server::run (TAO_ENV_SINGLE_ARG_DECL) + Identity_Server::run (ACE_ENV_SINGLE_ARG_DECL) { int result; - result = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER); + result = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return result; @@ -282,10 +282,10 @@ main (int argc, char *argv[]) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - result = server.register_groups (TAO_ENV_SINGLE_ARG_PARAMETER); + result = server.register_groups (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - result = server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + result = server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Server.h b/TAO/examples/Load_Balancing_persistent/Identity_Server.h index 7ee31f5fd29..d9f69946a5d 100755 --- a/TAO/examples/Load_Balancing_persistent/Identity_Server.h +++ b/TAO/examples/Load_Balancing_persistent/Identity_Server.h @@ -52,10 +52,10 @@ public: // Performs all the initializations necessary before going into the // ORB event loop. - int register_groups (TAO_ENV_SINGLE_ARG_DECL); + int register_groups (ACE_ENV_SINGLE_ARG_DECL); - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the server. private: @@ -63,7 +63,7 @@ private: void create_objects (size_t number_of_objects, Load_Balancer::Object_Group_ptr group - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Creates the specified number of identity objects, and registers // each one with the provided . Identity servants are // given names diff --git a/TAO/examples/Load_Balancing_persistent/Identity_i.cpp b/TAO/examples/Load_Balancing_persistent/Identity_i.cpp index 16ac105669f..5c8d6b0b57d 100755 --- a/TAO/examples/Load_Balancing_persistent/Identity_i.cpp +++ b/TAO/examples/Load_Balancing_persistent/Identity_i.cpp @@ -27,14 +27,14 @@ Identity_i::~Identity_i (void) void Identity_i::get_name (CORBA::String_out name - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { name = this->name_.in (); } PortableServer::POA_ptr -Identity_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Identity_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->poa_.in ()); diff --git a/TAO/examples/Load_Balancing_persistent/Identity_i.h b/TAO/examples/Load_Balancing_persistent/Identity_i.h index 0e381b99b4c..1a7df37cfbc 100755 --- a/TAO/examples/Load_Balancing_persistent/Identity_i.h +++ b/TAO/examples/Load_Balancing_persistent/Identity_i.h @@ -38,11 +38,11 @@ public: // Destructor. virtual void get_name (CORBA::String_out name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns the name of this object. - PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL) + PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Method for the POA that will return the persistent POA_ptr stored // in here.. diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp index 8448a84b8c6..30bb0dd6831 100755 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp @@ -39,7 +39,7 @@ Object_Group_Factory_i::~Object_Group_Factory_i (void) } PortableServer::POA_ptr -Object_Group_Factory_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Object_Group_Factory_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->poa_.in ()); @@ -48,7 +48,7 @@ Object_Group_Factory_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) Load_Balancer::Object_Group_ptr Object_Group_Factory_i::make_round_robin (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)) { @@ -74,12 +74,12 @@ Object_Group_Factory_i::make_round_robin (const char * id return this->make_group (0, id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void Object_Group_Factory_i::unbind_round_robin (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_group)) { @@ -120,7 +120,7 @@ Object_Group_Factory_i::unbind_round_robin (const char * id Load_Balancer::Object_Group_ptr Object_Group_Factory_i::make_random (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)) { @@ -146,13 +146,13 @@ Object_Group_Factory_i::make_random (const char * id return this->make_group (1, id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void Object_Group_Factory_i::unbind_random (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_group)) { @@ -193,7 +193,7 @@ Object_Group_Factory_i::unbind_random (const char * id Load_Balancer::Object_Group_ptr Object_Group_Factory_i::make_group (int random, const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)) { @@ -237,15 +237,15 @@ Object_Group_Factory_i::make_group (int random, ACE_CHECK_RETURN (group._retn ()); // Register with the poa, begin using ref. counting. - group = group_servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + group = group_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (group._retn ()); - group_servant->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + group_servant->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (Load_Balancer::Object_Group::_nil ()); CORBA::String_var ior = this->orb_->object_to_string (group.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Load_Balancer::Object_Group::_nil ()); @@ -287,7 +287,7 @@ Object_Group_Factory_i::make_group (int random, // Update the value of flags_ this->update_flags (random - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Load_Balancer::Object_Group::_nil ()); if (result == -1) @@ -309,7 +309,7 @@ Object_Group_Factory_i::make_group (int random, Load_Balancer::Object_Group_ptr Object_Group_Factory_i::resolve (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_group)) { @@ -358,7 +358,7 @@ Object_Group_Factory_i::resolve (const char * id { this->mem_pool_->find (flags_name_bind, (void *&)this->flags_); - this->update_objects (TAO_ENV_SINGLE_ARG_PARAMETER); + this->update_objects (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (Load_Balancer::Object_Group::_nil ()); } @@ -375,12 +375,12 @@ Object_Group_Factory_i::resolve (const char * id CORBA_Object_var objref = this->orb_->string_to_object (ior - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Load_Balancer::Object_Group::_nil ()); Load_Balancer::Object_Group_ptr object_group = Load_Balancer::Object_Group::_narrow (objref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Load_Balancer::Object_Group::_nil ()); @@ -403,7 +403,7 @@ Object_Group_Factory_i::resolve (const char * id Load_Balancer::Group_List * Object_Group_Factory_i::list_groups (int random - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Load_Balancer::Group_List * list; @@ -444,23 +444,23 @@ Object_Group_Factory_i::list_groups (int random } Load_Balancer::Group_List * -Object_Group_Factory_i::round_robin_groups (TAO_ENV_SINGLE_ARG_DECL) +Object_Group_Factory_i::round_robin_groups (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return list_groups (0 TAO_ENV_ARG_PARAMETER); + return list_groups (0 ACE_ENV_ARG_PARAMETER); } Load_Balancer::Group_List * -Object_Group_Factory_i::random_groups (TAO_ENV_SINGLE_ARG_DECL) +Object_Group_Factory_i::random_groups (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return list_groups (1 TAO_ENV_ARG_PARAMETER); + return list_groups (1 ACE_ENV_ARG_PARAMETER); } void Object_Group_Factory_i::update_flags (int random - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { //First check whether we have memory for flags_ if (!this->flags_) @@ -503,7 +503,7 @@ Object_Group_Factory_i::update_flags (int random } void -Object_Group_Factory_i::update_objects (TAO_ENV_SINGLE_ARG_DECL) +Object_Group_Factory_i::update_objects (ACE_ENV_SINGLE_ARG_DECL) { // Create an appropriate servant. Object_Group_i * group_servant = 0; @@ -583,7 +583,7 @@ Object_Group_i::~Object_Group_i (void) PortableServer::POA_ptr -Object_Group_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Object_Group_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->poa_.in ()); @@ -591,7 +591,7 @@ Object_Group_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) char * -Object_Group_i::id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Object_Group_i::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (id_.c_str ()); @@ -599,14 +599,14 @@ Object_Group_i::id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Object_Group_i::bind (const Load_Balancer::Member & member - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_member)) { if (this->members_ == 0) { - ACE_CString id = this->id (TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_CString id = this->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; id += server_id_name_bind; @@ -665,7 +665,7 @@ Object_Group_i::bind (const Load_Balancer::Member & member // member's id into . ACE_CString id = dll_name_bind; - id += this->id (TAO_ENV_SINGLE_ARG_PARAMETER); + id += this->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; @@ -699,14 +699,14 @@ Object_Group_i::bind (const Load_Balancer::Member & member void Object_Group_i::unbind (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)) { // Check whether the this->member_ is NULL if (this->members_ == 0) { - ACE_CString id = this->id (TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_CString id = this->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; id += server_id_name_bind; @@ -729,7 +729,7 @@ Object_Group_i::unbind (const char * id if (this->member_id_list_ == 0) { ACE_CString id = dll_name_bind; - id += this->id (TAO_ENV_SINGLE_ARG_PARAMETER); + id += this->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->allocator_->find (id.c_str (), @@ -753,7 +753,7 @@ Object_Group_i::unbind (const char * id char * Object_Group_i::resolve_with_id (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)) { @@ -773,12 +773,12 @@ Object_Group_i::resolve_with_id (const char * id } Load_Balancer::Member_ID_List * -Object_Group_i::members (TAO_ENV_SINGLE_ARG_DECL) +Object_Group_i::members (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Load_Balancer::Member_ID_List * list = 0; - this->read_from_memory (TAO_ENV_SINGLE_ARG_PARAMETER); + this->read_from_memory (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Figure out the length of the list. @@ -807,29 +807,29 @@ Object_Group_i::members (TAO_ENV_SINGLE_ARG_DECL) } void -Object_Group_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +Object_Group_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Deregister with POA. PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -Object_Group_i::read_from_memory (TAO_ENV_SINGLE_ARG_DECL) +Object_Group_i::read_from_memory (ACE_ENV_SINGLE_ARG_DECL) { // Sanity check needs to be done in all the places - ACE_CString id = this->id (TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_CString id = this->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (!this->members_) @@ -848,7 +848,7 @@ Object_Group_i::read_from_memory (TAO_ENV_SINGLE_ARG_DECL) if (!this->member_id_list_) { id = dll_name_bind; - id += this->id (TAO_ENV_SINGLE_ARG_PARAMETER); + id += this->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->allocator_->find (id.c_str (), @@ -871,12 +871,12 @@ Random_Object_Group::Random_Object_Group (const char *id, } char * -Random_Object_Group::resolve (TAO_ENV_SINGLE_ARG_DECL) +Random_Object_Group::resolve (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)) { - this->read_from_memory (TAO_ENV_SINGLE_ARG_PARAMETER); + this->read_from_memory (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); size_t group_size = this->members_->current_size (); @@ -911,13 +911,13 @@ RR_Object_Group::RR_Object_Group (const char *id, } char * -RR_Object_Group::resolve (TAO_ENV_SINGLE_ARG_DECL) +RR_Object_Group::resolve (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)) { char *objref = 0; - this->read_from_memory (TAO_ENV_SINGLE_ARG_PARAMETER); + this->read_from_memory (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); size_t group_size = this->members_->current_size (); @@ -949,14 +949,14 @@ RR_Object_Group::resolve (TAO_ENV_SINGLE_ARG_DECL) void RR_Object_Group::unbind (const char *id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)) { if (this->members_ == 0) { - ACE_CString id = this->id (TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_CString id = this->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; id += server_id_name_bind; @@ -982,7 +982,7 @@ RR_Object_Group::unbind (const char *id if (this->member_id_list_ == 0) { ACE_CString id = dll_name_bind; - id += this->id (TAO_ENV_SINGLE_ARG_PARAMETER); + id += this->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->allocator_->find (id.c_str (), diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h index 5bc65fba26d..7eff01186b3 100755 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h @@ -66,7 +66,7 @@ public: // Destructor. - PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL) + PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Method for the POA that will return the persistent POA_ptr stored // in here.. @@ -74,7 +74,7 @@ public: // = Load_Balancer::Object_Group_Factory idl methods. Load_Balancer::Object_Group_ptr make_round_robin (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)); // Creates an that resolves requests for arbitrary @@ -84,13 +84,13 @@ public: // exception is thrown. void unbind_round_robin (const char *id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_group)); Load_Balancer::Object_Group_ptr make_random (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)); // Creates an that resolves requests for arbitrary @@ -100,26 +100,26 @@ public: // exception is thrown. void unbind_random (const char *id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_group)); Load_Balancer::Object_Group_ptr resolve (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_group)); // Locates and returns an by its . If // no has of , throw a // exception. - Load_Balancer::Group_List * round_robin_groups (TAO_ENV_SINGLE_ARG_DECL) + Load_Balancer::Group_List * round_robin_groups (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Lists all the round robin s which were created // by this factory, and haven't been destroyed yet, i.e., return // a sequence of s of all existing round robin // s created by this factory. - Load_Balancer::Group_List * random_groups (TAO_ENV_SINGLE_ARG_DECL) + Load_Balancer::Group_List * random_groups (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Lists all the random s which were created // by this factory, and haven't been destroyed yet, i.e., return @@ -138,7 +138,7 @@ private: Load_Balancer::Object_Group_ptr make_group (int random, const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)); // This function factors out common code in and @@ -146,17 +146,17 @@ private: // set to 1 and round robin if it is 0. Load_Balancer::Group_List * list_groups (int random - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // This function factors out common code in and // . Returns a sequence of its random // groups if parameter is set to 1 and a sequence of its // round robin groups if it is 0. void update_flags (int random - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // The helper that updates the vlaue of the variable flags_ - void update_objects (TAO_ENV_SINGLE_ARG_DECL); + void update_objects (ACE_ENV_SINGLE_ARG_DECL); // This rolls back the status of the objects in the POA if the // service had failed.. @@ -211,17 +211,17 @@ public: // Persistent POA // Method for the POA - PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL) + PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // = Load_Balancer::Object_Group idl methods. - char * id (TAO_ENV_SINGLE_ARG_DECL) + char * id (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get group's id. void bind (const Load_Balancer::Member & member - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_member)); // Adds a new to the . Note that each @@ -230,14 +230,14 @@ public: // exceptions is thrown. void unbind (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)); // Removes a member with the specified from the // . If none of the group's members have a // Member_ID of , exception is thrown. - char * resolve (TAO_ENV_SINGLE_ARG_DECL) + char * resolve (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)) = 0; // Returns a member object from this in accordance with @@ -246,18 +246,18 @@ public: // exception is thrown. char * resolve_with_id (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)); // Returns an object with the specified . If this // contains no members with the specified // , exception is thrown. - Load_Balancer::Member_ID_List * members (TAO_ENV_SINGLE_ARG_DECL) + Load_Balancer::Member_ID_List * members (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Return a sequence of s of all of its members. - void destroy (TAO_ENV_SINGLE_ARG_DECL) + void destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Cleanup the resources associated with this . // Subsequent calls to this should fail, and its @@ -266,7 +266,7 @@ public: protected: - void read_from_memory (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + void read_from_memory (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); // This will replenish all the pointers that could have been lost // because of failure @@ -309,7 +309,7 @@ public: PortableServer::POA_ptr poa); // Constructor. - char * resolve (TAO_ENV_SINGLE_ARG_DECL) + char * resolve (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)); // Returns a member object from this in accordance with @@ -330,14 +330,14 @@ public: // Constructor. void unbind (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)); // We need to override the implementation of from // Object_Group_i to make sure // works correctly. - char * resolve (TAO_ENV_SINGLE_ARG_DECL) + char * resolve (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)); // Returns a member object from this in accordance with diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp index 57b7d0ba7a9..bfe1cee4852 100755 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp @@ -70,7 +70,7 @@ Load_Balancing_Service::init (int argc, { result = this->orb_manager_.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) return result; @@ -87,19 +87,19 @@ Load_Balancing_Service::init (int argc, // Lifespan policy policies[0] = this->orb_manager_.root_poa()->create_lifespan_policy (PortableServer::PERSISTENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policies[1] = this->orb_manager_.root_poa()->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var persistent_POA = this->orb_manager_.root_poa()->create_POA ("persistent", this->orb_manager_.poa_manager (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -108,7 +108,7 @@ Load_Balancing_Service::init (int argc, i < policies.length (); ++i) { - policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -121,13 +121,13 @@ Load_Balancing_Service::init (int argc, // Activate the POA manager //PortableServer::ServantBase_var s = factory_servant; - this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var objref = factory_servant->_this (); ior = this->orb_manager_.orb ()->object_to_string (objref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ior.in () == 0) @@ -158,11 +158,11 @@ Load_Balancing_Service::init (int argc, int -Load_Balancing_Service::run (TAO_ENV_SINGLE_ARG_DECL) +Load_Balancing_Service::run (ACE_ENV_SINGLE_ARG_DECL) { int result; - result = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER); + result = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return result; @@ -184,7 +184,7 @@ main (int argc, char *argv[]) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - result = factory.run (TAO_ENV_SINGLE_ARG_PARAMETER); + result = factory.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h index cf39008b21d..e25661d9bd5 100755 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h @@ -44,7 +44,7 @@ public: // Initialize the : initializes the ORB, parses // arguments, creates a servant ... - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the server. private: diff --git a/TAO/examples/Logging/Logger_i.cpp b/TAO/examples/Logging/Logger_i.cpp index 6a1cf278034..da8d25ba2d0 100644 --- a/TAO/examples/Logging/Logger_i.cpp +++ b/TAO/examples/Logging/Logger_i.cpp @@ -19,7 +19,7 @@ Logger_Factory_i::~Logger_Factory_i (void) Logger_ptr Logger_Factory_i::make_logger (const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Logger_i *result; @@ -62,7 +62,7 @@ Logger_Factory_i::make_logger (const char *name // registration attempt. // @@ Matt, this code doesn't seem right. Can you please check with // Irfan and Carlos about whether this is the right thing to do? - return result->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return result->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } Logger_i::Logger_i (const char *name) @@ -112,33 +112,33 @@ Logger_i::verbosity_conversion (Logger::Verbosity_Level verbosity_level) void Logger_i::log (const Logger::Log_Record &log_rec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->logv (log_rec, verbosity_level_ TAO_ENV_ARG_PARAMETER); + this->logv (log_rec, verbosity_level_ ACE_ENV_ARG_PARAMETER); } void Logger_i::log2 (const Logger::Log_Record &log_rec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->logv (log_rec, verbosity_level_ TAO_ENV_ARG_PARAMETER); + this->logv (log_rec, verbosity_level_ ACE_ENV_ARG_PARAMETER); } void Logger_i::logv2 (const Logger::Log_Record &log_rec, Logger::Verbosity_Level verbosity - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->logv (log_rec, verbosity TAO_ENV_ARG_PARAMETER); + this->logv (log_rec, verbosity ACE_ENV_ARG_PARAMETER); } void Logger_i::logv (const Logger::Log_Record &log_rec, Logger::Verbosity_Level verbosity - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Create an to leverage existing logging @@ -188,7 +188,7 @@ Logger_i::logv (const Logger::Log_Record &log_rec, void Logger_i::verbosity (Logger::Verbosity_Level level - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->verbosity_level_ = level; diff --git a/TAO/examples/Logging/Logger_i.h b/TAO/examples/Logging/Logger_i.h index c775c094e55..a24b2565250 100644 --- a/TAO/examples/Logging/Logger_i.h +++ b/TAO/examples/Logging/Logger_i.h @@ -35,31 +35,31 @@ public: // destructor virtual void log (const Logger::Log_Record &log_rec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Writes the to the standard output. virtual void logv (const Logger::Log_Record &log_rec, Logger::Verbosity_Level verbosity - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Writes the to the standard output with the given // verbosity level virtual void log2 (const Logger::Log_Record &log_rec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Writes the to the standard output. virtual void logv2 (const Logger::Log_Record &log_rec, Logger::Verbosity_Level verbosity - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Writes the to the standard output with the given // verbosity level void verbosity (Logger::Verbosity_Level level - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Sets the verbosity level. Valid values are {VERBOSE, VERBOSE_LITE // and SILENT}. Defaults to VERBOSE @@ -94,7 +94,7 @@ public: // Destructor. virtual Logger_ptr make_logger (const char *name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // This function returns a logger with name . If is // unique, a new logger is created; else, a previously created diff --git a/TAO/examples/Logging/Logging_Service.cpp b/TAO/examples/Logging/Logging_Service.cpp index d8943451bf2..51f5062e56e 100644 --- a/TAO/examples/Logging/Logging_Service.cpp +++ b/TAO/examples/Logging/Logging_Service.cpp @@ -14,16 +14,16 @@ main (int argc, char *argv[]) Logger_Server log_server; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - int ret = log_server.init (argc, argv TAO_ENV_ARG_PARAMETER); + int ret = log_server.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ret == -1) return 1; else { - log_server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + log_server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/examples/Logging/Logging_Service_i.cpp b/TAO/examples/Logging/Logging_Service_i.cpp index 75e64bb96c1..36a50a7287a 100644 --- a/TAO/examples/Logging/Logging_Service_i.cpp +++ b/TAO/examples/Logging/Logging_Service_i.cpp @@ -44,7 +44,7 @@ Logger_Server::parse_args (void) int Logger_Server::init (int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->argc_ = argc; this->argv_ = argv; @@ -54,7 +54,7 @@ Logger_Server::init (int argc, if (this->orb_manager_.init_child_poa (argc, argv, "child_poa" - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "init_child_poa"), @@ -62,7 +62,7 @@ Logger_Server::init (int argc, ACE_CHECK_RETURN (-1); - this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Parse the command line arguments. @@ -76,14 +76,14 @@ Logger_Server::init (int argc, CORBA::String_var str = this->orb_manager_.activate_under_child_poa ("logger_factory", &this->factory_impl_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "The IOR is: <%s>\n", str.in ())); // Initialize the naming service - int ret = this->init_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER); + int ret = this->init_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (ret != 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -99,7 +99,7 @@ Logger_Server::init (int argc, // and logger_factory object. int -Logger_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL_NOT_USED TAO_ENV_SINGLE_ARG_PARAMETER) +Logger_Server::init_naming_service (ACE_ENV_SINGLE_ARG_DECL_NOT_USED ACE_ENV_SINGLE_ARG_PARAMETER) { // Get pointers to the ORB and child POA CORBA::ORB_var orb = this->orb_manager_.orb (); @@ -111,7 +111,7 @@ Logger_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL_NOT_USED TAO_ENV_SIN return -1; // Create an instance of the Logger_Factory - Logger_Factory_var factory = this->factory_impl_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + Logger_Factory_var factory = this->factory_impl_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); //Register the logger_factory @@ -120,16 +120,16 @@ Logger_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL_NOT_USED TAO_ENV_SIN factory_name[0].id = CORBA::string_dup ("Logger_Factory"); this->my_name_server_->bind (factory_name, factory.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; } int -Logger_Server::run (TAO_ENV_SINGLE_ARG_DECL) +Logger_Server::run (ACE_ENV_SINGLE_ARG_DECL) { - int ret = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER); + int ret = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (ret == -1) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/examples/Logging/Logging_Service_i.h b/TAO/examples/Logging/Logging_Service_i.h index 0f94019e7b2..bc70c520427 100644 --- a/TAO/examples/Logging/Logging_Service_i.h +++ b/TAO/examples/Logging/Logging_Service_i.h @@ -58,14 +58,14 @@ public: int init (int argc, char **argv - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize the Logger_Server state - parsing arguments and ... - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the ORB. Logger_ptr make_logger (const char *name - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // This function creates and returns a logger with the given . // Currently, is unused. @@ -73,7 +73,7 @@ private: int parse_args (void); // Parses the commandline arguments. - int init_naming_service (TAO_ENV_SINGLE_ARG_DECL); + int init_naming_service (ACE_ENV_SINGLE_ARG_DECL); // Initialises the name server and registers logger_factory with the // name server. diff --git a/TAO/examples/Logging/Logging_Test_i.cpp b/TAO/examples/Logging/Logging_Test_i.cpp index 2941345f45d..8e47f94d2cf 100644 --- a/TAO/examples/Logging/Logging_Test_i.cpp +++ b/TAO/examples/Logging/Logging_Test_i.cpp @@ -28,7 +28,7 @@ Logger_Client::init (int argc, char *argv[]) this->argc_ = argc; this->argv_ = argv; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { if (TAO_debug_level > 0) @@ -38,7 +38,7 @@ Logger_Client::init (int argc, char *argv[]) orb_ = CORBA::ORB_init (argc, argv, "internet" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (TAO_debug_level > 0) @@ -50,7 +50,7 @@ Logger_Client::init (int argc, char *argv[]) return -1; // Initialize the naming service - int ret = this->init_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER); + int ret = this->init_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (ret != 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -58,7 +58,7 @@ Logger_Client::init (int argc, char *argv[]) "services.\n"), -1); // Create the logger instances - ret = this->init_loggers (TAO_ENV_SINGLE_ARG_PARAMETER); + ret = this->init_loggers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (ret != 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -79,7 +79,7 @@ Logger_Client::init (int argc, char *argv[]) } int -Logger_Client::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) +Logger_Client::init_naming_service (ACE_ENV_SINGLE_ARG_DECL) { // Initialize the naming services if (my_name_client_.init (orb_.in ()) != 0) @@ -95,7 +95,7 @@ Logger_Client::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) CORBA::Object_var factory_ref = my_name_client_->resolve (factory_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "\nFactory_ref resolved\n")); @@ -111,7 +111,7 @@ Logger_Client::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) // Narrow the factory and check the success factory_ = Logger_Factory::_narrow (factory_ref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -127,7 +127,7 @@ Logger_Client::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) // If debugging, get the factory's IOR CORBA::String_var str = orb_->object_to_string (factory_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "The factory IOR is <%s>\n", @@ -136,18 +136,18 @@ Logger_Client::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) } int -Logger_Client::init_loggers (TAO_ENV_SINGLE_ARG_DECL) +Logger_Client::init_loggers (ACE_ENV_SINGLE_ARG_DECL) { // Retrieve the Logger obj ref corresponding to key1 and // key2. ACE_TRY { this->logger_1_ = factory_->make_logger ("key1" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->logger_2_ = factory_->make_logger ("key2" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (this->logger_1_.in ())) @@ -169,7 +169,7 @@ Logger_Client::init_loggers (TAO_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, "\nTrying to resolve already created logger...")); Logger_var logger_3 = factory_->make_logger ("key1" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (logger_3.in ())) @@ -195,7 +195,7 @@ Logger_Client::init_loggers (TAO_ENV_SINGLE_ARG_DECL) int Logger_Client::run (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Create 3 Log_Records for the test @@ -245,36 +245,36 @@ Logger_Client::run (void) } // Change the verbosity. - this->logger_1_->verbosity (Logger::VERBOSE_LITE TAO_ENV_ARG_PARAMETER); + this->logger_1_->verbosity (Logger::VERBOSE_LITE ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Log the first Log_Record (VERBOSE_LITE) - this->logger_1_->log (rec1 TAO_ENV_ARG_PARAMETER); + this->logger_1_->log (rec1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Change the verbosity again. - this->logger_2_->verbosity (Logger::VERBOSE TAO_ENV_ARG_PARAMETER); + this->logger_2_->verbosity (Logger::VERBOSE ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Log the second Log_Record (VERBOSE) - this->logger_2_->log (rec2 TAO_ENV_ARG_PARAMETER); + this->logger_2_->log (rec2 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Change the verbosity again - this->logger_2_->verbosity (Logger::SILENT TAO_ENV_ARG_PARAMETER); + this->logger_2_->verbosity (Logger::SILENT ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Log the third log record using logv() (this shows if the // verbosity level overrides the logger's verbosity level) - this->logger_2_->logv (rec3, Logger::VERBOSE TAO_ENV_ARG_PARAMETER); + this->logger_2_->logv (rec3, Logger::VERBOSE ACE_ENV_ARG_PARAMETER); // Change the verbosity again (so that regular log msgs can be // seen again) - this->logger_2_->verbosity (Logger::VERBOSE TAO_ENV_ARG_PARAMETER); + this->logger_2_->verbosity (Logger::VERBOSE ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Log the fourth record using log2() - this->logger_2_->log2 (rec4 TAO_ENV_ARG_PARAMETER); + this->logger_2_->log2 (rec4 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/examples/Logging/Logging_Test_i.h b/TAO/examples/Logging/Logging_Test_i.h index d377718d42f..4eee2679da6 100644 --- a/TAO/examples/Logging/Logging_Test_i.h +++ b/TAO/examples/Logging/Logging_Test_i.h @@ -69,10 +69,10 @@ private: const char *msg); // Prepares the for logging. - int init_naming_service (TAO_ENV_SINGLE_ARG_DECL); + int init_naming_service (ACE_ENV_SINGLE_ARG_DECL); // Initialises the name server and resolves the logger_factory - int init_loggers (TAO_ENV_SINGLE_ARG_DECL); + int init_loggers (ACE_ENV_SINGLE_ARG_DECL); // Instantiates the 2 logger member variables void show_record (Logger::Log_Record &newrec); diff --git a/TAO/examples/OBV/Simple_util.cpp b/TAO/examples/OBV/Simple_util.cpp index 94ae6ef95ef..e8a85e4a6ef 100644 --- a/TAO/examples/OBV/Simple_util.cpp +++ b/TAO/examples/OBV/Simple_util.cpp @@ -66,14 +66,14 @@ template int Server::init (const char *servant_name, int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Call the init of to initialize the ORB and // create a child POA under the root POA. if (this->orb_manager_.init_child_poa (argc, argv, "child_poa" - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "init_child_poa"), @@ -103,7 +103,7 @@ Server::init (const char *servant_name, CORBA::String_var str = this->orb_manager_.activate_under_child_poa (servant_name, &this->servant_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -131,10 +131,10 @@ Server::init (const char *servant_name, } template int -Server::run (TAO_ENV_SINGLE_ARG_DECL) +Server::run (ACE_ENV_SINGLE_ARG_DECL) { // Run the main event loop for the ORB. - if (this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER) == -1) + if (this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, "Server_i::run"), -1); @@ -237,7 +237,7 @@ Client::init (const char *name, this->argv_ = argv; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -245,7 +245,7 @@ Client::init (const char *name, this->orb_ = CORBA::ORB_init (this->argc_, this->argv_, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse command line and verify parameters. @@ -257,7 +257,7 @@ Client::init (const char *name, if(this->ior_ != 0) { CORBA::Object_var server_object = - this->orb_->string_to_object (this->ior_ TAO_ENV_ARG_PARAMETER); + this->orb_->string_to_object (this->ior_ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -267,7 +267,7 @@ Client::init (const char *name, this->ior_), -1); this->server_ = InterfaceObj::_narrow (server_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else @@ -290,7 +290,7 @@ Client::init (const char *name, template int -Client::obtain_initial_references (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Client::obtain_initial_references (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return 0; diff --git a/TAO/examples/OBV/Simple_util.h b/TAO/examples/OBV/Simple_util.h index d5edffeeb05..fc8fb5eb7c6 100644 --- a/TAO/examples/OBV/Simple_util.h +++ b/TAO/examples/OBV/Simple_util.h @@ -52,7 +52,7 @@ public: int init (const char *servant_name, int argc, char *argv[] - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize the Server state - parsing arguments and waiting. // interface_name is the name used to register the Servant. @@ -60,7 +60,7 @@ public: // After calling , this method will register the server with // the TAO Naming Service using the servant_name passed to . - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the orb. protected: @@ -121,7 +121,7 @@ public: void shutdown (int); // Fills in the shutdwon flag. - int obtain_initial_references (TAO_ENV_SINGLE_ARG_DECL); + int obtain_initial_references (ACE_ENV_SINGLE_ARG_DECL); // Initialize naming service protected: diff --git a/TAO/examples/OBV/Typed_Events/Client_i.cpp b/TAO/examples/OBV/Typed_Events/Client_i.cpp index 6f93187e63c..c76cccb0176 100644 --- a/TAO/examples/OBV/Typed_Events/Client_i.cpp +++ b/TAO/examples/OBV/Typed_Events/Client_i.cpp @@ -18,7 +18,7 @@ Checkpoint_Client_i::run (const char *name, ACE_Time_Value now (ACE_OS::gettimeofday ()); ACE_OS::srand ((unsigned int) now.sec () ); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -41,14 +41,14 @@ Checkpoint_Client_i::run (const char *name, new Temperature_impl (temperature))); t_e->origin_id_ (KITCHEN); t_e->do_print (); - checkpoint->put_event (t_e TAO_ENV_ARG_PARAMETER); + checkpoint->put_event (t_e ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; temperature = random_number (25,30); t_e = new Temperature_impl (temperature); t_e->origin_id_ (BATHROOM); t_e->do_print (); - checkpoint->put_event (t_e TAO_ENV_ARG_PARAMETER); + checkpoint->put_event (t_e ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Point point = { random_number (0,4), @@ -58,7 +58,7 @@ Checkpoint_Client_i::run (const char *name, new Position_impl (point))); p_e->origin_id_ (JONAS); p_e->do_print (); - checkpoint->put_event (p_e TAO_ENV_ARG_PARAMETER); + checkpoint->put_event (p_e ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -69,13 +69,13 @@ Checkpoint_Client_i::run (const char *name, new Log_Msg_impl (urgent, a_text))); l_e->origin_id_ (JONAS); l_e->do_print (); - checkpoint->put_event (l_e TAO_ENV_ARG_PARAMETER); + checkpoint->put_event (l_e ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "\nNow getting the alarms:\n")); - Event_List_var list (checkpoint->get_critical_events (TAO_ENV_SINGLE_ARG_PARAMETER)); + Event_List_var list (checkpoint->get_critical_events (ACE_ENV_SINGLE_ARG_PARAMETER)); ACE_TRY_CHECK; for (Event_List_Iterator i (list); i.next (); i.advance ()) @@ -84,7 +84,7 @@ Checkpoint_Client_i::run (const char *name, } if (checkpoint.shutdown () == 1) - checkpoint->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + checkpoint->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp index 605c614f27d..ec5b27fb50b 100644 --- a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp +++ b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp @@ -18,7 +18,7 @@ Event_impl::~Event_impl () } void -Event_impl::do_print (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Event_impl::do_print (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { ACE_DEBUG((LM_DEBUG, "(time %d origin %d) ", (CORBA::ULong) this->time_(), @@ -54,10 +54,10 @@ Temperature_impl::~Temperature_impl () } void -Temperature_impl::do_print (TAO_ENV_SINGLE_ARG_DECL) +Temperature_impl::do_print (ACE_ENV_SINGLE_ARG_DECL) { // The timestamp - Event_impl::do_print (TAO_ENV_SINGLE_ARG_PARAMETER); + Event_impl::do_print (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG((LM_DEBUG, "Temperature is %f\n", this->temperature_() )); @@ -91,51 +91,51 @@ Position_impl::~Position_impl () } void -Position_impl::do_print (TAO_ENV_SINGLE_ARG_DECL) +Position_impl::do_print (ACE_ENV_SINGLE_ARG_DECL) { // The timestamp - Event_impl::do_print (TAO_ENV_SINGLE_ARG_PARAMETER); + Event_impl::do_print (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Float x = - this->x(TAO_ENV_SINGLE_ARG_PARAMETER); + this->x(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Float y = - this->y(TAO_ENV_SINGLE_ARG_PARAMETER); + this->y(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Float z = - this->z(TAO_ENV_SINGLE_ARG_PARAMETER); + this->z(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG((LM_DEBUG, "Position is (%f, %f, %f)\n", x, y, z)); } -CORBA::Float Position_impl::x (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +CORBA::Float Position_impl::x (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return this->xyz()[0]; } -void Position_impl::x (CORBA::Float x TAO_ENV_ARG_DECL_NOT_USED) +void Position_impl::x (CORBA::Float x ACE_ENV_ARG_DECL_NOT_USED) { this->xyz()[0] = x; } -CORBA::Float Position_impl::y (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +CORBA::Float Position_impl::y (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return this->xyz()[1]; } -void Position_impl::y (CORBA::Float y TAO_ENV_ARG_DECL_NOT_USED) +void Position_impl::y (CORBA::Float y ACE_ENV_ARG_DECL_NOT_USED) { this->xyz()[1] = y; } -CORBA::Float Position_impl::z (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +CORBA::Float Position_impl::z (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return this->xyz()[2]; } -void Position_impl::z (CORBA::Float z TAO_ENV_ARG_DECL_NOT_USED) +void Position_impl::z (CORBA::Float z ACE_ENV_ARG_DECL_NOT_USED) { this->xyz()[2] = z; } @@ -169,10 +169,10 @@ Log_Msg_impl::~Log_Msg_impl () } void -Log_Msg_impl::do_print (TAO_ENV_SINGLE_ARG_DECL) +Log_Msg_impl::do_print (ACE_ENV_SINGLE_ARG_DECL) { // The timestamp - Event_impl::do_print (TAO_ENV_SINGLE_ARG_PARAMETER); + Event_impl::do_print (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->urgency () > 0) @@ -221,20 +221,20 @@ Event_List_Link_impl::~Event_List_Link_impl () } Event* -Event_List_Link_impl::get_event (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Event_List_Link_impl::get_event (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return this->my_event (); } Event_List_Link* -Event_List_Link_impl::get_next_link (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Event_List_Link_impl::get_next_link (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return this->next (); } void Event_List_Link_impl::attach_next_link (Event_List_Link *n - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { this->next (n); } @@ -264,7 +264,7 @@ Event_List_impl::~Event_List_impl () } void -Event_List_impl::store_event (Event* e TAO_ENV_ARG_DECL_NOT_USED) +Event_List_impl::store_event (Event* e ACE_ENV_ARG_DECL_NOT_USED) { // This operation should perform atomically and should // guard against the access to the list from another thread. @@ -406,7 +406,7 @@ Temperature_Criterion_impl::~Temperature_Criterion_impl () CORBA::Boolean Temperature_Criterion_impl::is_critical (Event* e - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { // Downcast to a temperature. Temperature* t = Temperature::_downcast (e); @@ -423,7 +423,7 @@ Temperature_Criterion_impl::is_critical (Event* e void -Temperature_Criterion_impl::do_print (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Temperature_Criterion_impl::do_print (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { ACE_DEBUG((LM_DEBUG, "Alarm boundary for events with origin id %d is\n", this->origin_id_ () )); @@ -462,7 +462,7 @@ Position_Criterion_impl::~Position_Criterion_impl () CORBA::Boolean -Position_Criterion_impl::is_critical (Event* e TAO_ENV_ARG_DECL_NOT_USED) +Position_Criterion_impl::is_critical (Event* e ACE_ENV_ARG_DECL_NOT_USED) { Position* p = Position::_downcast (e); // Is Event really a Position ? @@ -483,13 +483,13 @@ Position_Criterion_impl::is_critical (Event* e TAO_ENV_ARG_DECL_NOT_USED) void -Position_Criterion_impl::do_print (TAO_ENV_SINGLE_ARG_DECL) +Position_Criterion_impl::do_print (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG((LM_DEBUG, "Alarm boundary for events with origin id %d is the box\n", this->origin_id_ () )); - this->leftbottom ()->do_print(TAO_ENV_SINGLE_ARG_PARAMETER); - this->topright ()->do_print(TAO_ENV_SINGLE_ARG_PARAMETER); + this->leftbottom ()->do_print(ACE_ENV_SINGLE_ARG_PARAMETER); + this->topright ()->do_print(ACE_ENV_SINGLE_ARG_PARAMETER); } Position_Criterion_factory::~Position_Criterion_factory () @@ -516,7 +516,7 @@ Log_Msg_Criterion_impl::~Log_Msg_Criterion_impl () CORBA::Boolean Log_Msg_Criterion_impl::is_critical (Event* e - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { Log_Msg* lm = Log_Msg::_downcast (e); @@ -530,7 +530,7 @@ Log_Msg_Criterion_impl::is_critical (Event* e void -Log_Msg_Criterion_impl::do_print (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Log_Msg_Criterion_impl::do_print (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { ACE_DEBUG((LM_DEBUG, "All log messages with urgency greater zero are registered.\n" )); @@ -565,7 +565,7 @@ Criterion_List_impl::~Criterion_List_impl () void Criterion_List_impl::store_criterion (Criterion *c - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (!my_list ()) { @@ -578,7 +578,7 @@ Criterion_List_impl::store_criterion (Criterion *c } CORBA::Boolean -Criterion_List_impl::is_critical (Event *e TAO_ENV_ARG_DECL_NOT_USED) +Criterion_List_impl::is_critical (Event *e ACE_ENV_ARG_DECL_NOT_USED) { // Try all criterions. Walking the list is efficient enough for // demonstration. diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.h b/TAO/examples/OBV/Typed_Events/Event_Types_impl.h index 35ed602229e..d330a23f372 100644 --- a/TAO/examples/OBV/Typed_Events/Event_Types_impl.h +++ b/TAO/examples/OBV/Typed_Events/Event_Types_impl.h @@ -48,7 +48,7 @@ class Event_impl : public virtual OBV_Event, Event_impl (); virtual ~Event_impl (); - virtual void do_print (TAO_ENV_SINGLE_ARG_DECL); + virtual void do_print (ACE_ENV_SINGLE_ARG_DECL); // Implementation of the do_print () operation the valuetype should have. // All operations in valuetypes are virtual. @@ -119,7 +119,7 @@ public: virtual ~Temperature_impl (); - virtual void do_print (TAO_ENV_SINGLE_ARG_DECL); + virtual void do_print (ACE_ENV_SINGLE_ARG_DECL); // Overrides Event_impl::do_print (). Note that a new declaration // in IDL in a derived class is not allowed. }; @@ -145,15 +145,15 @@ public: Position_impl (Point &p); virtual ~Position_impl (); - virtual CORBA::Float x (TAO_ENV_SINGLE_ARG_DECL); - virtual void x (CORBA::Float TAO_ENV_ARG_DECL); - virtual CORBA::Float y (TAO_ENV_SINGLE_ARG_DECL); - virtual void y (CORBA::Float TAO_ENV_ARG_DECL); - virtual CORBA::Float z (TAO_ENV_SINGLE_ARG_DECL); - virtual void z (CORBA::Float TAO_ENV_ARG_DECL); + virtual CORBA::Float x (ACE_ENV_SINGLE_ARG_DECL); + virtual void x (CORBA::Float ACE_ENV_ARG_DECL); + virtual CORBA::Float y (ACE_ENV_SINGLE_ARG_DECL); + virtual void y (CORBA::Float ACE_ENV_ARG_DECL); + virtual CORBA::Float z (ACE_ENV_SINGLE_ARG_DECL); + virtual void z (CORBA::Float ACE_ENV_ARG_DECL); //These are the attributes - virtual void do_print (TAO_ENV_SINGLE_ARG_DECL); + virtual void do_print (ACE_ENV_SINGLE_ARG_DECL); }; class Position_factory : public CORBA::ValueFactoryBase @@ -178,7 +178,7 @@ public: Log_Msg_impl (CORBA::Short urgency_p, const char *message_p); virtual ~Log_Msg_impl (); - virtual void do_print (TAO_ENV_SINGLE_ARG_DECL); + virtual void do_print (ACE_ENV_SINGLE_ARG_DECL); }; class Log_Msg_factory : public CORBA::ValueFactoryBase @@ -210,12 +210,12 @@ class Event_List_Link_impl : public virtual OBV_Event_List_Link, Event_List_Link_impl (Event *e); virtual ~Event_List_Link_impl (); - Event *get_event (TAO_ENV_SINGLE_ARG_DECL); + Event *get_event (ACE_ENV_SINGLE_ARG_DECL); private: - Event_List_Link *get_next_link (TAO_ENV_SINGLE_ARG_DECL); + Event_List_Link *get_next_link (ACE_ENV_SINGLE_ARG_DECL); - void attach_next_link (Event_List_Link * chain TAO_ENV_ARG_DECL); + void attach_next_link (Event_List_Link * chain ACE_ENV_ARG_DECL); // Attach a chain at the end. }; @@ -239,9 +239,9 @@ class Event_List_impl : public virtual OBV_Event_List, Event_List_impl (); virtual ~Event_List_impl (); - void store_event (Event* e TAO_ENV_ARG_DECL); + void store_event (Event* e ACE_ENV_ARG_DECL); - Event_List_Link *get_first_link(TAO_ENV_SINGLE_ARG_DECL); + Event_List_Link *get_first_link(ACE_ENV_SINGLE_ARG_DECL); // The iterator needs it. private: @@ -317,8 +317,8 @@ public: virtual ~Temperature_Criterion_impl (); - CORBA::Boolean is_critical (Event* e TAO_ENV_ARG_DECL); - virtual void do_print (TAO_ENV_SINGLE_ARG_DECL); + CORBA::Boolean is_critical (Event* e ACE_ENV_ARG_DECL); + virtual void do_print (ACE_ENV_SINGLE_ARG_DECL); }; class Temperature_Criterion_factory : public CORBA::ValueFactoryBase @@ -343,8 +343,8 @@ public: Position *tr); virtual ~Position_Criterion_impl (); - CORBA::Boolean is_critical (Event* e TAO_ENV_ARG_DECL); - virtual void do_print (TAO_ENV_SINGLE_ARG_DECL); + CORBA::Boolean is_critical (Event* e ACE_ENV_ARG_DECL); + virtual void do_print (ACE_ENV_SINGLE_ARG_DECL); }; class Position_Criterion_factory : public CORBA::ValueFactoryBase @@ -365,8 +365,8 @@ public: Log_Msg_Criterion_impl (); virtual ~Log_Msg_Criterion_impl (); - CORBA::Boolean is_critical (Event* e TAO_ENV_ARG_DECL); - virtual void do_print (TAO_ENV_SINGLE_ARG_DECL); + CORBA::Boolean is_critical (Event* e ACE_ENV_ARG_DECL); + virtual void do_print (ACE_ENV_SINGLE_ARG_DECL); }; class Log_Msg_Criterion_factory : public CORBA::ValueFactoryBase @@ -385,8 +385,8 @@ class Criterion_List_impl : public virtual OBV_Criterion_List, Criterion_List_impl (); virtual ~Criterion_List_impl (); - void store_criterion (Criterion *c TAO_ENV_ARG_DECL); - CORBA::Boolean is_critical (Event *e TAO_ENV_ARG_DECL); + void store_criterion (Criterion *c ACE_ENV_ARG_DECL); + CORBA::Boolean is_critical (Event *e ACE_ENV_ARG_DECL); }; diff --git a/TAO/examples/OBV/Typed_Events/Server_i.cpp b/TAO/examples/OBV/Typed_Events/Server_i.cpp index 1ac7c623802..ab79f8576e0 100644 --- a/TAO/examples/OBV/Typed_Events/Server_i.cpp +++ b/TAO/examples/OBV/Typed_Events/Server_i.cpp @@ -110,7 +110,7 @@ Checkpoint_i::orb (CORBA::ORB_ptr o) void Checkpoint_i::put_event (Event *event - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // In general this function would be a dispatcher which looks at the @@ -140,7 +140,7 @@ Checkpoint_i::put_event (Event *event Event_List * -Checkpoint_i::get_critical_events (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Checkpoint_i::get_critical_events (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // The skeleton should not steal our list by decrementing @@ -157,7 +157,7 @@ Checkpoint_i::get_critical_events (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) // Shutdown the server application. void -Checkpoint_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Checkpoint_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/examples/OBV/Typed_Events/Server_i.h b/TAO/examples/OBV/Typed_Events/Server_i.h index 3f3c0c00a2e..785093c5d14 100644 --- a/TAO/examples/OBV/Typed_Events/Server_i.h +++ b/TAO/examples/OBV/Typed_Events/Server_i.h @@ -37,16 +37,16 @@ public: virtual void put_event ( Event * e - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Event_List * get_critical_events ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Shutdown the server. diff --git a/TAO/examples/OBV/Typed_Events/server.cpp b/TAO/examples/OBV/Typed_Events/server.cpp index e04247695cd..935a93de0a9 100644 --- a/TAO/examples/OBV/Typed_Events/server.cpp +++ b/TAO/examples/OBV/Typed_Events/server.cpp @@ -12,18 +12,18 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "\n\tCheckpoint Event_Types server\n\n")); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { if (server.init ("Event_Types_Checkpoint", argc, argv - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) return 1; else { - server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/examples/POA/Adapter_Activator/server.cpp b/TAO/examples/POA/Adapter_Activator/server.cpp index c47656ad461..a35bff017c0 100644 --- a/TAO/examples/POA/Adapter_Activator/server.cpp +++ b/TAO/examples/POA/Adapter_Activator/server.cpp @@ -61,7 +61,7 @@ public: CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent, const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::PolicyList first_poa_policies_; @@ -83,7 +83,7 @@ Adapter_Activator::Adapter_Activator (PortableServer::POAManager_ptr poa_manager CORBA::Boolean Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent, const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (ACE_OS::strcmp (name, "firstPOA") == 0) @@ -91,7 +91,7 @@ Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent, PortableServer::POA_var child = parent->create_POA (name, this->poa_manager_.in (), this->first_poa_policies_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Creation of firstPOA is over. Destroy the Policy objects. @@ -99,12 +99,12 @@ Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent, i < this->first_poa_policies_.length (); ++i) { - this->first_poa_policies_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->first_poa_policies_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); } child->the_activator (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); Reference_Counted_Foo *foo_impl = new Reference_Counted_Foo (this->orb_.in (), @@ -112,12 +112,12 @@ Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent, 28); child->set_servant (foo_impl - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // This means that the ownership of now belongs to // the POA. - foo_impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + foo_impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Finally everything is fine @@ -128,7 +128,7 @@ Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent, PortableServer::POA_var child = parent->create_POA (name, this->poa_manager_.in (), this->second_poa_policies_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Creation of secondPOA is over. Destroy the Policy objects. @@ -136,7 +136,7 @@ Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent, i < this->second_poa_policies_.length (); ++i) { - this->second_poa_policies_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->second_poa_policies_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -149,12 +149,12 @@ Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent, child->activate_object_with_id (oid.in (), foo_impl - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // This means that the ownership of now belongs to // the POA. - foo_impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + foo_impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Finally everything is fine @@ -264,7 +264,7 @@ write_iors_to_file (const char *first_ior, int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -272,7 +272,7 @@ main (int argc, char **argv) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = parse_args (argc, argv); @@ -282,18 +282,18 @@ main (int argc, char **argv) // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Adapter_Activator *adapter_activator = @@ -304,7 +304,7 @@ main (int argc, char **argv) adapter_activator; root_poa->the_activator (adapter_activator_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var first_poa; @@ -318,32 +318,32 @@ main (int argc, char **argv) // Id Assignment Policy policies[0] = root_poa->create_id_assignment_policy (PortableServer::SYSTEM_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Lifespan policy policies[1] = root_poa->create_lifespan_policy (PortableServer::PERSISTENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Request Processing policy policies[2] = root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Id Uniqueness policies[3] = root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create the firstPOA under the RootPOA. first_poa = root_poa->create_POA ("firstPOA", poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -355,20 +355,20 @@ main (int argc, char **argv) // Id Assignment Policy policies[0] = root_poa->create_id_assignment_policy (PortableServer::USER_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Lifespan policy policies[1] = root_poa->create_lifespan_policy (PortableServer::PERSISTENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create the secondPOA under the firstPOA. second_poa = first_poa->create_POA ("secondPOA", poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -379,16 +379,16 @@ main (int argc, char **argv) PortableServer::ObjectId_var first_oid = root_poa->activate_object (&first_foo_impl - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get Object Reference for the first_foo_impl object. - Foo_var first_foo = first_foo_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + Foo_var first_foo = first_foo_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var second_foo = first_poa->create_reference ("IDL:Foo:1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var third_oid = @@ -397,20 +397,20 @@ main (int argc, char **argv) CORBA::Object_var third_foo = second_poa->create_reference_with_id (third_oid.in (), "IDL:Foo:1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Stringyfy all the object references and print them out. CORBA::String_var first_ior = - orb->object_to_string (first_foo.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (first_foo.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var second_ior = - orb->object_to_string (second_foo.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (second_foo.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var third_ior = - orb->object_to_string (third_foo.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (third_foo.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -427,13 +427,13 @@ main (int argc, char **argv) first_poa->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/examples/POA/DSI/Database_i.cpp b/TAO/examples/POA/DSI/Database_i.cpp index d2e003927e2..fb953ff8b78 100644 --- a/TAO/examples/POA/DSI/Database_i.cpp +++ b/TAO/examples/POA/DSI/Database_i.cpp @@ -17,20 +17,20 @@ DatabaseImpl::Simpler_Database_Malloc::~Simpler_Database_Malloc (void) DatabaseImpl::Entry::Entry (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) : orb_ (CORBA::ORB::_duplicate (orb)), poa_ (PortableServer::POA::_duplicate (poa)) { // Get the POA Current object reference CORBA::Object_var obj = this->orb_->resolve_initial_references ("POACurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Narrow the object reference to a POA Current reference this->poa_current_ = PortableServer::Current::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -40,12 +40,12 @@ DatabaseImpl::Entry::~Entry (void) void DatabaseImpl::Entry::invoke (CORBA::ServerRequest_ptr request - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // The servant determines the key associated with the database // entry represented by self. PortableServer::ObjectId_var oid = - this->poa_current_->get_object_id (TAO_ENV_SINGLE_ARG_PARAMETER); + this->poa_current_->get_object_id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Now convert the id into a string @@ -59,7 +59,7 @@ DatabaseImpl::Entry::invoke (CORBA::ServerRequest_ptr request if (ACE_OS::strcmp (operation, "_is_a") == 0) { - this->is_a (request TAO_ENV_ARG_PARAMETER); + this->is_a (request ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else @@ -68,7 +68,7 @@ DatabaseImpl::Entry::invoke (CORBA::ServerRequest_ptr request void DatabaseImpl::Entry::is_a (CORBA::ServerRequest_ptr request - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::NVList_ptr list; this->orb_->create_list (0, list); @@ -78,15 +78,15 @@ DatabaseImpl::Entry::is_a (CORBA::ServerRequest_ptr request list->add_value ("value", any_1, CORBA::ARG_IN - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; request->arguments (list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA_NamedValue_ptr nv = list->item (0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Any_ptr ap = nv->value (); @@ -94,7 +94,7 @@ DatabaseImpl::Entry::is_a (CORBA::ServerRequest_ptr request *ap >>= value; const char *object_id = - CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Boolean result; @@ -109,37 +109,37 @@ DatabaseImpl::Entry::is_a (CORBA::ServerRequest_ptr request CORBA::Any::from_boolean from_boolean (result); result_any <<= from_boolean; - request->set_result (result_any TAO_ENV_ARG_PARAMETER); + request->set_result (result_any ACE_ENV_ARG_PARAMETER); ACE_CHECK; } CORBA::RepositoryId DatabaseImpl::Entry::_primary_interface (const PortableServer::ObjectId &/*oid*/, PortableServer::POA_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return 0; } PortableServer::POA_ptr -DatabaseImpl::Entry::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +DatabaseImpl::Entry::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } DatabaseImpl::Agent::Agent (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) : orb_ (CORBA::ORB::_duplicate (orb)), poa_ (PortableServer::POA::_duplicate (poa)), common_servant_ (orb, poa - TAO_ENV_ARG_PARAMETER) + ACE_ENV_ARG_PARAMETER) { ACE_CHECK; this->poa_->set_servant (&this->common_servant_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -151,7 +151,7 @@ Database::Entry_ptr DatabaseImpl::Agent::create_entry (const char *key, const char *entry_type, const Database::NVPairSequence &initial_attributes - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Database::Unknown_Type, Database::Duplicate_Key)) @@ -207,11 +207,11 @@ DatabaseImpl::Agent::create_entry (const char *key, CORBA::Object_var obj = this->poa_->create_reference_with_id (obj_id.in (), repository_id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Database::Entry::_nil ()); Database::Entry_var entry = Database::Entry::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Database::Entry::_nil ()); return entry._retn (); @@ -220,7 +220,7 @@ DatabaseImpl::Agent::create_entry (const char *key, Database::Entry_ptr DatabaseImpl::Agent::find_entry (const char *key, const char *entry_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Database::Unknown_Type, Database::Not_Found)) @@ -253,11 +253,11 @@ DatabaseImpl::Agent::find_entry (const char *key, CORBA::Object_var obj = this->poa_->create_reference_with_id (obj_id.in (), repository_id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Database::Entry::_nil ()); entry = Database::Entry::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Database::Entry::_nil ()); } else @@ -276,7 +276,7 @@ DatabaseImpl::Agent::find_entry (const char *key, void DatabaseImpl::Agent::destroy_entry (const char *key, const char *entry_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Database::Unknown_Type, Database::Unknown_Key)) @@ -310,14 +310,14 @@ DatabaseImpl::Agent::destroy_entry (const char *key, } void -DatabaseImpl::Agent::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +DatabaseImpl::Agent::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (); } PortableServer::POA_ptr -DatabaseImpl::Agent::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +DatabaseImpl::Agent::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/examples/POA/DSI/Database_i.h b/TAO/examples/POA/DSI/Database_i.h index db60ffbd981..25c120a7b0e 100644 --- a/TAO/examples/POA/DSI/Database_i.h +++ b/TAO/examples/POA/DSI/Database_i.h @@ -33,27 +33,27 @@ public: public: Entry (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); ~Entry (void); virtual void invoke (CORBA::ServerRequest_ptr request - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // The invoke() method receives requests issued to any CORBA // object incarnated by the DSI servant and performs the // processing necessary to execute the request. virtual CORBA::RepositoryId _primary_interface (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // The _primary_interface() method receives an ObjectId value and // a POA_ptr as input parameters and returns a valid RepositoryId // representing the most-derived interface for that oid. - virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); // Returns the default POA for this servant. virtual void is_a (CORBA::ServerRequest_ptr request - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Handles the _is_a call protected: @@ -72,35 +72,35 @@ public: public: Agent (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); ~Agent (void); virtual Database::Entry_ptr create_entry (const char *key, const char *entry_type, const Database::NVPairSequence &initial_attributes - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Database::Unknown_Type, Database::Duplicate_Key)); virtual Database::Entry_ptr find_entry (const char *key, const char *entry_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Database::Unknown_Type, Database::Not_Found)); virtual void destroy_entry (const char *key, const char *entry_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Database::Unknown_Type, Database::Unknown_Key)); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); // Returns the default POA for this servant. protected: diff --git a/TAO/examples/POA/DSI/client.cpp b/TAO/examples/POA/DSI/client.cpp index 1d8950ce093..dd15e2008f5 100644 --- a/TAO/examples/POA/DSI/client.cpp +++ b/TAO/examples/POA/DSI/client.cpp @@ -99,7 +99,7 @@ read_IOR_from_file (void) int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; char str [255]; // Initialize the ORB @@ -110,7 +110,7 @@ main (int argc, char **argv) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0 TAO_ENV_ARG_PARAMETER); + 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse the command-line arguments to get the location of the @@ -133,7 +133,7 @@ main (int argc, char **argv) // Get the object reference with the IOR CORBA::Object_var object = orb->string_to_object (IOR - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::strcpy (str, @@ -142,7 +142,7 @@ main (int argc, char **argv) // Narrow the object reference to a Database::Agent Database::Agent_var database_agent = Database::Agent::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Database::NVPairSequence employee_attributes (2); @@ -169,14 +169,14 @@ main (int argc, char **argv) database_agent->create_entry ("irfan", "Employee", employee_attributes - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::strcpy (str, "Database::Employee::_narrow"); Database::Employee_var employee = Database::Employee::_narrow (entry.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; /* @@ -189,7 +189,7 @@ main (int argc, char **argv) #if 0 // Reset the id ACE_OS::strcpy (str, "Database::Employee::id"); - employee->id (666 TAO_ENV_ARG_PARAMETER); + employee->id (666 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* 0 */ @@ -197,19 +197,19 @@ main (int argc, char **argv) // Find the employee entry = database_agent->find_entry ("irfan", "Employee" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::strcpy (str, "Database::Entry::destroy"); // Destroy the employee database_agent->destroy_entry ("irfan", "Employee" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (shutdown_server) { - database_agent->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + database_agent->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/examples/POA/DSI/server.cpp b/TAO/examples/POA/DSI/server.cpp index 54fa21c0aaf..cf8b886114c 100644 --- a/TAO/examples/POA/DSI/server.cpp +++ b/TAO/examples/POA/DSI/server.cpp @@ -79,12 +79,12 @@ write_iors_to_file (const char *first_ior) int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = parse_args (argc, argv); @@ -94,16 +94,16 @@ main (int argc, char **argv) // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow the object reference to a POA reference PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyList policies (5); @@ -111,27 +111,27 @@ main (int argc, char **argv) // ID Assignment Policy policies[0] = - root_poa->create_id_assignment_policy (PortableServer::USER_ID TAO_ENV_ARG_PARAMETER); + root_poa->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Lifespan Policy policies[1] = root_poa->create_lifespan_policy (PortableServer::PERSISTENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // Request Processing Policy policies[2] = root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // Servant Retention Policy policies[3] = - root_poa->create_servant_retention_policy (PortableServer::RETAIN TAO_ENV_ARG_PARAMETER); + root_poa->create_servant_retention_policy (PortableServer::RETAIN ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Id Uniqueness Policy policies[4] = - root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID TAO_ENV_ARG_PARAMETER); + root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -139,7 +139,7 @@ main (int argc, char **argv) PortableServer::POA_var first_poa = root_poa->create_POA (name.c_str (), poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (CORBA::ULong i = 0; @@ -147,14 +147,14 @@ main (int argc, char **argv) ++i) { CORBA::Policy_ptr policy = policies[i]; - policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } // Create a Database Agent Implementation object in first_poa DatabaseImpl::Agent database_agent_impl (orb.in (), first_poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var database_agent_oid = @@ -162,16 +162,16 @@ main (int argc, char **argv) first_poa->activate_object_with_id (database_agent_oid.in (), &database_agent_impl - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var database_agent = - first_poa->id_to_reference (database_agent_oid.in () TAO_ENV_ARG_PARAMETER); + first_poa->id_to_reference (database_agent_oid.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the IOR for the "DatabaseAgent" object CORBA::String_var database_agent_ior = - orb->object_to_string (database_agent.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (database_agent.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG,"%s\n", @@ -182,11 +182,11 @@ main (int argc, char **argv) return write_result; // set the state of the poa_manager to active i.e ready to process requests - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Run the ORB - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/POA/Default_Servant/File_i.cpp b/TAO/examples/POA/Default_Servant/File_i.cpp index a80188bd406..4cda27db3ba 100644 --- a/TAO/examples/POA/Default_Servant/File_i.cpp +++ b/TAO/examples/POA/Default_Servant/File_i.cpp @@ -24,9 +24,9 @@ FileImpl::System::System (PortableServer::POA_ptr poa) // Create the Default Descriptor Servant fd_servant_ (poa) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; // set the default servant of the POA - poa->set_servant (&this->fd_servant_ TAO_ENV_ARG_PARAMETER); + poa->set_servant (&this->fd_servant_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -35,7 +35,7 @@ FileImpl::System::~System (void) } PortableServer::POA_ptr -FileImpl::System::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +FileImpl::System::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -43,7 +43,7 @@ FileImpl::System::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) File::Descriptor_ptr FileImpl::System::open (const char *file_name, CORBA::Long flags - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, File::IOError)) { @@ -73,12 +73,12 @@ FileImpl::System::open (const char *file_name, CORBA::Object_var obj = this->poa_->create_reference_with_id (oid.in (), "IDL:File/Descriptor:1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (File::Descriptor::_nil ()); // Narrow the object reference to a File Descriptor File::Descriptor_var fd = - File::Descriptor::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + File::Descriptor::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (File::Descriptor::_nil ()); @@ -96,26 +96,26 @@ FileImpl::Descriptor::~Descriptor (void) } PortableServer::POA_ptr -FileImpl::Descriptor::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +FileImpl::Descriptor::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } //Extracts the ACE_HANDLE from the passed object reference ACE_HANDLE -FileImpl::Descriptor::fd (TAO_ENV_SINGLE_ARG_DECL) +FileImpl::Descriptor::fd (ACE_ENV_SINGLE_ARG_DECL) { // // One way of getting our id. // // Get a reference to myself - File::Descriptor_var me = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + File::Descriptor_var me = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (ACE_INVALID_HANDLE); // Get the ObjectId from the reference PortableServer::ObjectId_var oid1 = - this->poa_->reference_to_id (me.in () TAO_ENV_ARG_PARAMETER); + this->poa_->reference_to_id (me.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (ACE_INVALID_HANDLE); // @@ -123,7 +123,7 @@ FileImpl::Descriptor::fd (TAO_ENV_SINGLE_ARG_DECL) // PortableServer::ObjectId_var oid2 = - this->poa_->servant_to_id (this TAO_ENV_ARG_PARAMETER); + this->poa_->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (ACE_INVALID_HANDLE); // @@ -131,23 +131,23 @@ FileImpl::Descriptor::fd (TAO_ENV_SINGLE_ARG_DECL) // int argc = 0; - CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, 0 TAO_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (ACE_INVALID_HANDLE); // Get the POA Current object reference CORBA::Object_var obj = orb->resolve_initial_references ("POACurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (ACE_INVALID_HANDLE); // Narrow the object reference to a POA Current reference PortableServer::Current_var poa_current = PortableServer::Current::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (ACE_INVALID_HANDLE); PortableServer::ObjectId_var oid3 = - poa_current->get_object_id (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_current->get_object_id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (ACE_INVALID_HANDLE); ACE_ASSERT (oid1.in () == oid2.in ()); @@ -163,11 +163,11 @@ FileImpl::Descriptor::fd (TAO_ENV_SINGLE_ARG_DECL) CORBA::Long FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, File::IOError)) { - ACE_HANDLE file_descriptor = this->fd (TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_HANDLE file_descriptor = this->fd (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); const CORBA::Octet *data = &buffer[0]; @@ -183,11 +183,11 @@ FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer File::Descriptor::DataBuffer * FileImpl::Descriptor::read (CORBA::Long num_bytes - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, File::IOError)) { - ACE_HANDLE file_descriptor = this->fd (TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_HANDLE file_descriptor = this->fd (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Octet *buffer = File::Descriptor::DataBuffer::allocbuf (num_bytes); @@ -206,11 +206,11 @@ FileImpl::Descriptor::read (CORBA::Long num_bytes CORBA::ULong FileImpl::Descriptor::lseek (CORBA::ULong offset, CORBA::Long whence - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, File::IOError)) { - ACE_HANDLE file_descriptor = this->fd (TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_HANDLE file_descriptor = this->fd (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Long result = (CORBA::Long) ACE_OS::lseek (file_descriptor, @@ -223,11 +223,11 @@ FileImpl::Descriptor::lseek (CORBA::ULong offset, } void -FileImpl::Descriptor::destroy (TAO_ENV_SINGLE_ARG_DECL) +FileImpl::Descriptor::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Get the ACE_HANDLE for this object reference - ACE_HANDLE file_descriptor = this->fd (TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_HANDLE file_descriptor = this->fd (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Close the file corresponding to this object reference. diff --git a/TAO/examples/POA/Default_Servant/File_i.h b/TAO/examples/POA/Default_Servant/File_i.h index 30c6c6f5e5b..ebe06fce403 100644 --- a/TAO/examples/POA/Default_Servant/File_i.h +++ b/TAO/examples/POA/Default_Servant/File_i.h @@ -34,35 +34,35 @@ public: ~Descriptor (void); // Destructor - PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); // Returns the default POA of this object virtual CORBA::Long write (const File::Descriptor::DataBuffer &buffer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, File::IOError)); // write buffer to File corresponding to this Descriptor virtual File::Descriptor::DataBuffer *read (CORBA::Long num_bytes - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, // Reads num_bytes from the file and returns it File::IOError)); virtual CORBA::ULong lseek (CORBA::ULong offset, CORBA::Long whence - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, File::IOError)); // seek to the offset in file from whence - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // closes the file corresponding to the requested ObjectID private: - ACE_HANDLE fd (TAO_ENV_SINGLE_ARG_DECL); + ACE_HANDLE fd (ACE_ENV_SINGLE_ARG_DECL); // Extracts the ACE_HANDLE from the objectID PortableServer::POA_var poa_; @@ -80,12 +80,12 @@ public: ~System (void); //Destructor - PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); //Returns the default POA of this object File::Descriptor_ptr open (const char *file_name, CORBA::Long flags - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, File::IOError)); // Opens a file ,creates a Descriptor reference with the diff --git a/TAO/examples/POA/Default_Servant/client.cpp b/TAO/examples/POA/Default_Servant/client.cpp index b40fb6b4f5e..9782d810a77 100644 --- a/TAO/examples/POA/Default_Servant/client.cpp +++ b/TAO/examples/POA/Default_Servant/client.cpp @@ -72,12 +72,12 @@ parse_args (int argc, char **argv) int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse the command-line arguments to get the IOR @@ -106,18 +106,18 @@ main (int argc, char **argv) ACE_OS::close (input_file); CORBA::Object_var object = orb->string_to_object (ior.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow the object reference to a File::System File::System_var file_system = File::System::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Creat the file filename i.e "test" File::Descriptor_var fd = file_system->open (filename, O_CREAT | O_RDWR - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int message_length = ACE_OS::strlen (message) + 1; @@ -126,16 +126,16 @@ main (int argc, char **argv) File::Descriptor::DataBuffer data_sent (message_length, message_length, buffer, 1); // write the message to the file - fd->write (data_sent TAO_ENV_ARG_PARAMETER); + fd->write (data_sent ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; //seek to the beginning of the file - fd->lseek (0, SEEK_SET TAO_ENV_ARG_PARAMETER); + fd->lseek (0, SEEK_SET ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Read back the written message File::Descriptor::DataBuffer_var data_received = fd->read (message_length - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; char *result = (char *) &data_received[0]; @@ -145,7 +145,7 @@ main (int argc, char **argv) result)); // close the file - fd->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + fd->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/POA/Default_Servant/server.cpp b/TAO/examples/POA/Default_Servant/server.cpp index 5ff1c36ce5c..75f729016cb 100644 --- a/TAO/examples/POA/Default_Servant/server.cpp +++ b/TAO/examples/POA/Default_Servant/server.cpp @@ -58,12 +58,12 @@ parse_args (int argc, char **argv) int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = parse_args (argc, argv); @@ -73,14 +73,14 @@ main (int argc, char **argv) // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow the object reference to a POA reference - PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyList policies (5); @@ -88,34 +88,34 @@ main (int argc, char **argv) // ID Assignment Policy policies[0] = - root_poa->create_id_assignment_policy (PortableServer::USER_ID TAO_ENV_ARG_PARAMETER); + root_poa->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Lifespan Policy policies[1] = - root_poa->create_lifespan_policy (PortableServer::PERSISTENT TAO_ENV_ARG_PARAMETER); + root_poa->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Request Processing Policy policies[2] = - root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT TAO_ENV_ARG_PARAMETER); + root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Servant Retention Policy policies[3] = - root_poa->create_servant_retention_policy (PortableServer::RETAIN TAO_ENV_ARG_PARAMETER); + root_poa->create_servant_retention_policy (PortableServer::RETAIN ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Id Uniqueness Policy policies[4] = - root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID TAO_ENV_ARG_PARAMETER); + root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_CString name = "firstPOA"; PortableServer::POA_var first_poa = root_poa->create_POA (name.c_str (), poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (CORBA::ULong i = 0; @@ -123,7 +123,7 @@ main (int argc, char **argv) ++i) { CORBA::Policy_ptr policy = policies[i]; - policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -135,16 +135,16 @@ main (int argc, char **argv) first_poa->activate_object_with_id (file_system_oid.in (), &file_system_impl - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var file_system = - first_poa->id_to_reference (file_system_oid.in () TAO_ENV_ARG_PARAMETER); + first_poa->id_to_reference (file_system_oid.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the IOR for the "FileSystem" object CORBA::String_var file_system_ior = - orb->object_to_string (file_system.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (file_system.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG,"%s\n", @@ -160,11 +160,11 @@ main (int argc, char **argv) ACE_OS::fclose (output_file); // set the state of the poa_manager to active i.e ready to process requests - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Run the ORB - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/examples/POA/Explicit_Activation/server.cpp b/TAO/examples/POA/Explicit_Activation/server.cpp index 410a364b7f5..3a45abc8b67 100644 --- a/TAO/examples/POA/Explicit_Activation/server.cpp +++ b/TAO/examples/POA/Explicit_Activation/server.cpp @@ -124,7 +124,7 @@ write_iors_to_file (const char *first_ior, int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -132,7 +132,7 @@ main (int argc, char **argv) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = parse_args (argc, argv); @@ -142,18 +142,18 @@ main (int argc, char **argv) // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Policies for the firstPOA to be created. @@ -163,19 +163,19 @@ main (int argc, char **argv) // Id Assignment Policy policies[0] = root_poa->create_id_assignment_policy (PortableServer::USER_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Lifespan policy policies[1] = root_poa->create_lifespan_policy (PortableServer::PERSISTENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Threading policy policies[2] = root_poa->create_thread_policy (PortableServer::ORB_CTRL_MODEL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create the firstPOA under the RootPOA. @@ -184,16 +184,16 @@ main (int argc, char **argv) root_poa->create_POA (name.c_str (), poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - policies[2]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[2]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Threading policy policies[2] = root_poa->create_thread_policy (PortableServer::SINGLE_THREAD_MODEL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create the secondPOA under the firstPOA. @@ -202,7 +202,7 @@ main (int argc, char **argv) first_poa->create_POA (name.c_str (), poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Creation of POAs is over. Destroy the Policy objects. @@ -210,7 +210,7 @@ main (int argc, char **argv) i < policies.length (); ++i) { - policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -230,11 +230,11 @@ main (int argc, char **argv) // raises (ServantAlreadyActive, WrongPolicy); PortableServer::ObjectId_var first_oid = root_poa->activate_object (&first_foo_impl - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get Object Reference for the first_foo_impl object. - Foo_var first_foo = first_foo_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + Foo_var first_foo = first_foo_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get ObjectId for object secondFoo and use that ObjectId to @@ -247,11 +247,11 @@ main (int argc, char **argv) first_poa->activate_object_with_id (second_oid.in (), &second_foo_impl - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get Object reference for second_foo_impl object. - Foo_var second_foo = second_foo_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + Foo_var second_foo = second_foo_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get ObjectId for the string thirdPOA Create the object reference @@ -273,20 +273,20 @@ main (int argc, char **argv) CORBA::Object_var third_foo = second_poa->create_reference_with_id (third_oid.in (), "IDL:Foo:1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Stringyfy all the object references and print them out. CORBA::String_var first_ior = - orb->object_to_string (first_foo.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (first_foo.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var second_ior = - orb->object_to_string (second_foo.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (second_foo.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var third_ior = - orb->object_to_string (third_foo.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (third_foo.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -305,13 +305,13 @@ main (int argc, char **argv) MyFooServant third_foo_impl (orb.in (), second_poa.in (), 29); second_poa->activate_object_with_id (third_oid.in (), &third_foo_impl - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_TIMEPROBE_PRINT; diff --git a/TAO/examples/POA/FindPOA/FindPOA.cpp b/TAO/examples/POA/FindPOA/FindPOA.cpp index d13eed56c18..91989c55e41 100644 --- a/TAO/examples/POA/FindPOA/FindPOA.cpp +++ b/TAO/examples/POA/FindPOA/FindPOA.cpp @@ -36,7 +36,7 @@ find_non_existant_POA (PortableServer::POA_ptr parent, PortableServer::POA_var child_poa = parent->find_POA (child_poa_name, activate - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (PortableServer::POA::AdapterNonExistent, foo) @@ -54,31 +54,31 @@ find_non_existant_POA (PortableServer::POA_ptr parent, int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; // Initialize the ORB ACE_TRY { - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow Object reference to RootPOA to a POA reference. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in() TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Try to find a non-existant POA. Since the Adapter Activator @@ -94,7 +94,7 @@ main (int argc, char **argv) // Register the TAO_Adapter_Activator reference to be the RootPOA's // Adapter Activator. root_poa->the_activator (activator.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Try to find a childPOA of RootPOA named firstPOA @@ -102,14 +102,14 @@ main (int argc, char **argv) PortableServer::POA_var first_poa = root_poa->find_POA (name.c_str (), 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; name = "secondPOA"; PortableServer::POA_var second_poa = first_poa->find_POA (name.c_str (), 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Try to find a non-existant POA. Even though the Adapter @@ -121,15 +121,15 @@ main (int argc, char **argv) // Get the names of all the POAs CORBA::String_var root_poa_name = - root_poa->the_name (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var first_poa_name = - first_poa->the_name (TAO_ENV_SINGLE_ARG_PARAMETER); + first_poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var second_poa_name = - second_poa->the_name (TAO_ENV_SINGLE_ARG_PARAMETER); + second_poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/examples/POA/Forwarding/MyFooServant.cpp b/TAO/examples/POA/Forwarding/MyFooServant.cpp index ac7acfc29ef..d22139f29fd 100644 --- a/TAO/examples/POA/Forwarding/MyFooServant.cpp +++ b/TAO/examples/POA/Forwarding/MyFooServant.cpp @@ -18,42 +18,42 @@ MyFooServant::MyFooServant (CORBA::ORB_ptr orb, } CORBA::Long -MyFooServant::doit (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +MyFooServant::doit (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_++; } void -MyFooServant::forward (TAO_ENV_SINGLE_ARG_DECL) +MyFooServant::forward (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Foo::Cannot_Forward)) { - this->activator_.forward_requests (TAO_ENV_SINGLE_ARG_PARAMETER); + this->activator_.forward_requests (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = this->poa_->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->poa_->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -MyFooServant::shutdown (TAO_ENV_SINGLE_ARG_DECL) +MyFooServant::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } PortableServer::POA_ptr -MyFooServant::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +MyFooServant::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/examples/POA/Forwarding/MyFooServant.h b/TAO/examples/POA/Forwarding/MyFooServant.h index fd27cedbcb3..8f3a21d1bfd 100644 --- a/TAO/examples/POA/Forwarding/MyFooServant.h +++ b/TAO/examples/POA/Forwarding/MyFooServant.h @@ -36,18 +36,18 @@ public: MyFooServantActivator &activator, CORBA::Long value); - virtual CORBA::Long doit (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::Long doit (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Setup forwarding - virtual void forward (TAO_ENV_SINGLE_ARG_DECL) + virtual void forward (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Foo::Cannot_Forward)); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); // Returns the default POA for this servant. protected: diff --git a/TAO/examples/POA/Forwarding/Servant_Activator.cpp b/TAO/examples/POA/Forwarding/Servant_Activator.cpp index 0e6a08ded10..bc70ba7e938 100644 --- a/TAO/examples/POA/Forwarding/Servant_Activator.cpp +++ b/TAO/examples/POA/Forwarding/Servant_Activator.cpp @@ -15,12 +15,12 @@ MyFooServantActivator::MyFooServantActivator (CORBA::ORB_ptr orb, PortableServer::Servant MyFooServantActivator::incarnate (const PortableServer::ObjectId &, PortableServer::POA_ptr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)) { this->orb_->shutdown (0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Throw forward exception @@ -36,14 +36,14 @@ MyFooServantActivator::etherealize (const PortableServer::ObjectId &, PortableServer::Servant servant, CORBA::Boolean, CORBA::Boolean - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { delete servant; } void -MyFooServantActivator::forward_requests (TAO_ENV_SINGLE_ARG_DECL) +MyFooServantActivator::forward_requests (ACE_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->forward_to_.in ())) ACE_THROW (Foo::Cannot_Forward ()); diff --git a/TAO/examples/POA/Forwarding/Servant_Activator.h b/TAO/examples/POA/Forwarding/Servant_Activator.h index affd047814f..5ced44f1f9f 100644 --- a/TAO/examples/POA/Forwarding/Servant_Activator.h +++ b/TAO/examples/POA/Forwarding/Servant_Activator.h @@ -35,7 +35,7 @@ public: virtual PortableServer::Servant incarnate (const PortableServer::ObjectId & oid, PortableServer::POA_ptr adapter - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)); @@ -44,10 +44,10 @@ public: PortableServer::Servant serv, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void forward_requests (TAO_ENV_SINGLE_ARG_DECL); + void forward_requests (ACE_ENV_SINGLE_ARG_DECL); // Object should be forwarded from now on. private: diff --git a/TAO/examples/POA/Forwarding/client.cpp b/TAO/examples/POA/Forwarding/client.cpp index 781ee1a7ca2..6468da9c49d 100644 --- a/TAO/examples/POA/Forwarding/client.cpp +++ b/TAO/examples/POA/Forwarding/client.cpp @@ -67,14 +67,14 @@ parse_args (int argc, char **argv) void do_calls (Foo_ptr foo - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { for (int j = 1; j <= servers; j++) { for (int i = 1; i <= iterations; i++) { // Invoke the doit() method of the foo reference. - CORBA::Long result = foo->doit (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Long result = foo->doit (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Print the result of doit () method of the foo reference. @@ -88,7 +88,7 @@ do_calls (Foo_ptr foo { ACE_DEBUG ((LM_DEBUG, "Asking server to forward next time\n")); - foo->forward (TAO_ENV_SINGLE_ARG_PARAMETER); + foo->forward (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } @@ -98,12 +98,12 @@ do_calls (Foo_ptr foo int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize options based on command-line arguments. @@ -114,19 +114,19 @@ main (int argc, char **argv) // Get an object reference from the argument string. CORBA::Object_var object = - orb->string_to_object (IOR TAO_ENV_ARG_PARAMETER); + orb->string_to_object (IOR ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Try to narrow the object reference to a Foo reference. Foo_var foo = - Foo::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Foo::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; do_calls (foo.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - foo->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + foo->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/POA/Forwarding/server.cpp b/TAO/examples/POA/Forwarding/server.cpp index fd0acdefe82..eb617310753 100644 --- a/TAO/examples/POA/Forwarding/server.cpp +++ b/TAO/examples/POA/Forwarding/server.cpp @@ -64,7 +64,7 @@ parse_args (int argc, char **argv) PortableServer::POA_ptr setup_poa (PortableServer::POA_ptr root_poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Policies for the childPOA to be created. CORBA::PolicyList policies (2); @@ -73,17 +73,17 @@ setup_poa (PortableServer::POA_ptr root_poa // Tell the POA to use a servant manager. policies[0] = root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // Allow implicit activation. policies[1] = root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil ()); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // Create POA as child of RootPOA with the above policies. This POA @@ -92,7 +92,7 @@ setup_poa (PortableServer::POA_ptr root_poa root_poa->create_POA ("childPOA", poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // Creation of childPOAs is over. Destroy the Policy objects. @@ -100,7 +100,7 @@ setup_poa (PortableServer::POA_ptr root_poa i < policies.length (); ++i) { - policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil ()); } @@ -110,14 +110,14 @@ setup_poa (PortableServer::POA_ptr root_poa MyFooServantActivator * create_servant_manager (CORBA::ORB_ptr orb, PortableServer::POA_ptr child_poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Object_var forward_to; if (forward_to_ior) { forward_to = orb->string_to_object (forward_to_ior - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -129,7 +129,7 @@ create_servant_manager (CORBA::ORB_ptr orb, // Set MyFooServantActivator to be the servant activator. child_poa->set_servant_manager (activator - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // For the code above, we're using the CORBA 3.0 servant manager // semantics supported by TAO. For CORBA 2.x ORBs you'd need to // use the following code in place of the previous line: @@ -138,7 +138,7 @@ create_servant_manager (CORBA::ORB_ptr orb, // activator->_this (); // // child_poa->set_servant_manager (servant_activator.in (), - // TAO_ENV_SINGLE_ARG_PARAMETER); + // ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); MyFooServant *servant = 0; @@ -152,12 +152,12 @@ create_servant_manager (CORBA::ORB_ptr orb, PortableServer::ServantBase_var servant_var (servant); Foo_var foo = - servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::String_var ior = orb->object_to_string (foo.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); FILE *output_file = ACE_OS::fopen (ior_output_file, "w"); @@ -183,7 +183,7 @@ main (int argc, if (result == -1) return -1; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. @@ -191,43 +191,43 @@ main (int argc, CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var child_poa = setup_poa (root_poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ServantManager_var manager = create_servant_manager (orb.in (), child_poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/POA/Generic_Servant/MyFooServant.cpp b/TAO/examples/POA/Generic_Servant/MyFooServant.cpp index 241d420cd47..a28cdc05848 100644 --- a/TAO/examples/POA/Generic_Servant/MyFooServant.cpp +++ b/TAO/examples/POA/Generic_Servant/MyFooServant.cpp @@ -35,27 +35,27 @@ MyFooServant::~MyFooServant (void) // Return the Default POA of this Servant PortableServer::POA_ptr -MyFooServant::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +MyFooServant::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } CORBA::Long -MyFooServant::doit (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +MyFooServant::doit (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } void -MyFooServant::simply_doit (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +MyFooServant::simply_doit (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } void MyFooServant::timed_operation (CORBA::ULong timeout - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -69,10 +69,10 @@ MyFooServant::timed_operation (CORBA::ULong timeout } void -MyFooServant::shutdown (TAO_ENV_SINGLE_ARG_DECL) +MyFooServant::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/examples/POA/Generic_Servant/MyFooServant.h b/TAO/examples/POA/Generic_Servant/MyFooServant.h index e3b14fceeda..e715a747a18 100644 --- a/TAO/examples/POA/Generic_Servant/MyFooServant.h +++ b/TAO/examples/POA/Generic_Servant/MyFooServant.h @@ -29,23 +29,23 @@ public: virtual ~MyFooServant (void); // Destructor - virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); // Returns the Default POA of this Servant object - virtual CORBA::Long doit (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::Long doit (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Simple doit method - virtual void simply_doit (TAO_ENV_SINGLE_ARG_DECL) + virtual void simply_doit (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Even simpler doit method virtual void timed_operation (CORBA::ULong timeout - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Timed operation. - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Shutdown the ORB diff --git a/TAO/examples/POA/Generic_Servant/client.cpp b/TAO/examples/POA/Generic_Servant/client.cpp index 121b62356a1..16f7dd3d5a0 100644 --- a/TAO/examples/POA/Generic_Servant/client.cpp +++ b/TAO/examples/POA/Generic_Servant/client.cpp @@ -155,7 +155,7 @@ read_IOR_from_file (void) int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -163,7 +163,7 @@ main (int argc, char **argv) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize options based on command-line arguments. @@ -180,17 +180,17 @@ main (int argc, char **argv) // Get an object reference from the argument string. CORBA::Object_var object = orb->string_to_object (IOR - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Try to narrow the object reference to a Foo reference. Foo_var foo = Foo::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (foo.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -212,20 +212,20 @@ main (int argc, char **argv) if (oneway) { // Invoke the simply_doit() method of the foo reference. - foo->simply_doit (TAO_ENV_SINGLE_ARG_PARAMETER); + foo->simply_doit (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } else if (timed_operations) { // Invoke the timed_operation() method of the foo reference. foo->timed_operation (timeout - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else { // Invoke the doit() method of the foo reference. - result = foo->doit (TAO_ENV_SINGLE_ARG_PARAMETER); + result = foo->doit (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -239,7 +239,7 @@ main (int argc, char **argv) if (shutdown_server) { - foo->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + foo->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/examples/POA/Loader/Servant_Activator.cpp b/TAO/examples/POA/Loader/Servant_Activator.cpp index d0797662314..4fd9ea40348 100644 --- a/TAO/examples/POA/Loader/Servant_Activator.cpp +++ b/TAO/examples/POA/Loader/Servant_Activator.cpp @@ -66,7 +66,7 @@ ServantActivator_i::ServantActivator_i (CORBA::ORB_ptr orb, PortableServer::Servant ServantActivator_i::incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)) { @@ -91,7 +91,7 @@ ServantActivator_i::etherealize (const PortableServer::ObjectId &oid, PortableServer::Servant servant, CORBA::Boolean, CORBA::Boolean remaining_activations - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // If there are no remaining activations i.e ObjectIds associated diff --git a/TAO/examples/POA/Loader/Servant_Activator.h b/TAO/examples/POA/Loader/Servant_Activator.h index aa514132129..38becd7117a 100644 --- a/TAO/examples/POA/Loader/Servant_Activator.h +++ b/TAO/examples/POA/Loader/Servant_Activator.h @@ -60,7 +60,7 @@ public: virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)); // This method is invoked by a POA with USE_SERVANT_MANAGER and @@ -78,7 +78,7 @@ public: PortableServer::Servant servant, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This method is invoked whenever a MyFooServant for a MyFoo object // is deactivated. This occurs when the POA is destroyed or the diff --git a/TAO/examples/POA/Loader/Servant_Locator.cpp b/TAO/examples/POA/Loader/Servant_Locator.cpp index ce60de2ad7e..e59a44f7537 100644 --- a/TAO/examples/POA/Loader/Servant_Locator.cpp +++ b/TAO/examples/POA/Loader/Servant_Locator.cpp @@ -71,7 +71,7 @@ ServantLocator_i::preinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa, const char * /* operation */, PortableServer::ServantLocator::Cookie &cookie - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)) { @@ -102,7 +102,7 @@ ServantLocator_i::postinvoke (const PortableServer::ObjectId &oid, const char * /* operation */, PortableServer::ServantLocator::Cookie cookie, PortableServer::Servant servant - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Check the passed servant with the cookie. diff --git a/TAO/examples/POA/Loader/Servant_Locator.h b/TAO/examples/POA/Loader/Servant_Locator.h index dc72a49eb6e..f8bab75628f 100644 --- a/TAO/examples/POA/Loader/Servant_Locator.h +++ b/TAO/examples/POA/Loader/Servant_Locator.h @@ -64,7 +64,7 @@ public: PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie &the_cookie - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)); // This method is invoked by a POA whenever it receives a request @@ -82,7 +82,7 @@ public: const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This method is invoked whenever a MyFooServant completes a // request. As the Servant Loactor interface is used when the POA diff --git a/TAO/examples/POA/Loader/Server_Manager.cpp b/TAO/examples/POA/Loader/Server_Manager.cpp index b6e2b933323..6993740bc61 100644 --- a/TAO/examples/POA/Loader/Server_Manager.cpp +++ b/TAO/examples/POA/Loader/Server_Manager.cpp @@ -108,14 +108,14 @@ Server_i::write_iors_to_file (const char *first_ior, int Server_i::init (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB. orb_ = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = parse_args (argc, argv); @@ -125,16 +125,16 @@ Server_i::init (int argc, char **argv) // Obtain the RootPOA. CORBA::Object_var obj = orb_->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow the Object reference to a POA reference root_poa_ = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POAManager of RootPOA - poa_manager_ = root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager_ = root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -158,7 +158,7 @@ Server_i::create_poa (const char *name, { PortableServer::POA_ptr my_poa = 0; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -168,21 +168,21 @@ Server_i::create_poa (const char *name, policies_[0] = root_poa_->create_id_assignment_policy (PortableServer::USER_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Lifespan Policy. policies_[1] = root_poa_->create_lifespan_policy (PortableServer::PERSISTENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Request Processing Policy. policies_[2] = root_poa_->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Servant Retention Policy. @@ -190,13 +190,13 @@ Server_i::create_poa (const char *name, policies_[3] = root_poa_->create_servant_retention_policy (PortableServer::RETAIN - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); if (servant_retention_policy == 0) policies_[3] = root_poa_->create_servant_retention_policy (PortableServer::NON_RETAIN - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create myPOA as the child of RootPOA with the above @@ -206,7 +206,7 @@ Server_i::create_poa (const char *name, my_poa = root_poa_->create_POA (name, poa_manager_.in (), policies_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Destroy the policy objects as they have been passed to @@ -216,7 +216,7 @@ Server_i::create_poa (const char *name, ++i) { CORBA::Policy_ptr policy = policies_[i]; - policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -236,7 +236,7 @@ Server_i::create_poa (const char *name, int Server_i::create_activator (PortableServer::POA_var first_poa) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -254,7 +254,7 @@ Server_i::create_activator (PortableServer::POA_var first_poa) // firstPOA. this->servant_activator_ = temp_servant_activator; first_poa->set_servant_manager (this->servant_activator_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // For the code above, we're using the CORBA 3.0 servant manager // semantics supported by TAO. For CORBA 2.x ORBs you'd need to // use the following code in place of the previous lines: @@ -262,7 +262,7 @@ Server_i::create_activator (PortableServer::POA_var first_poa) // this->servant_activator_ = temp_servant_activator->_this (); // // first_poa->set_servant_manager (this->servant_activator_.in () - // TAO_ENV_ARG_PARAMETER); + // ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create a reference with user created ID in firstPOA which @@ -272,7 +272,7 @@ Server_i::create_activator (PortableServer::POA_var first_poa) first_foo_ = first_poa->create_reference_with_id (first_foo_oid.in (), "IDL:Foo:1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -290,7 +290,7 @@ Server_i::create_activator (PortableServer::POA_var first_poa) int Server_i::create_locator (PortableServer::POA_var second_poa) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -307,7 +307,7 @@ Server_i::create_locator (PortableServer::POA_var second_poa) // secondPOA. this->servant_locator_ = temp_servant_locator; second_poa->set_servant_manager (this->servant_locator_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // For the code above, we're using the CORBA 3.0 servant manager // semantics supported by TAO. For CORBA 2.x ORBs you'd need to // use the following code in place of the previous lines: @@ -317,7 +317,7 @@ Server_i::create_locator (PortableServer::POA_var second_poa) // Set ServantLocator_i object as the servant Manager of // secondPOA. // second_poa->set_servant_manager (this->servant_locator_.in () - // TAO_ENV_ARG_PARAMETER); + // ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Try to create a reference with user created ID in second_poa @@ -328,7 +328,7 @@ Server_i::create_locator (PortableServer::POA_var second_poa) second_foo_ = second_poa->create_reference_with_id (second_foo_oid.in (), "IDL:Foo:1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -346,7 +346,7 @@ Server_i::create_locator (PortableServer::POA_var second_poa) int Server_i::run (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -355,12 +355,12 @@ Server_i::run (void) CORBA::String_var first_foo_ior = orb_->object_to_string (first_foo_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var second_foo_ior = orb_->object_to_string (second_foo_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Print the ior's of first_foo and second_foo. @@ -377,12 +377,12 @@ Server_i::run (void) // Set the poa_manager state to active, ready to process // requests. - poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Run the ORB. - orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/POA/NewPOA/NewPOA.cpp b/TAO/examples/POA/NewPOA/NewPOA.cpp index 16528209a04..40041f1252e 100644 --- a/TAO/examples/POA/NewPOA/NewPOA.cpp +++ b/TAO/examples/POA/NewPOA/NewPOA.cpp @@ -28,14 +28,14 @@ ACE_RCSID(NewPOA, NewPOA, "$Id$") void print_poa (PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::String_var poa_name = - poa->the_name (TAO_ENV_SINGLE_ARG_PARAMETER); + poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::OctetSeq_var poa_id = - poa->id (TAO_ENV_SINGLE_ARG_PARAMETER); + poa->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -58,7 +58,7 @@ print_poa (PortableServer::POA_ptr poa "\n")); PortableServer::POAList_var children = - poa->the_children (TAO_ENV_SINGLE_ARG_PARAMETER); + poa->the_children (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; for (CORBA::ULong index = 0; @@ -66,7 +66,7 @@ print_poa (PortableServer::POA_ptr poa ++index) { print_poa (children[index].in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -74,7 +74,7 @@ print_poa (PortableServer::POA_ptr poa int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -82,18 +82,18 @@ main (int argc, char **argv) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // _narrow() the Object to get the POA object, i.e., the root_poa. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Policies for the new POAs @@ -102,12 +102,12 @@ main (int argc, char **argv) // Threading policy policies[0] = - root_poa->create_thread_policy (PortableServer::ORB_CTRL_MODEL TAO_ENV_ARG_PARAMETER); + root_poa->create_thread_policy (PortableServer::ORB_CTRL_MODEL ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Lifespan policy policies[1] = - root_poa->create_lifespan_policy (PortableServer::TRANSIENT TAO_ENV_ARG_PARAMETER); + root_poa->create_lifespan_policy (PortableServer::TRANSIENT ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Creation of the firstPOA @@ -116,7 +116,7 @@ main (int argc, char **argv) root_poa->create_POA (name.c_str (), PortableServer::POAManager::_nil (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Creation of the new POA, i.e. firstPOA/secondPOA @@ -125,7 +125,7 @@ main (int argc, char **argv) first_poa->create_POA (name.c_str (), PortableServer::POAManager::_nil (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Creating thirdPOA. @@ -135,7 +135,7 @@ main (int argc, char **argv) root_poa->create_POA (name.c_str (), PortableServer::POAManager::_nil (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Creation of the new POAs over, so destroy the Policy_ptr's. @@ -144,26 +144,26 @@ main (int argc, char **argv) ++i) { CORBA::Policy_ptr policy = policies[i]; - policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } // Get the names of all the POAs and print them out. CORBA::String_var root_poa_name = - root_poa->the_name (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var first_poa_name = - first_poa->the_name (TAO_ENV_SINGLE_ARG_PARAMETER); + first_poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var second_poa_name = - second_poa->the_name (TAO_ENV_SINGLE_ARG_PARAMETER); + second_poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var third_poa_name = - third_poa->the_name (TAO_ENV_SINGLE_ARG_PARAMETER); + third_poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -174,7 +174,7 @@ main (int argc, char **argv) third_poa_name.in ())); print_poa (root_poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp index f7d810d91b3..386656aefe6 100644 --- a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp +++ b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp @@ -30,7 +30,7 @@ MyFooServantActivator::MyFooServantActivator (CORBA::ORB_ptr orb) PortableServer::Servant MyFooServantActivator::incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)) { @@ -56,7 +56,7 @@ MyFooServantActivator::etherealize (const PortableServer::ObjectId &, PortableServer::Servant servant, CORBA::Boolean , CORBA::Boolean remaining_activations - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // If there are no remaining activations i.e ObjectIds associated diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h index 9a59ae24937..ecd1d02be1e 100644 --- a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h +++ b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h @@ -26,7 +26,7 @@ public: virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)); // This method is invoked by a POA with USE_SERVANT_MANAGER and @@ -38,7 +38,7 @@ public: PortableServer::Servant servant, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This method is invoked whenever a MyFooServant for a MyFoo object // is deactivated. diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp index 12edc90e4f3..21a684cf78d 100644 --- a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp +++ b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp @@ -34,7 +34,7 @@ MyFooServantLocator::preinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa, const char * /* operation */, PortableServer::ServantLocator::Cookie &cookie - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)) { @@ -67,7 +67,7 @@ MyFooServantLocator::postinvoke (const PortableServer::ObjectId & /* oid */, const char * /* operation */, PortableServer::ServantLocator::Cookie cookie, PortableServer::Servant servant - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Check the passed servant with the cookie. diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h index bea915fb46f..e2823db28ac 100644 --- a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h +++ b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h @@ -33,7 +33,7 @@ public: PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie &the_cookie - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)); // This method is invoked by a POA whenever it receives a request @@ -44,7 +44,7 @@ public: const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This method is invoked whenever a MyFooServant completes a // request. diff --git a/TAO/examples/POA/On_Demand_Activation/server.cpp b/TAO/examples/POA/On_Demand_Activation/server.cpp index 8c151381fa0..dc19aaf83fb 100644 --- a/TAO/examples/POA/On_Demand_Activation/server.cpp +++ b/TAO/examples/POA/On_Demand_Activation/server.cpp @@ -100,12 +100,12 @@ write_iors_to_file (const char *first_ior, int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB. - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = parse_args (argc, argv); @@ -115,18 +115,18 @@ main (int argc, char **argv) // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow the Object reference to a POA reference PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POAManager of RootPOA PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -135,24 +135,24 @@ main (int argc, char **argv) // ID Assignment Policy policies[0] = - root_poa->create_id_assignment_policy (PortableServer::USER_ID TAO_ENV_ARG_PARAMETER); + root_poa->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Lifespan Policy policies[1] = - root_poa->create_lifespan_policy (PortableServer::PERSISTENT TAO_ENV_ARG_PARAMETER); + root_poa->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Request Processing Policy policies[2] = - root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER TAO_ENV_ARG_PARAMETER); + root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var first_poa; { // Servant Retention Policy policies[3] = - root_poa->create_servant_retention_policy (PortableServer::RETAIN TAO_ENV_ARG_PARAMETER); + root_poa->create_servant_retention_policy (PortableServer::RETAIN ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_CString name = "firstPOA"; @@ -162,7 +162,7 @@ main (int argc, char **argv) first_poa = root_poa->create_POA (name.c_str (), poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -171,7 +171,7 @@ main (int argc, char **argv) { // Servant Retention Policy policies[3] = - root_poa->create_servant_retention_policy (PortableServer::NON_RETAIN TAO_ENV_ARG_PARAMETER); + root_poa->create_servant_retention_policy (PortableServer::NON_RETAIN ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_CString name = "secondPOA"; @@ -182,7 +182,7 @@ main (int argc, char **argv) second_poa = root_poa->create_POA (name.c_str (), poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -194,7 +194,7 @@ main (int argc, char **argv) ++i) { CORBA::Policy_ptr policy = policies[i]; - policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -207,7 +207,7 @@ main (int argc, char **argv) // Set MyFooServantActivator object as the servant_manager of // firstPOA. first_poa->set_servant_manager (activator - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // For the code above, we're using the CORBA 3.0 servant manager // semantics supported by TAO. For CORBA 2.x ORBs you'd need to // use the following code in place of the previous line: @@ -216,7 +216,7 @@ main (int argc, char **argv) // activator->_this (); // // first_poa->set_servant_manager (servant_activator.in (), - // TAO_ENV_SINGLE_ARG_PARAMETER); + // ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Create a reference with user created ID in firstPOA which uses @@ -226,7 +226,7 @@ main (int argc, char **argv) PortableServer::string_to_ObjectId ("firstFoo"); CORBA::Object_var first_foo = - first_poa->create_reference_with_id (first_foo_oid.in (), "IDL:Foo:1.0" TAO_ENV_ARG_PARAMETER); + first_poa->create_reference_with_id (first_foo_oid.in (), "IDL:Foo:1.0" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Allocate the servant activator. @@ -238,7 +238,7 @@ main (int argc, char **argv) // Set MyFooServantLocator object as the servant Manager of // secondPOA. second_poa->set_servant_manager (locator - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // For the code above, we're using the CORBA 3.0 servant manager // semantics supported by TAO. For CORBA 2.x ORBs you'd need to // use the following code in place of the previous line: @@ -247,7 +247,7 @@ main (int argc, char **argv) // locator->_this (); // // second_poa->set_servant_manager (servant_locator.in (), - // TAO_ENV_SINGLE_ARG_PARAMETER); + // ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Try to create a reference with user created ID in second_poa @@ -258,19 +258,19 @@ main (int argc, char **argv) CORBA::Object_var second_foo = second_poa->create_reference_with_id (second_foo_oid.in (), - "IDL:Foo:1.0" TAO_ENV_ARG_PARAMETER); + "IDL:Foo:1.0" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Invoke object_to_string on the references created in firstPOA and // secondPOA. CORBA::String_var first_foo_ior = - orb->object_to_string (first_foo.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (first_foo.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var second_foo_ior = - orb->object_to_string (second_foo.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (second_foo.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Print the ior's of first_foo and second_foo. @@ -285,11 +285,11 @@ main (int argc, char **argv) return write_result; // Set the poa_manager state to active, ready to process requests. - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Run the ORB. - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp index 53ac5c7f696..37a8deb7ca3 100644 --- a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp +++ b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp @@ -33,7 +33,7 @@ ServantActivator_i::ServantActivator_i (CORBA::ORB_ptr orb) PortableServer::Servant ServantActivator_i::incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)) { @@ -62,7 +62,7 @@ ServantActivator_i::etherealize (const PortableServer::ObjectId &oid, PortableServer::Servant servant, CORBA::Boolean, CORBA::Boolean remaining_activations - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // If there are no remaining activations i.e ObjectIds associated diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h index 0ce43922984..60ebef0f510 100644 --- a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h +++ b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h @@ -38,7 +38,7 @@ public: virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)); // This method is invoked by a POA with USE_SERVANT_MANAGER and @@ -56,7 +56,7 @@ public: PortableServer::Servant servant, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This method is invoked whenever a MyFooServant for a MyFoo object // is deactivated. This occurs when the POA is destroyed or the diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp index 2155e074ab5..69130be8720 100644 --- a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp +++ b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp @@ -35,7 +35,7 @@ ServantLocator_i::preinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa, const char * /* operation */, PortableServer::ServantLocator::Cookie &cookie - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)) { @@ -74,7 +74,7 @@ ServantLocator_i::postinvoke (const PortableServer::ObjectId &oid, const char * /* operation */, PortableServer::ServantLocator::Cookie cookie, PortableServer::Servant servant - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Check the passed servant with the cookie. diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h index 5efee2c24f8..f28a90d2ff6 100644 --- a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h +++ b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h @@ -43,7 +43,7 @@ public: PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie &the_cookie - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)); // This method is invoked by a POA whenever it receives a request @@ -61,7 +61,7 @@ public: const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This method is invoked whenever a MyFooServant completes a // request. As the Servant Loactor interface is used when the POA diff --git a/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp index c0c74fb87a4..75781ee9f81 100644 --- a/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp +++ b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp @@ -112,7 +112,7 @@ Server_i::write_iors_to_file (const char *first_ior, int Server_i::init (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -120,7 +120,7 @@ Server_i::init (int argc, char **argv) orb_ = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = parse_args (argc, argv); @@ -130,16 +130,16 @@ Server_i::init (int argc, char **argv) // Obtain the RootPOA. CORBA::Object_var obj = orb_->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow the Object reference to a POA reference root_poa_ = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POAManager of RootPOA - poa_manager_ = root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager_ = root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -163,7 +163,7 @@ Server_i::create_poa (const char *name, { PortableServer::POA_ptr my_poa = 0; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { policies_.length (4); @@ -172,21 +172,21 @@ Server_i::create_poa (const char *name, policies_[0] = root_poa_->create_id_assignment_policy (PortableServer::USER_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Lifespan Policy. policies_[1] = root_poa_->create_lifespan_policy (PortableServer::PERSISTENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Request Processing Policy. policies_[2] = root_poa_->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Servant Retention Policy. @@ -194,14 +194,14 @@ Server_i::create_poa (const char *name, policies_[3] = root_poa_->create_servant_retention_policy (PortableServer::RETAIN - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (servant_retention_policy == 0) policies_[3] = root_poa_->create_servant_retention_policy (PortableServer::NON_RETAIN - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create myPOA as the child of RootPOA with the above @@ -211,7 +211,7 @@ Server_i::create_poa (const char *name, my_poa = root_poa_->create_POA (name, poa_manager_.in (), policies_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Destroy the policy objects as they have been passed to @@ -221,7 +221,7 @@ Server_i::create_poa (const char *name, ++i) { CORBA::Policy_ptr policy = policies_[i]; - policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -241,7 +241,7 @@ Server_i::create_poa (const char *name, int Server_i::create_activator (PortableServer::POA_var first_poa) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // An Servant Activator object is created which will activate @@ -253,7 +253,7 @@ Server_i::create_activator (PortableServer::POA_var first_poa) // Set ServantActivator_i object as the servant_manager of // firstPOA. first_poa->set_servant_manager (servant_activator_impl_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // For the code above, we're using the CORBA 3.0 servant manager // semantics supported by TAO. For CORBA 2.x ORBs you'd need to // use the following code in place of the previous line: @@ -262,7 +262,7 @@ Server_i::create_activator (PortableServer::POA_var first_poa) // servant_activator_impl_->_this (); // // first_poa->set_servant_manager (servant_activator.in (), - // TAO_ENV_SINGLE_ARG_PARAMETER); + // ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Create a reference with user created ID in firstPOA which @@ -276,7 +276,7 @@ Server_i::create_activator (PortableServer::POA_var first_poa) first_foo_ = first_poa->create_reference_with_id (first_foo_oid.in (), "IDL:Foo:1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -294,7 +294,7 @@ Server_i::create_activator (PortableServer::POA_var first_poa) int Server_i::create_locator (PortableServer::POA_var second_poa) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // An Servant Locator object is created which will activate @@ -306,7 +306,7 @@ Server_i::create_locator (PortableServer::POA_var second_poa) // Set ServantLocator_i object as the servant Manager of // secondPOA. second_poa->set_servant_manager (servant_locator_impl_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // For the code above, we're using the CORBA 3.0 servant manager // semantics supported by TAO. For CORBA 2.x ORBs you'd need to // use the following code in place of the previous line: @@ -314,7 +314,7 @@ Server_i::create_locator (PortableServer::POA_var second_poa) // servant_loator_impl_->_this (); // // second_poa->set_servant_manager (servant_locator_impl_, - // TAO_ENV_SINGLE_ARG_PARAMETER); + // ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Try to create a reference with user created ID in second_poa @@ -328,7 +328,7 @@ Server_i::create_locator (PortableServer::POA_var second_poa) second_foo_ = second_poa->create_reference_with_id (second_foo_oid.in (), "IDL:Foo:1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -346,7 +346,7 @@ Server_i::create_locator (PortableServer::POA_var second_poa) int Server_i::run (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Invoke object_to_string on the references created in firstPOA @@ -354,12 +354,12 @@ Server_i::run (void) CORBA::String_var first_foo_ior = orb_->object_to_string (first_foo_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var second_foo_ior = orb_->object_to_string (second_foo_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Print the ior's of first_foo and second_foo. @@ -376,15 +376,15 @@ Server_i::run (void) // Set the poa_manager state to active, ready to process // requests. - poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Run the ORB. - orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/POA/Reference_Counted_Servant/server.cpp b/TAO/examples/POA/Reference_Counted_Servant/server.cpp index 448d2d6ff3e..1c8a0812a1f 100644 --- a/TAO/examples/POA/Reference_Counted_Servant/server.cpp +++ b/TAO/examples/POA/Reference_Counted_Servant/server.cpp @@ -108,7 +108,7 @@ write_iors_to_file (const char *ior) int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -116,7 +116,7 @@ main (int argc, char **argv) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = parse_args (argc, argv); @@ -126,18 +126,18 @@ main (int argc, char **argv) // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Create a servant. @@ -149,16 +149,16 @@ main (int argc, char **argv) -1); // Get Object Reference for the foo_impl object. - Foo_var foo = foo_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + Foo_var foo = foo_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // This means that the ownership of now belongs to // the POA. - foo_impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + foo_impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Stringyfy all the object references and print them out. - CORBA::String_var ior = orb->object_to_string (foo.in () TAO_ENV_ARG_PARAMETER); + CORBA::String_var ior = orb->object_to_string (foo.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -169,10 +169,10 @@ main (int argc, char **argv) if (write_result != 0) return write_result; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/POA/RootPOA/RootPOA.cpp b/TAO/examples/POA/RootPOA/RootPOA.cpp index 007bbf9aa05..d9c6a8ba94b 100644 --- a/TAO/examples/POA/RootPOA/RootPOA.cpp +++ b/TAO/examples/POA/RootPOA/RootPOA.cpp @@ -26,30 +26,30 @@ ACE_RCSID(RootPOA, RootPOA, "$Id$") int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initilize the ORB - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Resolve the initial references for the name RootPOA thus getting // an object of type CORBA::Object. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // apply _narrow on the object of type CORBA::Object, to make it // a POA class Object. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the name of the root POA. CORBA::String_var poa_name = - root_poa->the_name (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/examples/POA/TIE/Foo_i.cpp b/TAO/examples/POA/TIE/Foo_i.cpp index 65d50eaa5e9..918fe3f149d 100644 --- a/TAO/examples/POA/TIE/Foo_i.cpp +++ b/TAO/examples/POA/TIE/Foo_i.cpp @@ -26,7 +26,7 @@ ACE_RCSID(TIE, Foo_i, "$Id$") // Return this->value CORBA::Long -Tie_i::doit (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Tie_i::doit (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; @@ -42,7 +42,7 @@ A_i::A_i (CORBA::Long value, // Return this->value CORBA::Long -A_i::doit (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +A_i::doit (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; @@ -50,7 +50,7 @@ A_i::doit (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) // Return the Default POA of this Servant PortableServer::POA_ptr -A_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +A_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -65,7 +65,7 @@ Outer_i::B_i::B_i (CORBA::Long value, // Return this->value CORBA::Long -Outer_i::B_i::doit (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Outer_i::B_i::doit (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; @@ -73,7 +73,7 @@ Outer_i::B_i::doit (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) // Return the Default POA of this Servant PortableServer::POA_ptr -Outer_i::B_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Outer_i::B_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -88,7 +88,7 @@ Outer_i::Inner_i::C_i::C_i (CORBA::Long value, // Return this->value CORBA::Long -Outer_i::Inner_i::C_i::doit (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Outer_i::Inner_i::C_i::doit (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; @@ -96,7 +96,7 @@ Outer_i::Inner_i::C_i::doit (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) // Return the Default POA of this Servant PortableServer::POA_ptr -Outer_i::Inner_i::C_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Outer_i::Inner_i::C_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/examples/POA/TIE/Foo_i.h b/TAO/examples/POA/TIE/Foo_i.h index 1b3e190bd97..218597d4e3e 100644 --- a/TAO/examples/POA/TIE/Foo_i.h +++ b/TAO/examples/POA/TIE/Foo_i.h @@ -25,7 +25,7 @@ public: Tie_i (CORBA::Long value); // Simple doit method - virtual CORBA::Long doit (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::Long doit (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); protected: @@ -41,11 +41,11 @@ public: PortableServer::POA_ptr poa); // Simple doit method - virtual CORBA::Long doit (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::Long doit (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns the Default POA of this Servant object - virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); protected: @@ -67,11 +67,11 @@ public: PortableServer::POA_ptr poa); // Simple doit method - virtual CORBA::Long doit (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::Long doit (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns the Default POA of this Servant object - virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); protected: @@ -93,11 +93,11 @@ public: PortableServer::POA_ptr poa); // Simple doit method - virtual CORBA::Long doit (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::Long doit (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns the Default POA of this Servant object - virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); protected: diff --git a/TAO/examples/POA/TIE/client.cpp b/TAO/examples/POA/TIE/client.cpp index 3629894c231..25dd5ef60af 100644 --- a/TAO/examples/POA/TIE/client.cpp +++ b/TAO/examples/POA/TIE/client.cpp @@ -110,27 +110,27 @@ class Test public: static void run (CORBA::ORB_ptr orb, char *IOR - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (IOR != 0) { // Get an object reference from the argument string. - CORBA::Object_var object = orb->string_to_object (IOR TAO_ENV_ARG_PARAMETER); + CORBA::Object_var object = orb->string_to_object (IOR ACE_ENV_ARG_PARAMETER); ACE_CHECK; - /*if (TAO_ENV_SINGLE_ARG_PARAMETER.exception () != 0) + /*if (ACE_ENV_SINGLE_ARG_PARAMETER.exception () != 0) { - TAO_ENV_ARG_PARAMETER.print_exception ("CORBA::ORB::string_to_object"); + ACE_ENV_ARG_PARAMETER.print_exception ("CORBA::ORB::string_to_object"); return; } */ // Try to narrow the object reference to a reference. - T_var foo = T::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + T_var foo = T::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; - /*if (TAO_ENV_SINGLE_ARG_PARAMETER.exception () != 0) + /*if (ACE_ENV_SINGLE_ARG_PARAMETER.exception () != 0) { - TAO_ENV_ARG_PARAMETER.print_exception ("_narrow"); + ACE_ENV_ARG_PARAMETER.print_exception ("_narrow"); return; } */ @@ -145,7 +145,7 @@ public: for (i = 0; i < iterations ; i++) { // Invoke the doit() method on the reference. - result = foo->doit (TAO_ENV_SINGLE_ARG_PARAMETER); + result = foo->doit (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -156,9 +156,9 @@ public: // compute average time. print_stats (elapsed_time, i); - /*if (TAO_ENV_SINGLE_ARG_PARAMETER.exception () != 0) + /*if (ACE_ENV_SINGLE_ARG_PARAMETER.exception () != 0) { - TAO_ENV_ARG_PARAMETER.print_exception ("doit"); + ACE_ENV_ARG_PARAMETER.print_exception ("doit"); return; } */ @@ -173,11 +173,11 @@ public: int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize options based on command-line arguments. @@ -189,32 +189,32 @@ main (int argc, char **argv) Test::run (orb.in (), IOR[i++] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test::run (orb.in (), IOR[i++] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test::run (orb.in (), IOR[i++] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test::run (orb.in (), IOR[i++] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test::run (orb.in (), IOR[i++] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test::run (orb.in (), IOR[i++] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/POA/TIE/server.cpp b/TAO/examples/POA/TIE/server.cpp index c34a7549e4e..18890eb8a55 100644 --- a/TAO/examples/POA/TIE/server.cpp +++ b/TAO/examples/POA/TIE/server.cpp @@ -22,7 +22,7 @@ ACE_RCSID(TIE, server, "$Id$") int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; char str[256]; @@ -31,26 +31,26 @@ main (int argc, char **argv) ACE_OS::strcpy (str, "CORBA::ORB_init"); // Initialize the ORB first. - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::strcpy (str, "PortableServer::POA::_narrow"); // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::strcpy (str, "PortableServer::POA::the_POAManager"); // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -61,13 +61,13 @@ main (int argc, char **argv) ACE_OS::strcpy (str,"PortableServer::POA::create_lifespan_policy"); // Lifespan policy policies[0] = - root_poa->create_lifespan_policy (PortableServer::PERSISTENT TAO_ENV_ARG_PARAMETER); + root_poa->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::strcpy (str, "PortableServer::POA::create_implicit_activation_policy"); // Implicit activation policy policies[1] = - root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION TAO_ENV_ARG_PARAMETER); + root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::strcpy (str, "PortableServer::POA::create_POA"); @@ -77,7 +77,7 @@ main (int argc, char **argv) root_poa->create_POA (name.c_str (), poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -89,7 +89,7 @@ main (int argc, char **argv) ++i) { CORBA::Policy_ptr policy = policies[i]; - policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -119,34 +119,34 @@ main (int argc, char **argv) ACE_OS::strcpy (str, "POA_A::_this"); // Get Object Reference for the a_impl object. - A_var a = a_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + A_var a = a_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::strcpy (str, "POA_Outer::B::_this"); // Get Object Reference for the b_impl object. - Outer::B_var b = b_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + Outer::B_var b = b_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::strcpy (str, "POA_Outer::Inner::C::_this"); // Get Object Reference for the c_impl object. - Outer::Inner::C_var c = c_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + Outer::Inner::C_var c = c_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; #if defined (ACE_HAS_USING_KEYWORD) ACE_OS::strcpy (str, "POA_A::_this"); // Get Object Reference for the a_tie_impl object. - A_var a_tie = a_tie_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + A_var a_tie = a_tie_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::strcpy (str, "POA_Outer::B::_this"); // Get Object Reference for the a_tie_impl object. - Outer::B_var b_tie = b_tie_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + Outer::B_var b_tie = b_tie_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::strcpy (str, "POA_Outer::C::_this"); // Get Object Reference for the c_tie_impl object. - Outer::Inner::C_var c_tie = c_tie_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + Outer::Inner::C_var c_tie = c_tie_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* ACE_HAS_USING_KEYWORD */ @@ -154,23 +154,23 @@ main (int argc, char **argv) ACE_OS::strcpy (str, "CORBA::ORB::object_to_string"); // Stringyfy all the object references and print them out. CORBA::String_var first_ior = - orb->object_to_string (a.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (a.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Stringyfy all the object references and print them out. CORBA::String_var second_ior = - orb->object_to_string (b.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (b.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Stringyfy all the object references and print them out. CORBA::String_var third_ior = - orb->object_to_string (c.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (c.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #if defined (ACE_HAS_USING_KEYWORD) // Stringyfy all the object references and print them out. CORBA::String_var forth_ior = - orb->object_to_string (a_tie.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (a_tie.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; FILE *output_file_1 = ACE_OS::fopen ("ior_1", "w"); @@ -203,13 +203,13 @@ main (int argc, char **argv) // Stringyfy all the object references and print them out. CORBA::String_var fifth_ior = - orb->object_to_string (b_tie.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (b_tie.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Stringyfy all the object references and print them out. CORBA::String_var sixth_ior = - orb->object_to_string (c_tie.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (c_tie.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; FILE *output_file_5 = ACE_OS::fopen ("ior_5", "w"); @@ -229,10 +229,10 @@ main (int argc, char **argv) #endif /* ACE_HAS_USING_KEYWORD */ - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Persistent_Grid/Grid_Client_i.cpp b/TAO/examples/Persistent_Grid/Grid_Client_i.cpp index 46c7be99dbd..2acbc958bdd 100644 --- a/TAO/examples/Persistent_Grid/Grid_Client_i.cpp +++ b/TAO/examples/Persistent_Grid/Grid_Client_i.cpp @@ -67,7 +67,7 @@ Grid_Client_i::run (const char *name, if (this->parse_args (argc, argv) == -1) return -1; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -75,7 +75,7 @@ Grid_Client_i::run (const char *name, Grid_ptr grid = client->make_grid (width_, height_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -91,7 +91,7 @@ Grid_Client_i::run (const char *name, grid->set (index_, ctr, (value_ + ctr) - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -103,7 +103,7 @@ Grid_Client_i::run (const char *name, ACE_TRY_CHECK; if (client.shutdown () == 1) { - client->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + client->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/examples/Persistent_Grid/Grid_i.cpp b/TAO/examples/Persistent_Grid/Grid_i.cpp index 29f586b7808..0502f60e8df 100644 --- a/TAO/examples/Persistent_Grid/Grid_i.cpp +++ b/TAO/examples/Persistent_Grid/Grid_i.cpp @@ -63,7 +63,7 @@ void Grid_i::set (CORBA::Short x, CORBA::Short y, CORBA::Long value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Grid::RANGE_ERROR)) { @@ -81,7 +81,7 @@ Grid_i::set (CORBA::Short x, CORBA::Long Grid_i::get (CORBA::Short x, CORBA::Short y - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Grid::RANGE_ERROR)) { @@ -97,14 +97,14 @@ Grid_i::get (CORBA::Short x, // Access methods. CORBA::Short -Grid_i::width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Grid_i::width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->width_; } CORBA::Short -Grid_i::height (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Grid_i::height (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->height_; @@ -112,7 +112,7 @@ Grid_i::height (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Grid_i::width (CORBA::Short x - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->width_ = x; @@ -120,7 +120,7 @@ Grid_i::width (CORBA::Short x void Grid_i::height (CORBA::Short y - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->height_ = y; @@ -128,7 +128,7 @@ Grid_i::height (CORBA::Short y // Destroy the grid void -Grid_i::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED ) +Grid_i::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { // Delete the array. @@ -180,7 +180,7 @@ Grid_Factory_i::~Grid_Factory_i (void) Grid_ptr Grid_Factory_i::make_grid (CORBA::Short width, CORBA::Short height - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -215,7 +215,7 @@ Grid_Factory_i::make_grid (CORBA::Short width, grid_ptr->set_pool (pool_t_); // Register the Grid pointer. - return grid_ptr->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return grid_ptr->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } // Set the ORB pointer. @@ -228,7 +228,7 @@ Grid_Factory_i::orb (CORBA::ORB_ptr o) // Shutdown. void -Grid_Factory_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Grid_Factory_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -240,7 +240,7 @@ Grid_Factory_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } void -Grid_Factory_i::cleanup (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Grid_Factory_i::cleanup (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { const char *name = "Array"; diff --git a/TAO/examples/Persistent_Grid/Grid_i.h b/TAO/examples/Persistent_Grid/Grid_i.h index 8598f2a4658..50bf997a2c5 100644 --- a/TAO/examples/Persistent_Grid/Grid_i.h +++ b/TAO/examples/Persistent_Grid/Grid_i.h @@ -43,15 +43,15 @@ public: virtual Grid_ptr make_grid (CORBA::Short, CORBA::Short - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This function creates and returns a . - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Shutdown the server. - virtual void cleanup (TAO_ENV_SINGLE_ARG_DECL_NOT_USED ) + virtual void cleanup (ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)); // Do a clean up of the memory map @@ -98,40 +98,40 @@ public: ~Grid_i (void); // Destructor - virtual CORBA::Short width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CORBA::Short width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns the width of the grid - virtual CORBA::Short height (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CORBA::Short height (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns the height of the grid virtual void width (CORBA::Short - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Sets the width of the grid. virtual void height (CORBA::Short - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Sets the height of the grid. virtual void set (CORBA::Short, CORBA::Short, CORBA::Long - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, Grid::RANGE_ERROR)); // Sets the grid value. virtual CORBA::Long get (CORBA::Short, CORBA::Short - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, Grid::RANGE_ERROR)); // Gets the grid value. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Destroy the grid. diff --git a/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp b/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp index 7aeb5702ea6..3eac4a3d7a2 100644 --- a/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp +++ b/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp @@ -58,14 +58,14 @@ Persistent_Client_i::run (const char *name, if (this->parse_args (argc, argv) == -1) return -1; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Make the Grid. Grid_ptr grid = client->make_grid (width_, height_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -78,7 +78,7 @@ Persistent_Client_i::run (const char *name, { CORBA::Long ret_val = grid->get (index_, ctr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -87,12 +87,12 @@ Persistent_Client_i::run (const char *name, } if (client.shutdown () == 1) { - client->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + client->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } if (this->remove_ == 1) { - client->cleanup (TAO_ENV_SINGLE_ARG_PARAMETER); + client->cleanup (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/examples/Persistent_Grid/Simple_util.cpp b/TAO/examples/Persistent_Grid/Simple_util.cpp index 50b9a858961..02eacbebccd 100644 --- a/TAO/examples/Persistent_Grid/Simple_util.cpp +++ b/TAO/examples/Persistent_Grid/Simple_util.cpp @@ -69,14 +69,14 @@ template int Server::init (const char *servant_name, int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Call the init of to initialize the ORB and // create a child POA under the root POA. if (this->orb_manager_.init_child_poa (argc, argv, "child_poa" - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "init_child_poa"), @@ -109,7 +109,7 @@ Server::init (const char *servant_name, CORBA::String_var str = this->orb_manager_.activate_under_child_poa (servant_name, &this->servant_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -138,10 +138,10 @@ Server::init (const char *servant_name, } template int -Server::run (TAO_ENV_SINGLE_ARG_DECL) +Server::run (ACE_ENV_SINGLE_ARG_DECL) { // Run the main event loop for the ORB. - int ret = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER); + int ret = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (ret == -1) @@ -245,7 +245,7 @@ Client::init (const char * /*name*/, this->argc_ = argc; this->argv_ = argv; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -253,7 +253,7 @@ Client::init (const char * /*name*/, this->orb_ = CORBA::ORB_init (this->argc_, this->argv_, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse command line and verify parameters. @@ -263,7 +263,7 @@ Client::init (const char * /*name*/, if(this->ior_ != 0) { CORBA::Object_var server_object = - this->orb_->string_to_object (this->ior_ TAO_ENV_ARG_PARAMETER); + this->orb_->string_to_object (this->ior_ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -273,7 +273,7 @@ Client::init (const char * /*name*/, this->ior_), -1); this->server_ = InterfaceObj::_narrow (server_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else diff --git a/TAO/examples/Persistent_Grid/Simple_util.h b/TAO/examples/Persistent_Grid/Simple_util.h index e95c2f3173c..f1491f00151 100644 --- a/TAO/examples/Persistent_Grid/Simple_util.h +++ b/TAO/examples/Persistent_Grid/Simple_util.h @@ -47,7 +47,7 @@ public: int init (const char *servant_name, int argc, char *argv[] - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize the Server state - parsing arguments and waiting. // interface_name is the name used to register the Servant. @@ -55,7 +55,7 @@ public: // After calling , this method will register the server with // the TAO Naming Service using the servant_name passed to . - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the orb. protected: @@ -120,7 +120,7 @@ public: void shutdown (int); // Fills in the shutdwon flag. - int obtain_initial_references (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + int obtain_initial_references (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); // Initialize naming service protected: diff --git a/TAO/examples/Persistent_Grid/server.cpp b/TAO/examples/Persistent_Grid/server.cpp index 76fa1e1d145..4a31cc0403e 100644 --- a/TAO/examples/Persistent_Grid/server.cpp +++ b/TAO/examples/Persistent_Grid/server.cpp @@ -13,18 +13,18 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "\n\tGrid server\n\n")); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { if (server.init ("Grid", argc, argv - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) return 1; else { - server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp b/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp index 1200d20bd2d..e0d2194384f 100644 --- a/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp +++ b/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp @@ -37,7 +37,7 @@ UDP_Client_i::svc (void) client_name += "_"; client_name += pid; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -51,7 +51,7 @@ UDP_Client_i::svc (void) udp_->invoke (corba_client_name.in (), udpHandler_.inout (), i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -64,7 +64,7 @@ UDP_Client_i::svc (void) } // shut down remote ORB - udp_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + udp_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Time_Value tv (0, 500); // 50ms diff --git a/TAO/examples/PluggableUDP/tests/Basic/UDP_i.cpp b/TAO/examples/PluggableUDP/tests/Basic/UDP_i.cpp index 1027ecb86f8..2011f010dcc 100644 --- a/TAO/examples/PluggableUDP/tests/Basic/UDP_i.cpp +++ b/TAO/examples/PluggableUDP/tests/Basic/UDP_i.cpp @@ -30,7 +30,7 @@ void UDP_i::invoke (const char * client_name, UDP_ptr udpHandler, CORBA::Long request_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY @@ -62,7 +62,7 @@ UDP_i::invoke (const char * client_name, udpHandler->invoke (client_name, UDP::_nil (), request_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -78,7 +78,7 @@ UDP_i::invoke (const char * client_name, // Shutdown. void -UDP_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +UDP_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/examples/PluggableUDP/tests/Basic/UDP_i.h b/TAO/examples/PluggableUDP/tests/Basic/UDP_i.h index 4ed19a5aa01..3ed48cd85a2 100644 --- a/TAO/examples/PluggableUDP/tests/Basic/UDP_i.h +++ b/TAO/examples/PluggableUDP/tests/Basic/UDP_i.h @@ -47,10 +47,10 @@ public: virtual void invoke (const char *client_name, UDP_ptr udpHandler, CORBA::Long request_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Shutdown the server. diff --git a/TAO/examples/PluggableUDP/tests/Basic/client.cpp b/TAO/examples/PluggableUDP/tests/Basic/client.cpp index 90cd6bfcc2d..f7db9081cbd 100644 --- a/TAO/examples/PluggableUDP/tests/Basic/client.cpp +++ b/TAO/examples/PluggableUDP/tests/Basic/client.cpp @@ -79,18 +79,18 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; UDP_var udp_var = - UDP::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + UDP::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (udp_var.in ())) @@ -102,7 +102,7 @@ main (int argc, char *argv[]) // Activate POA to handle the call back. CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -111,14 +111,14 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Instantiate reply handler @@ -128,7 +128,7 @@ main (int argc, char *argv[]) udp_i.orb (orb.in ()); UDP_var udpHandler_var = - udp_i._this (TAO_ENV_SINGLE_ARG_PARAMETER); + udp_i._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Instantiate client @@ -143,17 +143,17 @@ main (int argc, char *argv[]) // ORB loop, will be shut down by our client thread - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, // ethernalize objects 0 // wait for completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; client->wait (); diff --git a/TAO/examples/PluggableUDP/tests/Basic/server.cpp b/TAO/examples/PluggableUDP/tests/Basic/server.cpp index 0397c8a3c7e..c550d02c525 100644 --- a/TAO/examples/PluggableUDP/tests/Basic/server.cpp +++ b/TAO/examples/PluggableUDP/tests/Basic/server.cpp @@ -66,11 +66,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -79,11 +79,11 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Install a persistent POA in order to achieve a persistent IOR @@ -92,11 +92,11 @@ main (int argc, char *argv[]) policies.length (2); policies[0] = root_poa->create_lifespan_policy(PortableServer::PERSISTENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policies[1] = root_poa->create_id_assignment_policy (PortableServer::USER_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -104,13 +104,13 @@ main (int argc, char *argv[]) root_poa->create_POA("persistent", poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - policies[1]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[1]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -125,25 +125,25 @@ main (int argc, char *argv[]) persistent_poa->activate_object_with_id (id.in (), &udp_i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = persistent_poa->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - UDP_var udp_var = UDP::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + UDP_var udp_var = UDP::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - // UDP_var udp_var = udp_i._this (TAO_ENV_SINGLE_ARG_PARAMETER); + // UDP_var udp_var = udp_i._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (udp_var.in ())) ACE_DEBUG ((LM_DEBUG, "Failed to narrow correct object reference.\n")); CORBA::String_var ior = - orb->object_to_string (udp_var.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (udp_var.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -161,7 +161,7 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; /* @@ -171,7 +171,7 @@ main (int argc, char *argv[]) udpHandler_i.orb (orb.in ()); UDP_var udpHandler_var = - udpHandler_i._this (TAO_ENV_SINGLE_ARG_PARAMETER); + udpHandler_i._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Instantiate client @@ -182,17 +182,17 @@ main (int argc, char *argv[]) client->activate (); */ - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, // ethernalize objects 0 // wait for completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; //delete client; diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp index 75639141928..f80fd02751a 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp @@ -48,11 +48,11 @@ UDP_PerformanceClient::svc () CORBA::String_var corba_client_name = CORBA::string_dup (client_name.c_str ()); - UDP_var udpHandler_var = udpHandler_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + UDP_var udpHandler_var = udpHandler_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; udp_->setResponseHandler (udpHandler_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_High_Res_Timer timer; @@ -71,7 +71,7 @@ UDP_PerformanceClient::svc () { udp_->invoke (corba_client_name.in (), j - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -93,7 +93,7 @@ UDP_PerformanceClient::svc () // Reset expected request ID udp_->reset (corba_client_name.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Give the reset a chance to propagate back to us @@ -155,7 +155,7 @@ UDP_PerformanceClient::svc () } // shut down remote ORB - udp_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + udp_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Time_Value tv (0, 50); // 50ms @@ -163,7 +163,7 @@ UDP_PerformanceClient::svc () // Shut down local ORB, trigger the end of the ORB event loop // in the main thread. - orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp index 409902492b7..025db630473 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp @@ -30,7 +30,7 @@ UDP_i::orb (CORBA::ORB_ptr orb) void UDP_i::setResponseHandler (UDP_ptr udpHandler - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (udpHandler)) @@ -43,7 +43,7 @@ UDP_i::setResponseHandler (UDP_ptr udpHandler void UDP_i::invoke (const char * client_name, CORBA::Long request_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY @@ -80,7 +80,7 @@ UDP_i::invoke (const char * client_name, { responseHandler_->invoke (client_name, request_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -96,7 +96,7 @@ UDP_i::invoke (const char * client_name, void UDP_i::reset (const char * client_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY @@ -109,7 +109,7 @@ UDP_i::reset (const char * client_name if (!CORBA::is_nil (responseHandler_.in ())) { responseHandler_->reset (client_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -124,7 +124,7 @@ UDP_i::reset (const char * client_name // Shutdown. void -UDP_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +UDP_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -134,7 +134,7 @@ UDP_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { // Instruct the ORB to shutdown. - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h index 292d4bff2bb..5d5d773ee25 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h +++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h @@ -39,20 +39,20 @@ public: // Destructor virtual void setResponseHandler (UDP_ptr udpHandler - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void invoke (const char *client_name, CORBA::Long request_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void reset (const char * client_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Shutdown the server. diff --git a/TAO/examples/PluggableUDP/tests/Performance/client.cpp b/TAO/examples/PluggableUDP/tests/Performance/client.cpp index 995ef1c8a14..07bb98914ee 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/client.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/client.cpp @@ -78,18 +78,18 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "PerformanceClient" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "PerformanceClient" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; UDP_var udp_var = - UDP::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + UDP::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (udp_var.in ())) @@ -103,7 +103,7 @@ main (int argc, char *argv[]) // Activate POA to handle the call back. CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -112,14 +112,14 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Instantiate reply handler @@ -129,7 +129,7 @@ main (int argc, char *argv[]) udp_i.orb (orb.in ()); UDP_var udpHandler_var = - udp_i._this (TAO_ENV_SINGLE_ARG_PARAMETER); + udp_i._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Instantiate client @@ -143,17 +143,17 @@ main (int argc, char *argv[]) client->activate (); // ORB loop, will be shut down by our client thread - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); // Fetch responses + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); // Fetch responses ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "ORB finished\n")); root_poa->destroy (1, // ethernalize objects 0 // wait for completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // it is save to delete the client, because the client was actually diff --git a/TAO/examples/PluggableUDP/tests/Performance/server.cpp b/TAO/examples/PluggableUDP/tests/Performance/server.cpp index e2ca027a6e2..594220abce1 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/server.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/server.cpp @@ -68,7 +68,7 @@ static void *svc (void *arg) ACE_TRY_NEW_ENV { - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -86,11 +86,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "PerformanceServer" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "PerformanceServer" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -99,11 +99,11 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Install a persistent POA in order to achieve a persistent IOR @@ -113,25 +113,25 @@ main (int argc, char *argv[]) policies.length (2); policies[0] = root_poa->create_lifespan_policy(PortableServer::PERSISTENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policies[1] = root_poa->create_id_assignment_policy (PortableServer::USER_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var persistent_poa = root_poa->create_POA("persistent", poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - policies[1]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[1]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -146,16 +146,16 @@ main (int argc, char *argv[]) persistent_poa->activate_object_with_id (id.in (), &udp_i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = persistent_poa->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - UDP_var udp_var = UDP::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + UDP_var udp_var = UDP::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (udp_var.in ())) @@ -163,7 +163,7 @@ main (int argc, char *argv[]) "Failed to narrow correct object reference.\n")); CORBA::String_var ior = - orb->object_to_string (udp_var.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (udp_var.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -181,7 +181,7 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (orb_threads > 1) @@ -189,17 +189,17 @@ main (int argc, char *argv[]) svc, orb.in ()); - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "ORB finished\n")); root_poa->destroy (1, // ethernalize objects 0 // wait for completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Thread_Manager::instance ()->wait (); diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp index 7358ff679cb..8ac9cf12210 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp @@ -69,15 +69,15 @@ int main (int argc, char *argv[]) CORBA::ORB_init (argc, argv, "ORB_Test_Client" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = - orb->string_to_object (iorFile TAO_ENV_ARG_PARAMETER); + orb->string_to_object (iorFile ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Simple_Server_var server = - Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -90,7 +90,7 @@ int main (int argc, char *argv[]) CORBA::String_var string = orb->object_to_string (server.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -103,7 +103,7 @@ int main (int argc, char *argv[]) //ACE_DEBUG ((LM_DEBUG, "threads finished\n")); - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -143,7 +143,7 @@ Client::svc (void) // This sets up the connector, so that we do not incur // the overhead on the first call in the loop. - server_->sendCharSeq (charSeq TAO_ENV_ARG_PARAMETER); + server_->sendCharSeq (charSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; timer.start (); @@ -153,10 +153,10 @@ Client::svc (void) { client_count++; - server_->sendCharSeq (charSeq TAO_ENV_ARG_PARAMETER); + server_->sendCharSeq (charSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - //server_->sendOctetSeq (octetSeq TAO_ENV_ARG_PARAMETER); + //server_->sendOctetSeq (octetSeq ACE_ENV_ARG_PARAMETER); //ACE_DEBUG ((LM_DEBUG, ".")); } @@ -177,7 +177,7 @@ Client::svc (void) dur / this->niterations_, 1000000 / (dur / this->niterations_))); - server_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp index d8931bf0556..5c6e538d760 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp @@ -39,11 +39,11 @@ int main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "ORB_Test_Server" TAO_ENV_ARG_PARAMETER); + "ORB_Test_Server" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -52,26 +52,26 @@ int main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Simple_Server_i server_impl (orb.in ()); - PortableServer::ObjectId_var oidServer = root_poa->activate_object (&server_impl TAO_ENV_ARG_PARAMETER); + PortableServer::ObjectId_var oidServer = root_poa->activate_object (&server_impl ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::Object_var objOne = root_poa->id_to_reference (oidServer.in () TAO_ENV_ARG_PARAMETER); + CORBA::Object_var objOne = root_poa->id_to_reference (oidServer.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - Simple_Server_var server = Simple_Server::_narrow (objOne.in () TAO_ENV_ARG_PARAMETER); + Simple_Server_var server = Simple_Server::_narrow (objOne.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -89,18 +89,18 @@ int main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp index fa6a8f0d36e..e9ad3018cc1 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp @@ -10,7 +10,7 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb) } void -Simple_Server_i::sendCharSeq (const Char_Seq & TAO_ENV_ARG_DECL_NOT_USED) +Simple_Server_i::sendCharSeq (const Char_Seq & ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Simple_Server_count++; @@ -18,7 +18,7 @@ Simple_Server_i::sendCharSeq (const Char_Seq & TAO_ENV_ARG_DECL_NOT_USED) } void -Simple_Server_i::sendOctetSeq (const Octet_Seq & TAO_ENV_ARG_DECL_NOT_USED) +Simple_Server_i::sendOctetSeq (const Octet_Seq & ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Simple_Server_count++; @@ -27,7 +27,7 @@ Simple_Server_i::sendOctetSeq (const Octet_Seq & TAO_ENV_ARG_DECL_NOT_USED) CORBA::Long Simple_Server_i::get_number (CORBA::Long - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Long tmp = Simple_Server_count; @@ -36,14 +36,14 @@ Simple_Server_i::get_number (CORBA::Long } void -Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Simple_Server_i::shutdown\n")); ACE_TRY { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h index fe54f70163b..27dccfeb62d 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h @@ -31,16 +31,16 @@ public: // ctor // = The Simple_Server methods. - void sendCharSeq (const Char_Seq & charSeq TAO_ENV_ARG_DECL_NOT_USED) + void sendCharSeq (const Char_Seq & charSeq ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void sendOctetSeq (const Octet_Seq & octetSeq TAO_ENV_ARG_DECL_NOT_USED) + void sendOctetSeq (const Octet_Seq & octetSeq ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Long get_number (CORBA::Long num TAO_ENV_ARG_DECL_NOT_USED) + CORBA::Long get_number (CORBA::Long num ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL) + void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/examples/Quoter/Factory_Finder.cpp b/TAO/examples/Quoter/Factory_Finder.cpp index cc164b10346..c7a76c7a97f 100644 --- a/TAO/examples/Quoter/Factory_Finder.cpp +++ b/TAO/examples/Quoter/Factory_Finder.cpp @@ -35,7 +35,7 @@ Quoter_Factory_Finder_Server::~Quoter_Factory_Finder_Server (void) factory_Finder_Name[0].id = CORBA::string_dup ("IDL_Quoter"); factory_Finder_Name[1].id = CORBA::string_dup ("Quoter_Factory_Finder"); if (this->quoterNamingContext_var_.ptr () != 0) - this->quoterNamingContext_var_->unbind (factory_Finder_Name TAO_ENV_ARG_PARAMETER); + this->quoterNamingContext_var_->unbind (factory_Finder_Name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -49,7 +49,7 @@ Quoter_Factory_Finder_Server::~Quoter_Factory_Finder_Server (void) int Quoter_Factory_Finder_Server::init (int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { const char *exception_message = "Null Message"; @@ -58,7 +58,7 @@ Quoter_Factory_Finder_Server::init (int argc, exception_message = "While ORB_Manager::init"; if (this->orb_manager_.init (argc, argv - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "init"), @@ -67,7 +67,7 @@ Quoter_Factory_Finder_Server::init (int argc, // Activate the POA manager exception_message = "While activating the POA manager"; - int result = this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER); + int result = this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) @@ -88,7 +88,7 @@ Quoter_Factory_Finder_Server::init (int argc, exception_message = "Failure while activating the Quoter Factory Finder Impl"; CORBA::String_var str = this->orb_manager_.activate (this->quoter_Factory_Finder_i_ptr_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Print the IOR. @@ -102,7 +102,7 @@ Quoter_Factory_Finder_Server::init (int argc, // Get the Naming Service object reference. exception_message = "While resolving the Name Service"; CORBA::Object_var namingObj_var = - orb_manager_.orb()->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); + orb_manager_.orb()->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (namingObj_var.in ())) @@ -113,7 +113,7 @@ Quoter_Factory_Finder_Server::init (int argc, exception_message = "While narrowing the Naming Context"; CosNaming::NamingContext_var namingContext_var = CosNaming::NamingContext::_narrow (namingObj_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the IDL_Quoter naming context. @@ -123,13 +123,13 @@ Quoter_Factory_Finder_Server::init (int argc, exception_message = "While resolving the Quoter Naming Context"; CORBA::Object_var quoterNamingObj_var = - namingContext_var->resolve (quoterContextName TAO_ENV_ARG_PARAMETER); + namingContext_var->resolve (quoterContextName ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; exception_message = "While narrowing the Quoter Naming Context"; quoterNamingContext_var_ = CosNaming::NamingContext::_narrow (quoterNamingObj_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->debug_level_ >= 2) @@ -143,13 +143,13 @@ Quoter_Factory_Finder_Server::init (int argc, quoter_Factory_Finder_Name_[0].id = CORBA::string_dup ("Quoter_Factory_Finder"); exception_message = "Factory_Factory::_this"; - CORBA::Object_var ff_obj = this->quoter_Factory_Finder_i_ptr_->_this(TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Object_var ff_obj = this->quoter_Factory_Finder_i_ptr_->_this(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; exception_message = "While binding the Factory Finder"; quoterNamingContext_var_->bind (quoter_Factory_Finder_Name_, ff_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->debug_level_ >= 2) @@ -168,13 +168,13 @@ Quoter_Factory_Finder_Server::init (int argc, } int -Quoter_Factory_Finder_Server::run (TAO_ENV_SINGLE_ARG_DECL) +Quoter_Factory_Finder_Server::run (ACE_ENV_SINGLE_ARG_DECL) { if (this->debug_level_ >= 1) ACE_DEBUG ((LM_DEBUG, "\nQuoter Example: Quoter_Factory_Finder_Server is running\n")); - orb_manager_.orb()->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb_manager_.orb()->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -223,14 +223,14 @@ main (int argc, char *argv []) ACE_TRY_NEW_ENV { - int result = quoter_Factory_Finder_Server.init (argc, argv TAO_ENV_ARG_PARAMETER); + int result = quoter_Factory_Finder_Server.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) return 1; else { - quoter_Factory_Finder_Server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + quoter_Factory_Finder_Server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/examples/Quoter/Factory_Finder.h b/TAO/examples/Quoter/Factory_Finder.h index 44844e12947..3d9e89ca85d 100644 --- a/TAO/examples/Quoter/Factory_Finder.h +++ b/TAO/examples/Quoter/Factory_Finder.h @@ -37,10 +37,10 @@ public: ~Quoter_Factory_Finder_Server (void); // Destructor - int init (int argc, char *argv[] TAO_ENV_ARG_DECL); + int init (int argc, char *argv[] ACE_ENV_ARG_DECL); // Initialize the Quoter_Server state - parsing arguments and ... - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the orb u_int parse_args (void); diff --git a/TAO/examples/Quoter/Factory_Finder_i.cpp b/TAO/examples/Quoter/Factory_Finder_i.cpp index 023e2ec6c8d..9720df205c5 100644 --- a/TAO/examples/Quoter/Factory_Finder_i.cpp +++ b/TAO/examples/Quoter/Factory_Finder_i.cpp @@ -38,7 +38,7 @@ Quoter_Factory_Finder_i::~Quoter_Factory_Finder_i (void) CosLifeCycle::Factories * Quoter_Factory_Finder_i::find_factories (const CosLifeCycle::Key &factory_key - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosLifeCycle::NoFactory)) { @@ -54,7 +54,7 @@ Quoter_Factory_Finder_i::find_factories (const CosLifeCycle::Key &factory_key // Get the Naming Service object reference. exception_message = "While resolving the Name Service"; CORBA::Object_var namingObj_var = - orb_ptr->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); + orb_ptr->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (namingObj_var.in ())) @@ -65,7 +65,7 @@ Quoter_Factory_Finder_i::find_factories (const CosLifeCycle::Key &factory_key exception_message = "While narrowing the Naming Context"; CosNaming::NamingContext_var namingContext_var = CosNaming::NamingContext::_narrow (namingObj_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Take the key supplied to search for a Quoter Factory @@ -74,7 +74,7 @@ Quoter_Factory_Finder_i::find_factories (const CosLifeCycle::Key &factory_key // Try to get a reference to a Quoter Factory exception_message = "While resolving the Factory Object"; CORBA::Object_var quoterFactoryObject_var = - namingContext_var->resolve (factoryName TAO_ENV_ARG_PARAMETER); + namingContext_var->resolve (factoryName ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Check if it is a valid Quoter Factory reference diff --git a/TAO/examples/Quoter/Factory_Finder_i.h b/TAO/examples/Quoter/Factory_Finder_i.h index 8d7beeea56c..97695c7c9b2 100644 --- a/TAO/examples/Quoter/Factory_Finder_i.h +++ b/TAO/examples/Quoter/Factory_Finder_i.h @@ -29,7 +29,7 @@ public: ~Quoter_Factory_Finder_i (void); virtual CosLifeCycle::Factories * find_factories (const CosLifeCycle::Key &factory_key - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosLifeCycle::NoFactory)); // Returns a sequence of Factories if factories matching the diff --git a/TAO/examples/Quoter/Generic_Factory.cpp b/TAO/examples/Quoter/Generic_Factory.cpp index f4329dbf36d..acb7858daf1 100644 --- a/TAO/examples/Quoter/Generic_Factory.cpp +++ b/TAO/examples/Quoter/Generic_Factory.cpp @@ -35,7 +35,7 @@ Quoter_Generic_Factory_Server::~Quoter_Generic_Factory_Server (void) generic_Factory_Name[0].id = CORBA::string_dup ("IDL_Quoter"); generic_Factory_Name[1].id = CORBA::string_dup ("Quoter_Generic_Factory"); if (this->quoterNamingContext_var_.ptr () != 0) - this->quoterNamingContext_var_->unbind (generic_Factory_Name TAO_ENV_ARG_PARAMETER); + this->quoterNamingContext_var_->unbind (generic_Factory_Name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) @@ -52,7 +52,7 @@ Quoter_Generic_Factory_Server::~Quoter_Generic_Factory_Server (void) int Quoter_Generic_Factory_Server::init (int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { const char *exception_message = "Null Message"; @@ -61,7 +61,7 @@ Quoter_Generic_Factory_Server::init (int argc, int result = 0; // Initialize the ORB Manager exception_message = "While initing the orb_manager"; - result = this->orb_manager_.init (argc, argv TAO_ENV_ARG_PARAMETER); + result = this->orb_manager_.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) @@ -69,7 +69,7 @@ Quoter_Generic_Factory_Server::init (int argc, // Activate the POA manager exception_message = "While activating the POA manager"; - result = this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER); + result = this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) @@ -88,7 +88,7 @@ Quoter_Generic_Factory_Server::init (int argc, exception_message = "While activating the Generic Factory"; CORBA::String_var str = this->orb_manager_.activate (this->quoter_Generic_Factory_i_ptr_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Print the IOR. @@ -103,7 +103,7 @@ Quoter_Generic_Factory_Server::init (int argc, // Get the Naming Service object reference. exception_message = "While getting the Naming Service Reference"; CORBA::Object_var namingObj_var = - orb_manager_.orb()->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); + orb_manager_.orb()->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (namingObj_var.in ())) @@ -114,7 +114,7 @@ Quoter_Generic_Factory_Server::init (int argc, exception_message = "While narrowing the Naming Context"; CosNaming::NamingContext_var namingContext_var = CosNaming::NamingContext::_narrow (namingObj_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (namingContext_var.in ())) @@ -134,13 +134,13 @@ Quoter_Generic_Factory_Server::init (int argc, exception_message = "While resolving the Quoter"; CORBA::Object_var quoterNamingObj_var = namingContext_var->resolve (quoterContextName - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; exception_message = "While narrowing the Quoter"; quoterNamingContext_var_ = CosNaming::NamingContext::_narrow (quoterNamingObj_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->debug_level_ >= 2) @@ -154,13 +154,13 @@ Quoter_Generic_Factory_Server::init (int argc, quoter_Generic_Factory_Name[0].id = CORBA::string_dup ("Quoter_Generic_Factory"); exception_message = "Generic_Factory::_this"; - CORBA::Object_var gf_obj = this->quoter_Generic_Factory_i_ptr_->_this(TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Object_var gf_obj = this->quoter_Generic_Factory_i_ptr_->_this(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; exception_message = "While binding the Generic Factory"; quoterNamingContext_var_->bind (quoter_Generic_Factory_Name, gf_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->debug_level_ >= 2) @@ -181,20 +181,20 @@ Quoter_Generic_Factory_Server::init (int argc, exception_message = "While resolving the Life Cycle Service"; CORBA::Object_var life_Cycle_Service_Obj_var = namingContext_var->resolve (life_Cycle_Service_Name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; exception_message = "While narrowing the Life Cycle Service"; LifeCycleService::Life_Cycle_Service_var life_Cycle_Service_var = LifeCycleService::Life_Cycle_Service::_narrow (life_Cycle_Service_Obj_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->debug_level_ >= 2) ACE_DEBUG ((LM_DEBUG, "Generic_Factory: Have a proper reference to Life Cycle Service.\n")); exception_message = "While _this on Generic Factory"; - CORBA::Object_var object_var = this->quoter_Generic_Factory_i_ptr_->_this(TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Object_var object_var = this->quoter_Generic_Factory_i_ptr_->_this(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; exception_message = "While registering the generic factory"; @@ -202,7 +202,7 @@ Quoter_Generic_Factory_Server::init (int argc, "Bryan 503", // location "Generic Factory", // description object_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->debug_level_ >= 2) @@ -224,13 +224,13 @@ Quoter_Generic_Factory_Server::init (int argc, } int -Quoter_Generic_Factory_Server::run (TAO_ENV_SINGLE_ARG_DECL) +Quoter_Generic_Factory_Server::run (ACE_ENV_SINGLE_ARG_DECL) { if (this->debug_level_ >= 1) ACE_DEBUG ((LM_DEBUG, "\nQuoter Example: Quoter_Generic_Factory_Server is running\n")); - orb_manager_.orb()->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb_manager_.orb()->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -284,11 +284,11 @@ main (int argc, char *argv []) { if (quoter_Generic_Factory_Server.init (argc, argv - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) return 1; else { - quoter_Generic_Factory_Server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + quoter_Generic_Factory_Server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/examples/Quoter/Generic_Factory.h b/TAO/examples/Quoter/Generic_Factory.h index 0c1de6c0cd5..1d5950ebb27 100644 --- a/TAO/examples/Quoter/Generic_Factory.h +++ b/TAO/examples/Quoter/Generic_Factory.h @@ -39,10 +39,10 @@ public: int init (int argc, char *argv[] - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize the Quoter_Server state - parsing arguments and ... - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the orb. u_int parse_args (void); diff --git a/TAO/examples/Quoter/Generic_Factory_i.cpp b/TAO/examples/Quoter/Generic_Factory_i.cpp index d22e7ee8e87..bf8002d1ff4 100644 --- a/TAO/examples/Quoter/Generic_Factory_i.cpp +++ b/TAO/examples/Quoter/Generic_Factory_i.cpp @@ -34,7 +34,7 @@ Quoter_Generic_Factory_i::~Quoter_Generic_Factory_i (void) CORBA::Boolean Quoter_Generic_Factory_i::supports (const CosLifeCycle::Key & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; @@ -44,7 +44,7 @@ Quoter_Generic_Factory_i::supports (const CosLifeCycle::Key & CosNaming::NamingContext_ptr Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_key - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CosNaming::NamingContext_var quoterNamingContext_var; ACE_TRY @@ -55,7 +55,7 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k // Get the Naming Service object reference. CORBA::Object_var namingObj_var = - orb_ptr->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); + orb_ptr->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (namingObj_var.in ())) @@ -65,7 +65,7 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k // Narrow the object reference to a Naming Context. CosNaming::NamingContext_var namingContext_var = CosNaming::NamingContext::_narrow (namingObj_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosNaming::Name quoterContextName (1); // max = 1 @@ -74,12 +74,12 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k // Get the IDL_Quoter naming context. CORBA::Object_var quoterNamingObj_var = - namingContext_var->resolve (quoterContextName TAO_ENV_ARG_PARAMETER); + namingContext_var->resolve (quoterContextName ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; quoterNamingContext_var = CosNaming::NamingContext::_narrow (quoterNamingObj_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -96,7 +96,7 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k CORBA::Object_ptr Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key, const CosLifeCycle::Criteria & - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosLifeCycle::NoFactory, CosLifeCycle::InvalidCriteria, @@ -107,7 +107,7 @@ Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key, { CosNaming::NamingContext_var quoterNamingContext_var = this->get_naming_context (factory_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // ** now a proper reference to the quoter naming context is @@ -119,7 +119,7 @@ Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key, // Try to get a reference to a Quoter Factory CORBA::Object_var quoterFactoryObject_var = - quoterNamingContext_var->resolve (factory_Name TAO_ENV_ARG_PARAMETER); + quoterNamingContext_var->resolve (factory_Name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // We were able to get a reference to Quoter Factory. @@ -131,7 +131,7 @@ Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key, Stock::Quoter_Factory_var factory_var = Stock::Quoter_Factory::_narrow (quoterFactoryObject_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (factory_var.in ())) @@ -147,7 +147,7 @@ Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key, // Now retrieve the Quoter obj ref corresponding to the key. quoter_var = factory_var->create_quoter ("test" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->debug_level_ > 1) diff --git a/TAO/examples/Quoter/Generic_Factory_i.h b/TAO/examples/Quoter/Generic_Factory_i.h index e0477100101..b03ee673647 100644 --- a/TAO/examples/Quoter/Generic_Factory_i.h +++ b/TAO/examples/Quoter/Generic_Factory_i.h @@ -30,14 +30,14 @@ public: ~Quoter_Generic_Factory_i (void); CORBA::Boolean supports (const CosLifeCycle::Key &factory_key - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns true if the Generic Factory is able to forward a request // for creating an object described by the . CORBA::Object_ptr create_object (const CosLifeCycle::Key &factory_key, const CosLifeCycle::Criteria &the_criteria - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosLifeCycle::NoFactory, CosLifeCycle::InvalidCriteria, @@ -48,7 +48,7 @@ public: private: CosNaming::NamingContext_ptr get_naming_context (const CosLifeCycle::Key &factory_key - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // a helper to get the proper naming context. int debug_level_; diff --git a/TAO/examples/Quoter/Quoter_i.cpp b/TAO/examples/Quoter/Quoter_i.cpp index d24ba43056e..1b9d5a93819 100644 --- a/TAO/examples/Quoter/Quoter_i.cpp +++ b/TAO/examples/Quoter/Quoter_i.cpp @@ -45,7 +45,7 @@ Quoter_Factory_i::~Quoter_Factory_i (void) // Initialize everything in the factory -int Quoter_Factory_i::init (TAO_ENV_SINGLE_ARG_DECL) +int Quoter_Factory_i::init (ACE_ENV_SINGLE_ARG_DECL) { ACE_NEW_RETURN (this->my_quoters_, Quoter_i *[this->quoter_num_], @@ -62,18 +62,18 @@ int Quoter_Factory_i::init (TAO_ENV_SINGLE_ARG_DECL) const char *location_string = "POA::activate"; ACE_TRY { - this->poa_ptr_->activate_object (this->my_quoters_[i] TAO_ENV_ARG_PARAMETER); + this->poa_ptr_->activate_object (this->my_quoters_[i] ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; location_string = "_this"; - Stock::Quoter_var quoter_var = this->my_quoters_[i]->_this(TAO_ENV_SINGLE_ARG_PARAMETER); + Stock::Quoter_var quoter_var = this->my_quoters_[i]->_this(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; location_string = "CORBA::ORB::object_to_string"; // Stringify the object reference and print it out. CORBA::String_var quoter_ior = TAO_ORB_Core_instance()->orb()->object_to_string (quoter_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -93,7 +93,7 @@ int Quoter_Factory_i::init (TAO_ENV_SINGLE_ARG_DECL) Stock::Quoter_ptr Quoter_Factory_i::create_quoter (const char * - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Stock::Invalid_Quoter)) { @@ -102,7 +102,7 @@ Quoter_Factory_i::create_quoter (const char * if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Quoter %d Created\n", this->next_quoter_)); - return my_quoters_[this->next_quoter_]->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return my_quoters_[this->next_quoter_]->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } @@ -131,7 +131,7 @@ Quoter_i::~Quoter_i (void) CORBA::Long Quoter_i::get_quote (char const * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, Stock::Invalid_Stock, Stock::Invalid_Quoter)) @@ -145,7 +145,7 @@ Quoter_i::get_quote (char const * CosLifeCycle::LifeCycleObject_ptr Quoter_i::copy (CosLifeCycle::FactoryFinder_ptr there, const CosLifeCycle::Criteria &/*the_criteria*/ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosLifeCycle::NoFactory, CosLifeCycle::NotCopyable, @@ -177,7 +177,7 @@ CosLifeCycle::LifeCycleObject::_nil (); // Find an appropriate factory over there. exception_message = "While trying to find a factory.\n"; CosLifeCycle::Factories *factories_ptr = - there->find_factories (factoryKey TAO_ENV_ARG_PARAMETER); + there->find_factories (factoryKey ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Now it is known that there is at least one factory. @@ -192,7 +192,7 @@ CosLifeCycle::LifeCycleObject::_nil (); exception_message = "While narrowing.\n"; CosLifeCycle::GenericFactory_var generic_Factory_var = CosLifeCycle::GenericFactory::_narrow (generic_FactoryObj_ptr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (generic_Factory_var.in ())) @@ -215,11 +215,11 @@ CosLifeCycle::LifeCycleObject::_nil (); CORBA::Object_var quoterObject_var = generic_Factory_var->create_object (genericFactoryName, criteria - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; exception_message = "While narrowing object"; - quoter_var = Stock::Quoter::_narrow (quoterObject_var.in() TAO_ENV_ARG_PARAMETER); + quoter_var = Stock::Quoter::_narrow (quoterObject_var.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (quoter_var.in ())) @@ -272,7 +272,7 @@ CosLifeCycle::LifeCycleObject::_nil (); void Quoter_i::move (CosLifeCycle::FactoryFinder_ptr /* there */, const CosLifeCycle::Criteria & /* the_criteria */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosLifeCycle::NoFactory, CosLifeCycle::NotMovable, @@ -289,7 +289,7 @@ Quoter_i::move (CosLifeCycle::FactoryFinder_ptr /* there */, // Removes the object. Once we shut down the ORB we can call it a day. void -Quoter_i::remove (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Quoter_i::remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosLifeCycle::NotRemovable)) { diff --git a/TAO/examples/Quoter/Quoter_i.h b/TAO/examples/Quoter/Quoter_i.h index 6408ad5f0bc..b7e1e2b7e5f 100644 --- a/TAO/examples/Quoter/Quoter_i.h +++ b/TAO/examples/Quoter/Quoter_i.h @@ -44,7 +44,7 @@ public: // Destructor virtual CORBA::Long get_quote (const char *stock_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Stock::Invalid_Stock, Stock::Invalid_Quoter)); @@ -54,7 +54,7 @@ public: virtual CosLifeCycle::LifeCycleObject_ptr copy (CosLifeCycle::FactoryFinder_ptr there, const CosLifeCycle::Criteria &the_criteria - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosLifeCycle::NoFactory, CosLifeCycle::NotCopyable, @@ -64,7 +64,7 @@ public: virtual void move (CosLifeCycle::FactoryFinder_ptr there, const CosLifeCycle::Criteria &the_criteria - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosLifeCycle::NoFactory, CosLifeCycle::NotMovable, @@ -72,7 +72,7 @@ public: CosLifeCycle::CannotMeetCriteria)); // Move this object using - virtual void remove (TAO_ENV_SINGLE_ARG_DECL) + virtual void remove (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosLifeCycle::NotRemovable)); // Removes the object. @@ -105,11 +105,11 @@ public: ~Quoter_Factory_i (void); // Destructor. - int init (TAO_ENV_SINGLE_ARG_DECL); + int init (ACE_ENV_SINGLE_ARG_DECL); // Initialize everything in the factory virtual Stock::Quoter_ptr create_quoter (const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Stock::Invalid_Quoter)); // Return the quoter by the id . diff --git a/TAO/examples/Quoter/client.cpp b/TAO/examples/Quoter/client.cpp index c5f8aaad712..a685c33fdeb 100644 --- a/TAO/examples/Quoter/client.cpp +++ b/TAO/examples/Quoter/client.cpp @@ -89,7 +89,7 @@ Quoter_Client::run (void) ACE_TRY_NEW_ENV { exception_message = "While using get_quote ()"; - CORBA::Long q = this->quoter_var_->get_quote ("ACE Hardware" TAO_ENV_ARG_PARAMETER); + CORBA::Long q = this->quoter_var_->get_quote ("ACE Hardware" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->debug_level_ >= 1) @@ -102,7 +102,7 @@ Quoter_Client::run (void) CORBA::Object_var quoterObj_var = this->quoter_var_->copy (factory_Finder_var_.in (), criteria - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (quoterObj_var.in())) @@ -114,7 +114,7 @@ Quoter_Client::run (void) exception_message = "While narrowing the quoter"; Stock::Quoter_var copied_quoter_var = Stock::Quoter::_narrow (quoterObj_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (copied_quoter_var.in())) @@ -126,7 +126,7 @@ Quoter_Client::run (void) ACE_DEBUG ((LM_DEBUG, "Quoter Client: Copied object.\n")); exception_message = "While using get_quote () on copied object"; - q = copied_quoter_var->get_quote ("ACE Hardware" TAO_ENV_ARG_PARAMETER); + q = copied_quoter_var->get_quote ("ACE Hardware" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->debug_level_ >= 1) @@ -163,7 +163,7 @@ Quoter_Client::init_naming_service (void) { // Resolve the Naming Service CORBA::Object_var naming_obj = - orb_->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); + orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (naming_obj.in ())) @@ -173,7 +173,7 @@ Quoter_Client::init_naming_service (void) exception_message = "While narrowing the naming context"; CosNaming::NamingContext_var naming_context = - CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER); + CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->debug_level_ >= 2) @@ -190,7 +190,7 @@ Quoter_Client::init_naming_service (void) exception_message = "While resolving the factory finder"; CORBA::Object_var factory_obj = naming_context->resolve (quoterFactoryFinderName - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->debug_level_ >= 2) @@ -199,7 +199,7 @@ Quoter_Client::init_naming_service (void) exception_message = "While narrowing the factory finder"; factory_Finder_var_ = Stock::Quoter_Factory_Finder::_narrow (factory_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (factory_Finder_var_.in ())) @@ -233,7 +233,7 @@ Quoter_Client::init_naming_service (void) // Find an appropriate factory over there. exception_message = "While finding factories"; CosLifeCycle::Factories *factories_ptr = - factory_Finder_var_->find_factories (factoryName TAO_ENV_ARG_PARAMETER); + factory_Finder_var_->find_factories (factoryName ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (factories_ptr == 0) @@ -263,7 +263,7 @@ Quoter_Client::init_naming_service (void) exception_message = "While narrowing the factory"; generic_Factory_var_ = CosLifeCycle::GenericFactory::_narrow (quoter_FactoryObj_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (this->generic_Factory_var_.in ())) @@ -308,7 +308,7 @@ Quoter_Client::init (int argc, char **argv) this->orb_ = CORBA::ORB_init (this->argc_, this->argv_, "internet" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse command line and verify parameters. @@ -338,10 +338,10 @@ Quoter_Client::init (int argc, char **argv) CORBA::Object_var quoterObject_var = this->generic_Factory_var_->create_object (genericFactoryName, criteria - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->quoter_var_ = Stock::Quoter::_narrow (quoterObject_var.in() TAO_ENV_ARG_PARAMETER); + this->quoter_var_ = Stock::Quoter::_narrow (quoterObject_var.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->debug_level_ >= 2) diff --git a/TAO/examples/Quoter/server.cpp b/TAO/examples/Quoter/server.cpp index f0c7b9680ca..d2dfcd160bd 100644 --- a/TAO/examples/Quoter/server.cpp +++ b/TAO/examples/Quoter/server.cpp @@ -62,13 +62,13 @@ Quoter_Server::parse_args (void) int Quoter_Server::init (int argc, char* argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { const char *exception_message = "Null Message"; ACE_TRY { exception_message = "While ORB Manager init"; - int result = this->orb_manager_.init (argc, argv TAO_ENV_ARG_PARAMETER); + int result = this->orb_manager_.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) @@ -91,19 +91,19 @@ Quoter_Server::init (int argc, // Obtain the RootPOA. CORBA::Object_var obj = - this->orb_manager_.orb()->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + this->orb_manager_.orb()->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var. exception_message = "While narrowing the root pos"; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POAManager of the RootPOA. exception_message = "While getting the POA Manager"; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_NEW_RETURN (quoter_Factory_i_ptr_, @@ -112,7 +112,7 @@ Quoter_Server::init (int argc, 0); exception_message = "While initing the quoter factory"; - quoter_Factory_i_ptr_->init (TAO_ENV_SINGLE_ARG_PARAMETER); + quoter_Factory_i_ptr_->init (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var quoter_Factory_oid = @@ -121,22 +121,22 @@ Quoter_Server::init (int argc, exception_message = "While activating quoter factory"; root_poa->activate_object_with_id (quoter_Factory_oid.in (), quoter_Factory_i_ptr_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get Object reference for first_foo_impl object. exception_message = "While quoter_Factor::_this"; - Stock::Quoter_Factory_var quoter_Factory_var = quoter_Factory_i_ptr_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + Stock::Quoter_Factory_var quoter_Factory_var = quoter_Factory_i_ptr_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Stringify the object reference and print it out. exception_message = "While object_to_string"; CORBA::String_var quoter_Factory_ior = - this->orb_manager_.orb()->object_to_string (quoter_Factory_var.in () TAO_ENV_ARG_PARAMETER); + this->orb_manager_.orb()->object_to_string (quoter_Factory_var.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; exception_message = "While activating the POA Manager"; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Print the IOR. @@ -151,7 +151,7 @@ Quoter_Server::init (int argc, } ACE_ENDTRY; - return this->init_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->init_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER); } @@ -159,7 +159,7 @@ Quoter_Server::init (int argc, // and Quoter_factory object. int -Quoter_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) +Quoter_Server::init_naming_service (ACE_ENV_SINGLE_ARG_DECL) { const char *exception_message = "Null Message"; ACE_TRY @@ -167,7 +167,7 @@ Quoter_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) CORBA::ORB_ptr orb_ptr = TAO_ORB_Core_instance()->orb(); CORBA::Object_var naming_obj = - orb_ptr->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); + orb_ptr->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (naming_obj.in ())) @@ -177,7 +177,7 @@ Quoter_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) exception_message = "While narrowing naming context"; namingContext_var_ = - CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER); + CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosNaming::Name quoterContextName (1); @@ -186,7 +186,7 @@ Quoter_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) exception_message = "While binding a new context"; CosNaming::NamingContext_var quoterNameContext = - namingContext_var_->bind_new_context (quoterContextName TAO_ENV_ARG_PARAMETER); + namingContext_var_->bind_new_context (quoterContextName ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; //Register the quoter_factory name with the IDL_quoter Naming @@ -196,13 +196,13 @@ Quoter_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) quoterFactoryContextName[0].id = CORBA::string_dup ("Quoter_Factory"); exception_message = "While using factory _this"; - Stock::Quoter_Factory_var quoter_factory_var = quoter_Factory_i_ptr_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + Stock::Quoter_Factory_var quoter_factory_var = quoter_Factory_i_ptr_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; exception_message = "While binding factory"; quoterNameContext->bind (quoterFactoryContextName, quoter_factory_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -217,13 +217,13 @@ Quoter_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) } int -Quoter_Server::run (TAO_ENV_SINGLE_ARG_DECL) +Quoter_Server::run (ACE_ENV_SINGLE_ARG_DECL) { if (this->debug_level_ >= 1) ACE_DEBUG ((LM_DEBUG, "\nQuoter Example: Quoter_Server is running\n")); - orb_manager_.orb()->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb_manager_.orb()->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -239,12 +239,12 @@ Quoter_Server::~Quoter_Server (void) factory_name[0].id = CORBA::string_dup ("IDL_Quoter"); factory_name[1].id = CORBA::string_dup ("Quoter_Factory"); if (this->namingContext_var_.ptr () != 0) - this->namingContext_var_->unbind (factory_name TAO_ENV_ARG_PARAMETER); + this->namingContext_var_->unbind (factory_name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; factory_name.length (1); if (this->namingContext_var_.ptr () != 0) - this->namingContext_var_->unbind (factory_name TAO_ENV_ARG_PARAMETER); + this->namingContext_var_->unbind (factory_name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -265,13 +265,13 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { - int result = quoter_server.init (argc, argv TAO_ENV_ARG_PARAMETER); + int result = quoter_server.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) return 1; - quoter_server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + quoter_server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) diff --git a/TAO/examples/Quoter/server.h b/TAO/examples/Quoter/server.h index b3b238981b0..fe681790c66 100644 --- a/TAO/examples/Quoter/server.h +++ b/TAO/examples/Quoter/server.h @@ -52,17 +52,17 @@ public: ~Quoter_Server (void); // Destructor - int init (int argc, char *argv[] TAO_ENV_ARG_DECL); + int init (int argc, char *argv[] ACE_ENV_ARG_DECL); // Initialize the Quoter_Server state - parsing arguments and ... - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the server. private: int parse_args (void); // Parses the commandline arguments. - int init_naming_service (TAO_ENV_SINGLE_ARG_DECL); + int init_naming_service (ACE_ENV_SINGLE_ARG_DECL); // Initializes the name server and registers cubit factory with the // name server. diff --git a/TAO/examples/RTCORBA/Activity/Activity.cpp b/TAO/examples/RTCORBA/Activity/Activity.cpp index b24c3cb9360..1d9a3966392 100644 --- a/TAO/examples/RTCORBA/Activity/Activity.cpp +++ b/TAO/examples/RTCORBA/Activity/Activity.cpp @@ -67,63 +67,63 @@ Activity::current (void) int Activity::init (int& argc, char *argv [] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->init_sched (); CORBA::Object_var object = orb_->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); root_poa_ = PortableServer::POA::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); PortableServer::POAManager_var poa_manager = - root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); object = orb_->resolve_initial_references ("RTORB" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->rt_orb_ = RTCORBA::RTORB::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); object = orb_->resolve_initial_references ("RTCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); current_ = RTCORBA::Current::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; } int -Activity::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL) +Activity::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL) { CORBA::Object_var naming_obj = this->orb_->resolve_initial_references ("NameService" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Need to check return value for errors. @@ -134,7 +134,7 @@ Activity::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL) this->naming_ = CosNaming::NamingContextExt::_narrow (naming_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); //@@tmp hack, otherwise crashes on exit!..?? @@ -143,7 +143,7 @@ Activity::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL) } void -Activity::activate_poa_list (TAO_ENV_SINGLE_ARG_DECL) +Activity::activate_poa_list (ACE_ENV_SINGLE_ARG_DECL) { POA_LIST list; int count = builder_->poa_list (list); @@ -151,13 +151,13 @@ Activity::activate_poa_list (TAO_ENV_SINGLE_ARG_DECL) for (int i = 0; i < count; ++i) { list[i]->activate (this->rt_orb_.in(), this->root_poa_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } void -Activity::activate_job_list (TAO_ENV_SINGLE_ARG_DECL) +Activity::activate_job_list (ACE_ENV_SINGLE_ARG_DECL) { JOB_LIST list; int count = builder_->job_list (list); @@ -173,7 +173,7 @@ Activity::activate_job_list (TAO_ENV_SINGLE_ARG_DECL) // find your poa PortableServer::POA_var host_poa = root_poa_->find_POA (job->poa ().c_str (), 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::ServantBase_var servant_var (job); @@ -182,29 +182,29 @@ Activity::activate_job_list (TAO_ENV_SINGLE_ARG_DECL) PortableServer::ObjectId_var id; id = host_poa->activate_object (job - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Object_var server = host_poa->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var ior = orb_->object_to_string (server.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; const ACE_CString &job_name = job->name (); CosNaming::Name_var name = this->naming_->to_name (job_name.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->naming_->rebind (name.in (), server.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -217,7 +217,7 @@ Activity::activate_job_list (TAO_ENV_SINGLE_ARG_DECL) } void -Activity::activate_schedule (TAO_ENV_SINGLE_ARG_DECL) +Activity::activate_schedule (ACE_ENV_SINGLE_ARG_DECL) { TASK_LIST list; int count = builder_->task_list (list); @@ -240,10 +240,10 @@ Activity::activate_schedule (TAO_ENV_SINGLE_ARG_DECL) name[0].id = CORBA::string_dup (task->job ()); CORBA::Object_var obj = - this->naming_->resolve (name TAO_ENV_ARG_PARAMETER); + this->naming_->resolve (name ACE_ENV_ARG_PARAMETER); ACE_CHECK; - Job_var job = Job::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + Job_var job = Job::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (TAO_debug_level > 0) @@ -252,12 +252,12 @@ Activity::activate_schedule (TAO_ENV_SINGLE_ARG_DECL) // PriorityModelPolicy. CORBA::Policy_var policy = job->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; RTCORBA::PriorityModelPolicy_var priority_policy = RTCORBA::PriorityModelPolicy::_narrow (policy.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (priority_policy.in ())) @@ -266,7 +266,7 @@ Activity::activate_schedule (TAO_ENV_SINGLE_ARG_DECL) else { RTCORBA::PriorityModel priority_model = - priority_policy->priority_model (TAO_ENV_SINGLE_ARG_PARAMETER); + priority_policy->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (priority_model == RTCORBA::CLIENT_PROPAGATED) @@ -341,28 +341,28 @@ Activity::check_ifexit (void) CORBA::Short Activity::get_server_priority (CORBA::Object_ptr server - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Get the Priority Model Policy from the stub. CORBA::Policy_var policy = server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Narrow down to correct type. RTCORBA::PriorityModelPolicy_var priority_policy = - RTCORBA::PriorityModelPolicy::_narrow (policy.in () TAO_ENV_ARG_PARAMETER); + RTCORBA::PriorityModelPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Make sure that we have the SERVER_DECLARED priority model. RTCORBA::PriorityModel priority_model = - priority_policy->priority_model (TAO_ENV_SINGLE_ARG_PARAMETER); + priority_policy->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (priority_model != RTCORBA::SERVER_DECLARED) return -1; // Return the server priority. - return priority_policy->server_priority (TAO_ENV_SINGLE_ARG_PARAMETER); + return priority_policy->server_priority (ACE_ENV_SINGLE_ARG_PARAMETER); } int @@ -429,25 +429,25 @@ Activity::init_sched (void) } void -Activity::run (int argc, char *argv[] TAO_ENV_ARG_DECL) +Activity::run (int argc, char *argv[] ACE_ENV_ARG_DECL) { - this->init (argc, argv TAO_ENV_ARG_PARAMETER); + this->init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_CHECK; - if (this->resolve_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER) == -1) + if (this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER) == -1) return; ACE_CHECK; - this->activate_poa_list (TAO_ENV_SINGLE_ARG_PARAMETER); + this->activate_poa_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->activate_job_list (TAO_ENV_SINGLE_ARG_PARAMETER); + this->activate_job_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->activate_schedule (TAO_ENV_SINGLE_ARG_PARAMETER); + this->activate_schedule (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; orb_->destroy (); @@ -467,7 +467,7 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { - ACTIVITY::instance()->run (argc, argv TAO_ENV_ARG_PARAMETER); + ACTIVITY::instance()->run (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/RTCORBA/Activity/Activity.h b/TAO/examples/RTCORBA/Activity/Activity.h index 04e8827f948..a449a9d016d 100644 --- a/TAO/examples/RTCORBA/Activity/Activity.h +++ b/TAO/examples/RTCORBA/Activity/Activity.h @@ -43,14 +43,14 @@ private: public: /// initialize the ORB et. al. - int init (int& argc, char *argv [] TAO_ENV_ARG_DECL); + int init (int& argc, char *argv [] ACE_ENV_ARG_DECL); /// Activate the tasks, jobs, poas. - void run (int argc, char *argv[] TAO_ENV_ARG_DECL); + void run (int argc, char *argv[] ACE_ENV_ARG_DECL); /// Resolve the naming service. - int resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL); + int resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL); /// = Accessors CORBA::ORB_ptr orb (void); @@ -61,7 +61,7 @@ public: /// Returns priority if server declared model else -1 CORBA::Short get_server_priority (CORBA::Object_ptr server - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// = Callbacks /// Task ended notification void task_ended (Periodic_Task* ended_task); @@ -75,13 +75,13 @@ public: /// = Activation methods. /// Activate the POA's - void activate_poa_list (TAO_ENV_SINGLE_ARG_DECL); + void activate_poa_list (ACE_ENV_SINGLE_ARG_DECL); /// Activate the task list. - void activate_schedule (TAO_ENV_SINGLE_ARG_DECL); + void activate_schedule (ACE_ENV_SINGLE_ARG_DECL); /// Activate the Job's - void activate_job_list (TAO_ENV_SINGLE_ARG_DECL); + void activate_job_list (ACE_ENV_SINGLE_ARG_DECL); /// Check if we should process exit void check_ifexit (void); diff --git a/TAO/examples/RTCORBA/Activity/Job_i.cpp b/TAO/examples/RTCORBA/Activity/Job_i.cpp index dd9cb6a1056..69320dc5323 100644 --- a/TAO/examples/RTCORBA/Activity/Job_i.cpp +++ b/TAO/examples/RTCORBA/Activity/Job_i.cpp @@ -35,7 +35,7 @@ Job_i::init (ACE_Arg_Shifter& arg_shifter) } void -Job_i::work (CORBA::ULong work TAO_ENV_ARG_DECL_NOT_USED) +Job_i::work (CORBA::ULong work ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { static CORBA::ULong prime_number = 9619; @@ -52,7 +52,7 @@ Job_i::work (CORBA::ULong work TAO_ENV_ARG_DECL_NOT_USED) } void -Job_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Job_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACTIVITY::instance()->job_ended (this); diff --git a/TAO/examples/RTCORBA/Activity/Job_i.h b/TAO/examples/RTCORBA/Activity/Job_i.h index f6be6e6211c..c8645d2c054 100644 --- a/TAO/examples/RTCORBA/Activity/Job_i.h +++ b/TAO/examples/RTCORBA/Activity/Job_i.h @@ -37,12 +37,12 @@ class Job_i : public POA_Job, public virtual PortableServer::RefCountServantBase const ACE_CString& poa (void); /// = inteface Job method implementation. - virtual void work (CORBA::ULong work TAO_ENV_ARG_DECL) + virtual void work (CORBA::ULong work ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/examples/RTCORBA/Activity/POA_Holder.cpp b/TAO/examples/RTCORBA/Activity/POA_Holder.cpp index 68213ab504e..2776d3d4fe4 100644 --- a/TAO/examples/RTCORBA/Activity/POA_Holder.cpp +++ b/TAO/examples/RTCORBA/Activity/POA_Holder.cpp @@ -106,7 +106,7 @@ POA_Holder::init (ACE_Arg_Shifter& arg_shifter) } void -POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa TAO_ENV_ARG_DECL) +POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL) { /* @@ -133,7 +133,7 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_ priority_model_policy = rt_orb->create_priority_model_policy (priority_model_, server_priority_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (lanes_.length () != 0) @@ -155,14 +155,14 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_ allow_request_buffering, max_buffered_requests, max_request_buffer_size - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Create a thread-pool policy. lanes_policy = rt_orb->create_threadpool_policy (threadpool_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -172,7 +172,7 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_ // Create a bands policy. bands_policy = rt_orb->create_priority_banded_connection_policy (this->bands_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -208,13 +208,13 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_ // Get the POA Manager. PortableServer::POAManager_var poa_manager = - parent_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + parent_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; parent_poa->create_POA (POA_name_.c_str (), poa_manager.in (), poa_policy_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/examples/RTCORBA/Activity/POA_Holder.h b/TAO/examples/RTCORBA/Activity/POA_Holder.h index b4f95140766..d0cb57630dd 100644 --- a/TAO/examples/RTCORBA/Activity/POA_Holder.h +++ b/TAO/examples/RTCORBA/Activity/POA_Holder.h @@ -35,7 +35,7 @@ class POA_Holder /// Activate the new POA using the parameters initialized before. void activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); protected: /// = POA create options. diff --git a/TAO/examples/RTCORBA/Activity/Thread_Task.cpp b/TAO/examples/RTCORBA/Activity/Thread_Task.cpp index 16690bc5a9e..49beaae62f5 100644 --- a/TAO/examples/RTCORBA/Activity/Thread_Task.cpp +++ b/TAO/examples/RTCORBA/Activity/Thread_Task.cpp @@ -48,10 +48,10 @@ Thread_Task::svc (void) // if debugging, dump the priority that we're actually at. if (TAO_debug_level > 0) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; // Get the priority of the current thread. RTCORBA::Priority prio = - ACTIVITY::instance()->current ()->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER); + ACTIVITY::instance()->current ()->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (prio == this->task_priority_) diff --git a/TAO/examples/Simple/Simple_util.cpp b/TAO/examples/Simple/Simple_util.cpp index 4a9b205d073..a7a8d5c6d63 100644 --- a/TAO/examples/Simple/Simple_util.cpp +++ b/TAO/examples/Simple/Simple_util.cpp @@ -86,25 +86,25 @@ Server::test_for_ins (CORBA::String_var ior) this->ins_, ior.in ())); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::Object_var table_object = orb->resolve_initial_references ("IORTable" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; IORTable::Table_var adapter = IORTable::Table::_narrow (table_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (adapter.in ())) { ACE_ERROR ((LM_ERROR, "Nil IORTable\n")); } - adapter->bind (this->ins_, ior.in () TAO_ENV_ARG_PARAMETER); + adapter->bind (this->ins_, ior.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -120,14 +120,14 @@ template int Server::init (const char *servant_name, int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Call the init of to initialize the ORB and // create a child POA under the root POA. if (this->orb_manager_.init_child_poa (argc, argv, "child_poa" - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "init_child_poa"), @@ -171,7 +171,7 @@ Server::init (const char *servant_name, CORBA::String_var str = this->orb_manager_.activate_under_child_poa (servant_name, &this->servant_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -204,10 +204,10 @@ Server::init (const char *servant_name, } template int -Server::run (TAO_ENV_SINGLE_ARG_DECL) +Server::run (ACE_ENV_SINGLE_ARG_DECL) { // Run the main event loop for the ORB. - if (this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER) == -1) + if (this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, "Server_i::run"), -1); @@ -229,20 +229,20 @@ Server::register_name (void) bindName.length (1); bindName[0].id = CORBA::string_dup (name); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; // (re)Bind the object. ACE_TRY { - CORBA::Object_var object = servant_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Object_var object = servant_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; naming_server_->rebind (bindName, object.in() - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Test for INS. @@ -374,7 +374,7 @@ Client::init (const char *name, this->argv_ = argv; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -382,7 +382,7 @@ Client::init (const char *name, this->orb_ = CORBA::ORB_init (this->argc_, this->argv_, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse command line and verify parameters. @@ -392,7 +392,7 @@ Client::init (const char *name, if(this->ior_ != 0) { CORBA::Object_var server_object = - this->orb_->string_to_object (this->ior_ TAO_ENV_ARG_PARAMETER); + this->orb_->string_to_object (this->ior_ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -402,7 +402,7 @@ Client::init (const char *name, this->ior_), -1); this->server_ = INTERFACE_OBJECT::_narrow (server_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else if (this->naming_ == 1) @@ -411,7 +411,7 @@ Client::init (const char *name, ACE_DEBUG((LM_DEBUG, "Using the Naming Service \n")); this->name_ = ACE_const_cast (char *, name); - int retv = this->obtain_initial_references (TAO_ENV_SINGLE_ARG_PARAMETER); + int retv = this->obtain_initial_references (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (retv ==-1) return -1; @@ -436,7 +436,7 @@ Client::init (const char *name, template int -Client::obtain_initial_references (TAO_ENV_SINGLE_ARG_DECL) +Client::obtain_initial_references (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY @@ -455,11 +455,11 @@ Client::obtain_initial_references (TAO_ENV_SINGLE_ARG_DEC CORBA::string_dup (this->name_); CORBA::Object_var obj = naming_client_->resolve (server_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->server_ = INTERFACE_OBJECT::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Simple/Simple_util.h b/TAO/examples/Simple/Simple_util.h index 83c3431521a..fcda75c826f 100644 --- a/TAO/examples/Simple/Simple_util.h +++ b/TAO/examples/Simple/Simple_util.h @@ -48,7 +48,7 @@ public: int init (const char *servant_name, int argc, char *argv[] - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize the Server state - parsing arguments and waiting. // interface_name is the name used to register the Servant. @@ -56,7 +56,7 @@ public: // After calling , this method will register the server with // the TAO Naming Service using the servant_name passed to . - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the orb. int test_for_ins (CORBA::String_var ior); @@ -127,7 +127,7 @@ public: void shutdown (int); // Fills in the shutdwon flag. - int obtain_initial_references (TAO_ENV_SINGLE_ARG_DECL); + int obtain_initial_references (ACE_ENV_SINGLE_ARG_DECL); // Initialize naming service protected: diff --git a/TAO/examples/Simple/bank/AccountManager_i.cpp b/TAO/examples/Simple/bank/AccountManager_i.cpp index 02be9d03647..d42cfd37b55 100644 --- a/TAO/examples/Simple/bank/AccountManager_i.cpp +++ b/TAO/examples/Simple/bank/AccountManager_i.cpp @@ -51,7 +51,7 @@ AccountManager_i::set_orb_manager (TAO_ORB_Manager *orb_manager) Bank::Account_ptr AccountManager_i::open (const char *name, CORBA::Float initial_balance - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Account_i *result = 0; @@ -99,13 +99,13 @@ AccountManager_i::open (const char *name, void AccountManager_i::close (Bank::Account_ptr account - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { CORBA::String_var name = - CORBA::string_dup (account->name (TAO_ENV_SINGLE_ARG_PARAMETER)); + CORBA::string_dup (account->name (ACE_ENV_SINGLE_ARG_PARAMETER)); ACE_TRY_CHECK; @@ -130,7 +130,7 @@ AccountManager_i::close (Bank::Account_ptr account } void -AccountManager_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +AccountManager_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/examples/Simple/bank/AccountManager_i.h b/TAO/examples/Simple/bank/AccountManager_i.h index d3883ae9036..ba871e1a77f 100644 --- a/TAO/examples/Simple/bank/AccountManager_i.h +++ b/TAO/examples/Simple/bank/AccountManager_i.h @@ -55,17 +55,17 @@ public: virtual Bank::Account_ptr open (const char *name, CORBA::Float initial_balance - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the Account interface with the given name from the server. // Put the initial balance specified in the new account. virtual void close (Bank::Account_ptr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Close the given account. - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Shutdown the server. diff --git a/TAO/examples/Simple/bank/Account_i.cpp b/TAO/examples/Simple/bank/Account_i.cpp index 5e04b7c3b67..2f150afc54a 100644 --- a/TAO/examples/Simple/bank/Account_i.cpp +++ b/TAO/examples/Simple/bank/Account_i.cpp @@ -37,7 +37,7 @@ Account_i::orb (CORBA::ORB_ptr o) // Return the current balance on the server. CORBA::Float -Account_i::balance (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Account_i::balance (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return balance_; @@ -45,7 +45,7 @@ Account_i::balance (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Account_i::deposit (CORBA::Float deposit - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { balance_ += deposit; @@ -53,7 +53,7 @@ Account_i::deposit (CORBA::Float deposit void Account_i::withdraw (CORBA::Float withdrawl - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Bank::Account::Overdraft)) { @@ -64,7 +64,7 @@ Account_i::withdraw (CORBA::Float withdrawl } char * -Account_i::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Account_i::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->name_.in ()); @@ -72,7 +72,7 @@ Account_i::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Account_i::name (const char *name - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->name_ = CORBA::string_dup (name); diff --git a/TAO/examples/Simple/bank/Account_i.h b/TAO/examples/Simple/bank/Account_i.h index 6108e950ffc..1190a811220 100644 --- a/TAO/examples/Simple/bank/Account_i.h +++ b/TAO/examples/Simple/bank/Account_i.h @@ -42,27 +42,27 @@ public: ~Account_i (void); // Destructor. - virtual CORBA::Float balance (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::Float balance (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the current balance in the account. - virtual char *name (TAO_ENV_SINGLE_ARG_DECL) + virtual char *name (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the name of the holder. virtual void name (const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Set the name of the holder. virtual void deposit (CORBA::Float - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Deposit money in the account. virtual void withdraw (CORBA::Float - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Bank::Account::Overdraft)); // Withdraw money in the account. diff --git a/TAO/examples/Simple/bank/Bank_Client_i.cpp b/TAO/examples/Simple/bank/Bank_Client_i.cpp index fa5c5974368..420febc8e7f 100644 --- a/TAO/examples/Simple/bank/Bank_Client_i.cpp +++ b/TAO/examples/Simple/bank/Bank_Client_i.cpp @@ -32,7 +32,7 @@ Bank_Client_i::run (const char *name, { this->check_accounts (); if (client.shutdown () == 1) - client->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + client->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -52,17 +52,17 @@ Bank_Client_i::check_accounts (void ) { ACE_DEBUG ((LM_DEBUG, "\nTests for account with same name\n")); - this->test_for_same_name (TAO_ENV_SINGLE_ARG_PARAMETER); + this->test_for_same_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "\nTests for account with different names\n")); - this->test_for_different_name (TAO_ENV_SINGLE_ARG_PARAMETER); + this->test_for_different_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "\nTests for overdrafts\n")); - this->test_for_overdraft (TAO_ENV_SINGLE_ARG_PARAMETER); + this->test_for_overdraft (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -78,7 +78,7 @@ Bank_Client_i::check_accounts (void ) // a same name can be opened void -Bank_Client_i::test_for_same_name (TAO_ENV_SINGLE_ARG_DECL) +Bank_Client_i::test_for_same_name (ACE_ENV_SINGLE_ARG_DECL) { const char *name = "Name"; @@ -86,25 +86,25 @@ Bank_Client_i::test_for_same_name (TAO_ENV_SINGLE_ARG_DECL) Bank::Account_var acct_id1 = client->open (name, initial_bal - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); Bank::Account_var acct_id2 = client->open (name, initial_bal - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_ASSERT (acct_id1->_is_equivalent ((CORBA::Object *) acct_id2.in ()) != 0); client->close (acct_id1.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); client->close (acct_id2.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } // This method tests whether an account with different names can be opened void -Bank_Client_i::test_for_different_name (TAO_ENV_SINGLE_ARG_DECL) +Bank_Client_i::test_for_different_name (ACE_ENV_SINGLE_ARG_DECL) { const char *name1 = "Name1"; const char *name2 = "Name2"; @@ -113,39 +113,39 @@ Bank_Client_i::test_for_different_name (TAO_ENV_SINGLE_ARG_DECL) Bank::Account_var acct_id1 = client->open (name1, initial_bal - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); Bank::Account_var acct_id2 = client->open (name2, initial_bal - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_ASSERT (acct_id1->_is_equivalent ((CORBA::Object *)acct_id2.in ()) == 0); client->close (acct_id1.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); client->close (acct_id2.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } // This method tests the Overdraft exception. void -Bank_Client_i::test_for_overdraft (TAO_ENV_SINGLE_ARG_DECL) +Bank_Client_i::test_for_overdraft (ACE_ENV_SINGLE_ARG_DECL) { CORBA::Float initial_bal = 100.0; const char *name = "Name"; - Bank::Account_var acct_id = client->open (name, initial_bal TAO_ENV_ARG_PARAMETER); + Bank::Account_var acct_id = client->open (name, initial_bal ACE_ENV_ARG_PARAMETER); ACE_CHECK; - acct_id->deposit (100.00 TAO_ENV_ARG_PARAMETER); + acct_id->deposit (100.00 ACE_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::Float bal = acct_id->balance (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Float bal = acct_id->balance (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; acct_id->withdraw (bal + 20); - client->close (acct_id.in () TAO_ENV_ARG_PARAMETER); + client->close (acct_id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/examples/Simple/bank/Bank_Client_i.h b/TAO/examples/Simple/bank/Bank_Client_i.h index b8f398daf6e..7f1a4084c8c 100644 --- a/TAO/examples/Simple/bank/Bank_Client_i.h +++ b/TAO/examples/Simple/bank/Bank_Client_i.h @@ -13,9 +13,9 @@ // This class implements the interface calls for RMI. // // = AUTHOR -// +// // Balachandran Natarajan -// +// // ============================================================================ #ifndef BANK_CLIENT_I_H @@ -50,15 +50,15 @@ private: int check_accounts (void); // Method that calls all the test functions - void test_for_different_name (TAO_ENV_SINGLE_ARG_DECL); + void test_for_different_name (ACE_ENV_SINGLE_ARG_DECL); // Tests if accounts opened with different names return a different account // reference. - void test_for_same_name (TAO_ENV_SINGLE_ARG_DECL); - // Tests if accounts opened with the same name return the same + void test_for_same_name (ACE_ENV_SINGLE_ARG_DECL); + // Tests if accounts opened with the same name return the same // object reference. - - void test_for_overdraft (TAO_ENV_SINGLE_ARG_DECL); + + void test_for_overdraft (ACE_ENV_SINGLE_ARG_DECL); // Tests for the Overdraft Exception when the client tries to // withdraw more money than the current balance. }; diff --git a/TAO/examples/Simple/bank/server.cpp b/TAO/examples/Simple/bank/server.cpp index cc28654f821..48c04693ff4 100644 --- a/TAO/examples/Simple/bank/server.cpp +++ b/TAO/examples/Simple/bank/server.cpp @@ -17,11 +17,11 @@ main (int argc, char *argv[]) if (server.init ("Bank", argc, argv - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) return 1; else { - server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/examples/Simple/chat/Broadcaster_i.cpp b/TAO/examples/Simple/chat/Broadcaster_i.cpp index 9a3a71e375e..c3be95aab27 100644 --- a/TAO/examples/Simple/chat/Broadcaster_i.cpp +++ b/TAO/examples/Simple/chat/Broadcaster_i.cpp @@ -43,7 +43,7 @@ Broadcaster_i::~Broadcaster_i (void) void Broadcaster_i::add (Receiver_ptr receiver, const char *nickname - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, Broadcaster::CannotAdd @@ -68,7 +68,7 @@ Broadcaster_i::add (Receiver_ptr receiver, ACE_TRY { this->broadcast (broadcast_string.fast_rep () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -82,7 +82,7 @@ Broadcaster_i::add (Receiver_ptr receiver, void Broadcaster_i::remove (Receiver_ptr receiver - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, Broadcaster::CannotRemove @@ -118,14 +118,14 @@ Broadcaster_i::remove (Receiver_ptr receiver + " ****\n"; this->broadcast (broadcast_string.fast_rep () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void Broadcaster_i::say (Receiver_ptr receiver, const char *text - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -152,7 +152,7 @@ Broadcaster_i::say (Receiver_ptr receiver, ACE_CString broadcast_string ("[" + sender_nickname + "] " + text); this->broadcast (broadcast_string.fast_rep () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -166,7 +166,7 @@ Broadcaster_i::say (Receiver_ptr receiver, void Broadcaster_i::broadcast (const char *text - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Broadcast the message to all registered clients. @@ -177,7 +177,7 @@ Broadcaster_i::broadcast (const char *text ACE_TRY { (*iter).receiver_->message (text - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Simple/chat/Broadcaster_i.h b/TAO/examples/Simple/chat/Broadcaster_i.h index 9ff5d1debb7..e85a573ea80 100644 --- a/TAO/examples/Simple/chat/Broadcaster_i.h +++ b/TAO/examples/Simple/chat/Broadcaster_i.h @@ -46,7 +46,7 @@ public: virtual void add (Receiver_ptr receiver, const char *nickname - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, Broadcaster::CannotAdd @@ -54,7 +54,7 @@ public: // Saves receiver references in a list. virtual void remove (Receiver_ptr receiver - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, Broadcaster::CannotRemove @@ -63,7 +63,7 @@ public: virtual void say (Receiver_ptr receiver, const char *text - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); @@ -74,7 +74,7 @@ public: // The ORB manager. void broadcast (const char* text - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Broadcasts the text to all registered clients. class Receiver_Data diff --git a/TAO/examples/Simple/chat/Client_i.cpp b/TAO/examples/Simple/chat/Client_i.cpp index 8bb32f85cf3..5467c3de9ff 100644 --- a/TAO/examples/Simple/chat/Client_i.cpp +++ b/TAO/examples/Simple/chat/Client_i.cpp @@ -88,7 +88,7 @@ Client_i::init (int argc, char *argv[]) this->orb_manager_.init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ORB_var orb = this->orb_manager_.orb (); @@ -105,7 +105,7 @@ Client_i::init (int argc, char *argv[]) CORBA::Object_var server_object = orb->string_to_object (this->ior_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server_object.in ())) @@ -115,7 +115,7 @@ Client_i::init (int argc, char *argv[]) -1); this->server_ = Broadcaster::_narrow (server_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -151,21 +151,21 @@ Client_i::run (void) { PortableServer::POAManager_var poa_manager = this->orb_manager_.poa_manager (); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->receiver_var_ = - this->receiver_i_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->receiver_i_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Register ourselves with the server. server_->add (this->receiver_var_.in (), this->nickname_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Run the ORB. - this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -196,7 +196,7 @@ Client_i::handle_input (ACE_HANDLE) { // Remove ourselves from the server. this->server_->remove (this->receiver_var_.in ()); - this->receiver_i_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->receiver_i_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; return 0; @@ -206,7 +206,7 @@ Client_i::handle_input (ACE_HANDLE) // the server. this->server_->say (this->receiver_var_.in (), buf - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Simple/chat/Receiver_i.cpp b/TAO/examples/Simple/chat/Receiver_i.cpp index dbf9e772cb1..ac2ba71f635 100644 --- a/TAO/examples/Simple/chat/Receiver_i.cpp +++ b/TAO/examples/Simple/chat/Receiver_i.cpp @@ -29,7 +29,7 @@ Receiver_i::~Receiver_i (void) void Receiver_i::message (const char *msg - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -40,7 +40,7 @@ Receiver_i::message (const char *msg } void -Receiver_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Receiver_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) diff --git a/TAO/examples/Simple/chat/Receiver_i.h b/TAO/examples/Simple/chat/Receiver_i.h index d7cb7648bda..7c3a0767517 100644 --- a/TAO/examples/Simple/chat/Receiver_i.h +++ b/TAO/examples/Simple/chat/Receiver_i.h @@ -38,13 +38,13 @@ public: // Destructor. virtual void message (const char *msg - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); // Receives a message string. - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/examples/Simple/chat/Server_i.cpp b/TAO/examples/Simple/chat/Server_i.cpp index fa68b36aa10..19552c68eac 100644 --- a/TAO/examples/Simple/chat/Server_i.cpp +++ b/TAO/examples/Simple/chat/Server_i.cpp @@ -60,7 +60,7 @@ Server_i::parse_args (int argc, char *argv[]) int Server_i::init (int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Parse the command line options. if (this-> parse_args(argc, argv) == -1) @@ -68,7 +68,7 @@ Server_i::init (int argc, if (this->orb_manager_.init (argc, argv - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb manager init failed\n"), @@ -80,7 +80,7 @@ Server_i::init (int argc, // Activate the servant. CORBA::String_var str = this->orb_manager_.activate (&this->broadcaster_i_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Write the IOR to a file. @@ -89,13 +89,13 @@ Server_i::init (int argc, } int -Server_i::run (TAO_ENV_SINGLE_ARG_DECL) +Server_i::run (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "Running chat server...\n")); // Run the main event loop for the ORB. - int ret = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER); + int ret = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (ret == -1) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/examples/Simple/chat/Server_i.h b/TAO/examples/Simple/chat/Server_i.h index 48d2155adee..9214585fea1 100644 --- a/TAO/examples/Simple/chat/Server_i.h +++ b/TAO/examples/Simple/chat/Server_i.h @@ -40,10 +40,10 @@ public: int init (int argc, char *argv[] - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize the server. - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the ORB. private: diff --git a/TAO/examples/Simple/chat/server.cpp b/TAO/examples/Simple/chat/server.cpp index 09120b3fef0..66937b85a2e 100644 --- a/TAO/examples/Simple/chat/server.cpp +++ b/TAO/examples/Simple/chat/server.cpp @@ -27,13 +27,13 @@ main (int argc, char *argv[]) { Server_i server_i; - int ret = server_i.init (argc, argv TAO_ENV_ARG_PARAMETER); + int ret = server_i.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ret != 0) ACE_ERROR_RETURN ((LM_ERROR, "\n error in init.\n"), 1); - ret = server_i.run (TAO_ENV_SINGLE_ARG_PARAMETER); + ret = server_i.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (ret != 0) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/examples/Simple/echo/Echo_Client_i.cpp b/TAO/examples/Simple/echo/Echo_Client_i.cpp index 303b36b08cd..640992d852b 100644 --- a/TAO/examples/Simple/echo/Echo_Client_i.cpp +++ b/TAO/examples/Simple/echo/Echo_Client_i.cpp @@ -27,7 +27,7 @@ Echo_Client_i::run (const char *name, if (client.init (name,argc, argv) == -1) return -1; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -43,7 +43,7 @@ Echo_Client_i::run (const char *name, break; CORBA::String_var s = client->echo_string (buf - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -52,7 +52,7 @@ Echo_Client_i::run (const char *name, } if (client.shutdown () == 1) - client->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + client->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/Simple/echo/Echo_i.cpp b/TAO/examples/Simple/echo/Echo_i.cpp index dc65c299d82..2635c25d08c 100644 --- a/TAO/examples/Simple/echo/Echo_i.cpp +++ b/TAO/examples/Simple/echo/Echo_i.cpp @@ -34,7 +34,7 @@ Echo_i::orb (CORBA::ORB_ptr o) Echo::List * Echo_i::echo_list (const char * - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Echo::List_var list; @@ -54,17 +54,17 @@ Echo_i::echo_list (const char * // Just do something to get a list of object references. list[CORBA::ULong(0)] = orb_->resolve_initial_references ("NameService" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); list[CORBA::ULong(1)] = orb_->resolve_initial_references ("NameService" - TAO_ENV_ARG_PARAMETER);; + ACE_ENV_ARG_PARAMETER);; ACE_CHECK_RETURN (0); list[CORBA::ULong(2)] = orb_->resolve_initial_references ("NameService" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return list._retn (); @@ -74,7 +74,7 @@ Echo_i::echo_list (const char * char * Echo_i::echo_string (const char *mesg - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // The pointer mesg was NULL, return. @@ -100,7 +100,7 @@ Echo_i::echo_string (const char *mesg // Shutdown the server application. void -Echo_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/examples/Simple/echo/Echo_i.h b/TAO/examples/Simple/echo/Echo_i.h index a57fc92d49d..333ec8ebdf7 100644 --- a/TAO/examples/Simple/echo/Echo_i.h +++ b/TAO/examples/Simple/echo/Echo_i.h @@ -44,16 +44,16 @@ public: // Destructor. virtual Echo::List *echo_list (const char *mesg - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the mesg string back from the server. virtual char *echo_string (const char *mesg - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the mesg string back from the server. - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Shutdown the server. diff --git a/TAO/examples/Simple/echo/server.cpp b/TAO/examples/Simple/echo/server.cpp index da5802ac71f..61fedc66cc8 100644 --- a/TAO/examples/Simple/echo/server.cpp +++ b/TAO/examples/Simple/echo/server.cpp @@ -12,18 +12,18 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "\n\tEcho server\n\n")); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { if (server.init ("Echo", argc, argv - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) return 1; else { - server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/examples/Simple/grid/Grid_Client_i.cpp b/TAO/examples/Simple/grid/Grid_Client_i.cpp index 87f68f83547..0b9a48f6a69 100644 --- a/TAO/examples/Simple/grid/Grid_Client_i.cpp +++ b/TAO/examples/Simple/grid/Grid_Client_i.cpp @@ -75,7 +75,7 @@ Grid_Client_i::run (const char *name, if (this->parse_args (argc, argv) == -1) return -1; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -83,7 +83,7 @@ Grid_Client_i::run (const char *name, Grid_ptr grid = client->make_grid (width_, height_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -93,7 +93,7 @@ Grid_Client_i::run (const char *name, grid->set (setx_, sety_, value_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -101,13 +101,13 @@ Grid_Client_i::run (const char *name, CORBA::Long ret_val = grid->get (setx_, sety_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_ASSERT (ret_val == value_); if (client.shutdown () == 1) { - client->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + client->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_UNUSED_ARG (ret_val); diff --git a/TAO/examples/Simple/grid/Grid_i.cpp b/TAO/examples/Simple/grid/Grid_i.cpp index 56dc3177fe7..75614a73df9 100644 --- a/TAO/examples/Simple/grid/Grid_i.cpp +++ b/TAO/examples/Simple/grid/Grid_i.cpp @@ -17,7 +17,7 @@ Grid_i::Grid_i (void) Grid_i::Grid_i (CORBA::Short x, CORBA::Short y - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) : width_ (x), height_ (y) { @@ -51,7 +51,7 @@ void Grid_i::set (CORBA::Short x, CORBA::Short y, CORBA::Long value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Grid::RANGE_ERROR)) { @@ -69,7 +69,7 @@ Grid_i::set (CORBA::Short x, CORBA::Long Grid_i::get (CORBA::Short x, CORBA::Short y - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Grid::RANGE_ERROR)) { @@ -85,14 +85,14 @@ Grid_i::get (CORBA::Short x, // Access methods. CORBA::Short -Grid_i::width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Grid_i::width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->width_; } CORBA::Short -Grid_i::height (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Grid_i::height (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->height_; @@ -100,7 +100,7 @@ Grid_i::height (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Grid_i::width (CORBA::Short x - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->width_ = x; @@ -108,7 +108,7 @@ Grid_i::width (CORBA::Short x void Grid_i::height (CORBA::Short y - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->height_ = y; @@ -117,7 +117,7 @@ Grid_i::height (CORBA::Short y // Destroy the grid void -Grid_i::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Grid_i::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Delete the array. @@ -143,7 +143,7 @@ Grid_Factory_i::orb (CORBA::ORB_ptr o) // Shutdown. void -Grid_Factory_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Grid_Factory_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -181,7 +181,7 @@ Grid_Factory_i::~Grid_Factory_i (void) Grid_ptr Grid_Factory_i::make_grid (CORBA::Short width, CORBA::Short height - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Grid_i *grid_ptr = 0; @@ -200,12 +200,12 @@ Grid_Factory_i::make_grid (CORBA::Short width, // This attempts to create a new Grid_i and throws an exception and // returns a null value if it fails ACE_NEW_THROW_EX (grid_ptr, - Grid_i (width, height TAO_ENV_ARG_PARAMETER), + Grid_i (width, height ACE_ENV_ARG_PARAMETER), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (Grid::_nil ()); // Register the Grid pointer. - Grid_ptr gptr = grid_ptr->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + Grid_ptr gptr = grid_ptr->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return gptr; } diff --git a/TAO/examples/Simple/grid/Grid_i.h b/TAO/examples/Simple/grid/Grid_i.h index 6b307072ec3..b0e59875924 100644 --- a/TAO/examples/Simple/grid/Grid_i.h +++ b/TAO/examples/Simple/grid/Grid_i.h @@ -36,46 +36,46 @@ public: Grid_i (CORBA::Short, CORBA::Short - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Constructor. ~Grid_i (void); // Destructor - virtual CORBA::Short width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CORBA::Short width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns the width of the grid - virtual CORBA::Short height (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CORBA::Short height (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns the height of the grid virtual void width (CORBA::Short - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Sets the width of the grid. virtual void height (CORBA::Short - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Sets the height of the grid. virtual void set (CORBA::Short, CORBA::Short, CORBA::Long - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, Grid::RANGE_ERROR)); // Sets the grid value. virtual CORBA::Long get (CORBA::Short, CORBA::Short - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, Grid::RANGE_ERROR)); // Gets the grid value. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Destroy the grid. @@ -108,11 +108,11 @@ public: virtual Grid_ptr make_grid (CORBA::Short, CORBA::Short - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This function creates and returns a . - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Shutdown the server. diff --git a/TAO/examples/Simple/grid/server.cpp b/TAO/examples/Simple/grid/server.cpp index 77592bc8f36..09ad64e8ef3 100644 --- a/TAO/examples/Simple/grid/server.cpp +++ b/TAO/examples/Simple/grid/server.cpp @@ -12,18 +12,18 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "\n\tGrid server\n\n")); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { if (server.init ("Grid", argc, argv - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) return 1; else { - server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/examples/Simple/time-date/Time_Date.cpp b/TAO/examples/Simple/time-date/Time_Date.cpp index abed3c23fc4..1796289bad4 100644 --- a/TAO/examples/Simple/time-date/Time_Date.cpp +++ b/TAO/examples/Simple/time-date/Time_Date.cpp @@ -32,7 +32,7 @@ DLL_ORB::svc (void) ACE_TRY_NEW_ENV { // Run the ORB event loop in its own thread. - this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) @@ -70,7 +70,7 @@ DLL_ORB::init (int argc, char *argv[]) // Initialize the ORB. this->orb_manager_.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #if defined (ACE_HAS_THREADS) @@ -155,7 +155,7 @@ Time_Date_Servant::init (int argc, char *argv[]) -1); CORBA::String_var str = orb->orb_manager_.activate (&servant_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->ior_output_file_) diff --git a/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp b/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp index aed8f602682..40bb4c947d8 100644 --- a/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp +++ b/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp @@ -37,7 +37,7 @@ Time_Date_Client_i::run (const char *name, if (this->parse_args (argc, argv) == -1) return -1; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -45,7 +45,7 @@ Time_Date_Client_i::run (const char *name, // Get the time & date in binary format. client_->bin_date (l - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -55,7 +55,7 @@ Time_Date_Client_i::run (const char *name, // Get the time & date in string format. CORBA::String_var str_var; client_->str_date (str_var.out() - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/examples/Simple/time-date/Time_Date_i.cpp b/TAO/examples/Simple/time-date/Time_Date_i.cpp index cd46a87417e..1b4cc0854e9 100644 --- a/TAO/examples/Simple/time-date/Time_Date_i.cpp +++ b/TAO/examples/Simple/time-date/Time_Date_i.cpp @@ -22,7 +22,7 @@ Time_Date_i::~Time_Date_i (void) void Time_Date_i::bin_date (CORBA::Long_out time_date - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { time_date = ACE_OS::time (0); @@ -32,7 +32,7 @@ Time_Date_i::bin_date (CORBA::Long_out time_date void Time_Date_i::str_date (CORBA::String_out time_date - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { const time_t time = ACE_OS::time (0); diff --git a/TAO/examples/Simple/time-date/Time_Date_i.h b/TAO/examples/Simple/time-date/Time_Date_i.h index 30475dd5968..1b727cd2cf9 100644 --- a/TAO/examples/Simple/time-date/Time_Date_i.h +++ b/TAO/examples/Simple/time-date/Time_Date_i.h @@ -39,13 +39,13 @@ public: // Destructor virtual void bin_date (CORBA::Long_out time_date - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Obtain the time and date in binary format. virtual void str_date (CORBA::String_out time_date - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Obtain the time and date in string format. diff --git a/TAO/examples/Simple/time/Time_Client_i.cpp b/TAO/examples/Simple/time/Time_Client_i.cpp index c32a015f0e5..8ec47f9b5c5 100644 --- a/TAO/examples/Simple/time/Time_Client_i.cpp +++ b/TAO/examples/Simple/time/Time_Client_i.cpp @@ -30,9 +30,9 @@ Time_Client_i::run (const char *name, ACE_TRY { //Make the RMI. - CORBA::Long timedate = client->current_time (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Long timedate = client->current_time (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + // Print out value char *ascii_timedate = ACE_OS::ctime (ACE_reinterpret_cast (time_t *, @@ -42,7 +42,7 @@ Time_Client_i::run (const char *name, ascii_timedate)); if (client.shutdown () == 1) - client->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + client->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -51,7 +51,7 @@ Time_Client_i::run (const char *name, return -1; } ACE_ENDTRY; - + return 0; } diff --git a/TAO/examples/Simple/time/Time_i.cpp b/TAO/examples/Simple/time/Time_i.cpp index 13c0494ecd2..758603bb25b 100644 --- a/TAO/examples/Simple/time/Time_i.cpp +++ b/TAO/examples/Simple/time/Time_i.cpp @@ -35,7 +35,7 @@ Time_i::orb (CORBA::ORB_ptr o) // Return the current date/time on the server. CORBA::Long -Time_i::current_time (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Time_i::current_time (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::Long (ACE_OS::time (0)); @@ -43,8 +43,8 @@ Time_i::current_time (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) // Shutdown. -void -Time_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED ) +void +Time_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/examples/Simple/time/Time_i.h b/TAO/examples/Simple/time/Time_i.h index caa7cebeada..82514034cca 100644 --- a/TAO/examples/Simple/time/Time_i.h +++ b/TAO/examples/Simple/time/Time_i.h @@ -43,11 +43,11 @@ public: ~Time_i (void); // Destructor - virtual CORBA::Long current_time (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::Long current_time (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the current time/date on the server - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Shutdown the server. diff --git a/TAO/examples/Simple/time/server.cpp b/TAO/examples/Simple/time/server.cpp index d0a1720923f..5cdd40fbec2 100644 --- a/TAO/examples/Simple/time/server.cpp +++ b/TAO/examples/Simple/time/server.cpp @@ -12,18 +12,18 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "\n\tTime and Date server\n\n")); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { if (server.init ("Time", argc, argv - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) return 1; else { - server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp index 1d687e512e9..a8a39910057 100644 --- a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp +++ b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp @@ -72,7 +72,7 @@ DOVE_Supplier::init (void) // Connect to the RootPOA. CORBA::Object_var poaObject_var = TAO_ORB_Core_instance()->orb()->resolve_initial_references("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poaObject_var.in ())) @@ -81,18 +81,18 @@ DOVE_Supplier::init (void) -1); this->root_POA_var_ = - PortableServer::POA::_narrow (poaObject_var.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poaObject_var.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->poa_manager_ = - root_POA_var_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_POA_var_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get the Naming Service object reference. CORBA::Object_var namingObj_var = TAO_ORB_Core_instance()->orb()->resolve_initial_references ( "NameService" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (namingObj_var.in ())) @@ -102,7 +102,7 @@ DOVE_Supplier::init (void) this->namingContext_var_ = CosNaming::NamingContext::_narrow (namingObj_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -273,7 +273,7 @@ DOVE_Supplier::notify (CORBA::Any &message) // Now we invoke a RPC this->current_connection_params_->proxyPushConsumer_var_->push (events - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -343,12 +343,12 @@ DOVE_Supplier::get_Scheduler () CORBA::Object_var objref = namingContext_var_->resolve (schedule_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->current_connection_params_->scheduler_var_ = RtecScheduler::Scheduler::_narrow(objref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -378,12 +378,12 @@ DOVE_Supplier::get_EventChannel () CORBA::string_dup (this->current_connection_params_->es_name_); CORBA::Object_var eventServiceObj_var = - this->namingContext_var_->resolve (channel_name TAO_ENV_ARG_PARAMETER); + this->namingContext_var_->resolve (channel_name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->current_connection_params_->eventChannel_var_ = RtecEventChannelAdmin::EventChannel::_narrow (eventServiceObj_var.in() - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (this->current_connection_params_->eventChannel_var_.in())) @@ -413,7 +413,7 @@ DOVE_Supplier::connect_Supplier () this->current_connection_params_-> scheduler_var_-> create (this->current_connection_params_->pod_rt_info_.entry_point - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -431,7 +431,7 @@ DOVE_Supplier::connect_Supplier () this->current_connection_params_->pod_rt_info_.threads, ACE_static_cast (RtecScheduler::Info_Type_t, this->current_connection_params_->pod_rt_info_.info_type) - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -455,17 +455,17 @@ DOVE_Supplier::connect_Supplier () // = Connect as a supplier. this->current_connection_params_->supplierAdmin_var_ = - this->current_connection_params_->eventChannel_var_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->current_connection_params_->eventChannel_var_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->current_connection_params_->proxyPushConsumer_var_ = - this->current_connection_params_->supplierAdmin_var_->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + this->current_connection_params_->supplierAdmin_var_->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // In calling _this we get back an object reference and register // the servant with the POA. RtecEventComm::PushSupplier_var pushSupplier_var = - this->internal_DOVE_Supplier_ptr_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->internal_DOVE_Supplier_ptr_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Connect the supplier to the proxy consumer. @@ -473,7 +473,7 @@ DOVE_Supplier::connect_Supplier () this->current_connection_params_-> proxyPushConsumer_var_->connect_push_supplier (pushSupplier_var.in (), qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h index 259919ec604..fc6b9de6843 100644 --- a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h +++ b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h @@ -45,9 +45,9 @@ public: int init (void); // Initialize the ORB and the connection to the Name Service - int connect (const char * MIB_name = 0, + int connect (const char * MIB_name = 0, const char* es_name = 0, - const char * ss_name = 0, + const char * ss_name = 0, ACE_Scheduler_Factory::POD_RT_Info * pod_rt_info = 0); // Connect to the event service. @@ -77,7 +77,7 @@ private: public: - virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp index 8e753eaf732..6f0f6f22c35 100644 --- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp @@ -99,7 +99,7 @@ DualEC_Supplier::DualEC_Supplier (int argc, char** argv) this->channel_lo_name_[0].id = CORBA::string_dup ("DUAL_EC_LO"); ACE_TRY_CHECK; - this->terminator_ = terminator_impl_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->terminator_ = terminator_impl_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -151,15 +151,15 @@ DualEC_Supplier::~DualEC_Supplier () this->weapons_Supplier_.disconnect (); // Unbind the schedulers from the NS. - this->naming_context_->unbind (this->sched_hi_name_ TAO_ENV_ARG_PARAMETER); + this->naming_context_->unbind (this->sched_hi_name_ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->naming_context_->unbind (this->sched_lo_name_ TAO_ENV_ARG_PARAMETER); + this->naming_context_->unbind (this->sched_lo_name_ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Unbind the ECs from the NS. - this->naming_context_->unbind (this->channel_hi_name_ TAO_ENV_ARG_PARAMETER); + this->naming_context_->unbind (this->channel_hi_name_ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->naming_context_->unbind (this->channel_lo_name_ TAO_ENV_ARG_PARAMETER); + this->naming_context_->unbind (this->channel_lo_name_ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -182,7 +182,7 @@ DualEC_Supplier::init () { // Connect to the RootPOA. CORBA::Object_var poaObject_var = - TAO_ORB_Core_instance()->orb()->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core_instance()->orb()->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poaObject_var.in ())) @@ -191,21 +191,21 @@ DualEC_Supplier::init () 1); this->root_POA_var_ = - PortableServer::POA::_narrow (poaObject_var.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poaObject_var.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->poa_manager_ = - root_POA_var_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_POA_var_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get the Naming Service object reference. CORBA::Object_var namingObj_var = TAO_ORB_Core_instance()->orb()->resolve_initial_references ( "NameService" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (namingObj_var.in ())) @@ -215,7 +215,7 @@ DualEC_Supplier::init () this->naming_context_ = CosNaming::NamingContext::_narrow (namingObj_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -299,7 +299,7 @@ DualEC_Supplier::init () // Private class that implements a termination servant. void -DualEC_Supplier::Terminator::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +DualEC_Supplier::Terminator::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ORB_Core_instance ()->orb ()->shutdown (); @@ -497,24 +497,24 @@ DualEC_Supplier::create_schedulers (void) ACE_Config_Scheduler, -1); - this->sched_hi_ = sched_hi_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->sched_hi_ = sched_hi_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_NEW_RETURN (this->sched_lo_impl_, ACE_Config_Scheduler, -1); - this->sched_lo_ = sched_lo_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->sched_lo_ = sched_lo_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Register Scheduling Service Implementations with Naming Service this->naming_context_->bind (this ->sched_hi_name_, - this->sched_hi_.in () TAO_ENV_ARG_PARAMETER); + this->sched_hi_.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; naming_context_->bind (this->sched_lo_name_, - this->sched_lo_.in () TAO_ENV_ARG_PARAMETER); + this->sched_lo_.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Register high and low priority rt_infos with the @@ -523,7 +523,7 @@ DualEC_Supplier::create_schedulers (void) this->sched_hi_rt_info_hi_ = this->sched_hi_-> create (this->rt_info_dummy_hi_.entry_point - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -541,14 +541,14 @@ DualEC_Supplier::create_schedulers (void) this->rt_info_dummy_hi_.threads, ACE_static_cast (RtecScheduler::Info_Type_t, this->rt_info_dummy_hi_.info_type) - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->sched_hi_rt_info_lo_ = this->sched_hi_-> create (this->rt_info_dummy_lo_.entry_point - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -566,14 +566,14 @@ DualEC_Supplier::create_schedulers (void) this->rt_info_dummy_lo_.threads, ACE_static_cast (RtecScheduler::Info_Type_t, this->rt_info_dummy_lo_.info_type) - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->sched_hi_rt_info_hi_ = this->sched_lo_-> create (this->rt_info_dummy_hi_.entry_point - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -591,14 +591,14 @@ DualEC_Supplier::create_schedulers (void) this->rt_info_dummy_hi_.threads, ACE_static_cast (RtecScheduler::Info_Type_t, this->rt_info_dummy_hi_.info_type) - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->sched_hi_rt_info_lo_ = this->sched_lo_-> create (this->rt_info_dummy_lo_.entry_point - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -616,7 +616,7 @@ DualEC_Supplier::create_schedulers (void) this->rt_info_dummy_lo_.threads, ACE_static_cast (RtecScheduler::Info_Type_t, this->rt_info_dummy_lo_.info_type) - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -651,7 +651,7 @@ DualEC_Supplier::create_event_channels (void) &default_module_factory_), -1); - this->ec_hi_ = ec_hi_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->ec_hi_ = ec_hi_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_NEW_RETURN (this->ec_lo_impl_, @@ -661,17 +661,17 @@ DualEC_Supplier::create_event_channels (void) &default_module_factory_), -1); - this->ec_lo_ = ec_lo_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->ec_lo_ = ec_lo_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Register Event Service Implementations with Naming Service naming_context_->bind (this->channel_hi_name_, - this->ec_hi_.in () TAO_ENV_ARG_PARAMETER); + this->ec_hi_.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; naming_context_->bind (this->channel_lo_name_, - this->ec_lo_.in () TAO_ENV_ARG_PARAMETER); + this->ec_lo_.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -711,7 +711,7 @@ DualEC_Supplier::compute_schedules (void) ACE_SCOPE_THREAD), ACE_Sched_Params::priority_max (ACE_SCHED_FIFO, ACE_SCOPE_THREAD), - infos_out_hi, configs_out_hi, anomalies_out_hi TAO_ENV_ARG_PARAMETER); + infos_out_hi, configs_out_hi, anomalies_out_hi ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecScheduler::RT_Info_Set_out infos_out_lo (this->infos_lo_); @@ -722,7 +722,7 @@ DualEC_Supplier::compute_schedules (void) ACE_SCOPE_THREAD), ACE_Sched_Params::priority_max (ACE_SCHED_FIFO, ACE_SCOPE_THREAD), - infos_out_lo, configs_out_lo, anomalies_out_lo TAO_ENV_ARG_PARAMETER); + infos_out_lo, configs_out_lo, anomalies_out_lo ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #else /* ! __SUNPRO_CC */ @@ -733,7 +733,7 @@ DualEC_Supplier::compute_schedules (void) ACE_Sched_Params::priority_max (ACE_SCHED_FIFO, ACE_SCOPE_THREAD), this->infos_hi_.out (), this->configs_hi_.out (), - this->anomalies_hi_.out () TAO_ENV_ARG_PARAMETER); + this->anomalies_hi_.out () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; sched_lo_->compute_scheduling @@ -742,7 +742,7 @@ DualEC_Supplier::compute_schedules (void) ACE_Sched_Params::priority_max (ACE_SCHED_FIFO, ACE_SCOPE_THREAD), this->infos_lo_.out (), this->configs_lo_.out (), - this->anomalies_lo_.out () TAO_ENV_ARG_PARAMETER); + this->anomalies_lo_.out () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* ! __SUNPRO_CC */ @@ -1153,7 +1153,7 @@ main (int argc, char *argv []) orb_Manager.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h index 52f1f9c35ee..cb525dc896f 100644 --- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h +++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h @@ -85,7 +85,7 @@ private: // = DESCRIPTION // Private class that implements a termination servant. { - void shutdown (TAO_ENV_SINGLE_ARG_DECL) + void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp index c279d60d2a4..c0a076e6792 100644 --- a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp +++ b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp @@ -59,7 +59,7 @@ int Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec, const char *my_name) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Get a Scheduler. @@ -68,7 +68,7 @@ Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec, ACE_Scheduler_Factory::server (); // Define Real-time information. - rt_info_ = server->create (my_name TAO_ENV_ARG_PARAMETER); + rt_info_ = server->create (my_name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; server->set (rt_info_, @@ -81,7 +81,7 @@ Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec, ORBSVCS_Time::zero (), 1, RtecScheduler::OPERATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -100,14 +100,14 @@ Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec, // = Connect as a consumer. this->consumer_admin_ = - channel_admin_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + channel_admin_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain a pointer to a push supplier. "suppliers" is // inherited from a base class. this->suppliers_ = - consumer_admin_->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_admin_->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // The _this function returns an object pointer. This is needed @@ -115,12 +115,12 @@ Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec, // CORBA::Object. RtecEventComm::PushConsumer_var objref = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->suppliers_->connect_push_consumer (objref.in (), dependencies.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR, se) @@ -141,7 +141,7 @@ Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec, } void -Demo_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Demo_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -150,7 +150,7 @@ Demo_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Demo_Consumer::push (const RtecEventComm::EventSet &events - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -177,18 +177,18 @@ Demo_Consumer::push (const RtecEventComm::EventSet &events { // Use a temporary int to avoid overload ambiguities with // the enum. - int kind = events[i].data.any_value.type()->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + int kind = events[i].data.any_value.type()->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - cout << "ID: " << events[i].data.any_value.type()->id(TAO_ENV_SINGLE_ARG_PARAMETER) << endl; + cout << "ID: " << events[i].data.any_value.type()->id(ACE_ENV_SINGLE_ARG_PARAMETER) << endl; ACE_TRY_CHECK; - cout << "Name: " << events[i].data.any_value.type()->name(TAO_ENV_SINGLE_ARG_PARAMETER) << endl; + cout << "Name: " << events[i].data.any_value.type()->name(ACE_ENV_SINGLE_ARG_PARAMETER) << endl; ACE_TRY_CHECK; - cout << "member_count: " << events[i].data.any_value.type()->member_count(TAO_ENV_SINGLE_ARG_PARAMETER) << endl; + cout << "member_count: " << events[i].data.any_value.type()->member_count(ACE_ENV_SINGLE_ARG_PARAMETER) << endl; ACE_TRY_CHECK; cout << "TCKind: " << kind << endl; - int ret = _tc_Navigation->equal (events[i].data.any_value.type() TAO_ENV_ARG_PARAMETER); + int ret = _tc_Navigation->equal (events[i].data.any_value.type() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ret) { @@ -196,7 +196,7 @@ Demo_Consumer::push (const RtecEventComm::EventSet &events cout << "Found a Navigation struct in the any: pos_lat = " << navigation_->position_latitude << endl; } else { - ret = (_tc_Weapons->equal (events[i].data.any_value.type() TAO_ENV_ARG_PARAMETER)); + ret = (_tc_Weapons->equal (events[i].data.any_value.type() ACE_ENV_ARG_PARAMETER)); ACE_TRY_CHECK; if (ret) { Weapons *weapons_ = (Weapons*) events[i].data.any_value.value (); @@ -221,7 +221,7 @@ Demo_Consumer::shutdown (void) { // Disconnect from the push supplier. - this->suppliers_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + this->suppliers_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "@@ we should shutdown here!!!\n")); @@ -286,12 +286,12 @@ main (int argc, char *argv []) // Initialize ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "internet" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "internet" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -300,16 +300,16 @@ main (int argc, char *argv []) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var naming_obj = orb->resolve_initial_references ("NameService" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (naming_obj.in ())) @@ -319,7 +319,7 @@ main (int argc, char *argv []) CosNaming::NamingContext_var naming_context = CosNaming::NamingContext::_narrow (naming_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Scheduler_Factory::use_config (naming_context.in ()); @@ -335,11 +335,11 @@ main (int argc, char *argv []) CORBA::Object_var ec_obj = naming_context->resolve (channel_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var ec = - RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in() TAO_ENV_ARG_PARAMETER); + RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ec.ptr() == 0) @@ -360,19 +360,19 @@ main (int argc, char *argv []) "Someone was feeling introverted.\n"), -1); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Run the ORB - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; delete demo_consumer; root_poa->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.h b/TAO/examples/Simulator/Event_Supplier/Event_Con.h index bf2ace6ab79..0e0d931a3d9 100644 --- a/TAO/examples/Simulator/Event_Supplier/Event_Con.h +++ b/TAO/examples/Simulator/Event_Supplier/Event_Con.h @@ -46,13 +46,13 @@ public: // supplier. Stores for printing out messages. Returns 0 // on success, -1 on failure. - virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The channel is disconnecting. // = (not protected to allow short-circuiting) protected: virtual void push (const RtecEventComm::EventSet &events - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // If the [0] is a notification, prints out the data from // the supplier. If its a shutdown message, the consumer diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp index 9944b1012ff..1d42b0c1598 100644 --- a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp @@ -447,7 +447,7 @@ main (int argc, char *argv []) orb_Manager.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp index d6582abfbbe..6bf504cefdb 100644 --- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp @@ -493,7 +493,7 @@ main (int argc, char *argv []) orb_Manager.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/TypeCode_Creation/main.cpp b/TAO/examples/TypeCode_Creation/main.cpp index e8dbba5999a..b811e0b9aca 100644 --- a/TAO/examples/TypeCode_Creation/main.cpp +++ b/TAO/examples/TypeCode_Creation/main.cpp @@ -13,13 +13,13 @@ int main(int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::TypeCode_var iface_tc = orb->create_interface_tc (CORBA::string_dup ("IDL:iface:1.0"), CORBA::string_dup ("iface") - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ULong length = 5; @@ -73,7 +73,7 @@ int main(int argc, char *argv[]) "foo", CORBA::_tc_short, foo_members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; length = 2; @@ -95,12 +95,12 @@ int main(int argc, char *argv[]) CORBA::TypeCode_var bar_tc = orb->create_struct_tc ("IDL:bar:1.0", "bar", bar_members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Check for equality with the typecode created by the IDL compiler. CORBA::Boolean eq = bar_tc->equal (_tc_bar - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!eq) diff --git a/TAO/examples/mfc/client.cpp b/TAO/examples/mfc/client.cpp index 20e1d865e99..3fcc3f4abff 100644 --- a/TAO/examples/mfc/client.cpp +++ b/TAO/examples/mfc/client.cpp @@ -15,19 +15,19 @@ main (int argc, char *argv[]) CORBA::ORB_var the_orb = CORBA::ORB_init (argc, argv, orb_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var orb_obj = - the_orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + the_orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var the_root_poa = - PortableServer::POA::_narrow (orb_obj.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (orb_obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var the_poa_manager = - the_root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + the_root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Retrieving the servants IOR from a file @@ -37,13 +37,13 @@ main (int argc, char *argv[]) "file://ior.txt"; orb_obj = - the_orb->string_to_object (filename TAO_ENV_ARG_PARAMETER); + the_orb->string_to_object (filename ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; cout << "Narrowing the IOR!" << endl; W32_Test_Interface_var mycall = - W32_Test_Interface::_narrow (orb_obj.in () TAO_ENV_ARG_PARAMETER); + W32_Test_Interface::_narrow (orb_obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; cout << "Sending the Request!" << endl; diff --git a/TAO/examples/mfc/server.cpp b/TAO/examples/mfc/server.cpp index 961d501be4d..e9ff39967c4 100644 --- a/TAO/examples/mfc/server.cpp +++ b/TAO/examples/mfc/server.cpp @@ -50,22 +50,22 @@ spawn_my_orb_thread (void *) CORBA::ORB_init (__argc, __argv, orb_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var orb_obj = - the_orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + the_orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var the_root_poa = - PortableServer::POA::_narrow (orb_obj.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (orb_obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var the_poa_manager = - the_root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + the_root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - the_poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + the_poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initializing the NamingService @@ -75,7 +75,7 @@ spawn_my_orb_thread (void *) ACE_TRY_CHECK; CORBA::String_var ior = - the_orb->object_to_string (orb_servant.in () TAO_ENV_ARG_PARAMETER); + the_orb->object_to_string (orb_servant.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; FILE *output_file = ACE_OS::fopen ("ior.txt", @@ -85,7 +85,7 @@ spawn_my_orb_thread (void *) ior.in ()); ACE_OS::fclose (output_file); - the_orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + the_orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -125,11 +125,11 @@ CServerApp::~CServerApp() CORBA::ORB_init (argc, argv, orb_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; the_shutdown_orb->shutdown (0, // wait_for_completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Thread_Manager::instance ()->wait (); diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp index 63dbdbb1b89..89c26c4bd66 100644 --- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp +++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp @@ -36,11 +36,11 @@ Concurrency_Service::Concurrency_Service (void) Concurrency_Service::Concurrency_Service (int argc, char** argv - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "Concurrency_Service::Concurrency_Service (...)\n")); - this->init (argc, argv TAO_ENV_ARG_PARAMETER); + this->init (argc, argv ACE_ENV_ARG_PARAMETER); } int @@ -86,14 +86,14 @@ Concurrency_Service::parse_args (void) int Concurrency_Service::init (int argc, char **argv - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "Concurrency_Service::init\n")); if (this->orb_manager_.init_child_poa (argc, argv, "child_poa" - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "init_child_poa"), @@ -109,7 +109,7 @@ Concurrency_Service::init (int argc, -1); CORBA::String_var str = this->orb_manager_.activate (this->my_concurrency_server_.GetLockSetFactory () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_DEBUG ((LM_DEBUG, "The IOR is: <%s>\n", str.in ())); @@ -121,13 +121,13 @@ Concurrency_Service::init (int argc, } if (this->use_naming_service_) - return this->init_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->init_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER); return 0; } int -Concurrency_Service::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) +Concurrency_Service::init_naming_service (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "Concurrency_Service::init_naming_service (...)\n")); CORBA::ORB_var orb; @@ -141,7 +141,7 @@ Concurrency_Service::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) if (result == -1) return result; lockset_factory_ = - this->my_concurrency_server_.GetLockSetFactory ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->my_concurrency_server_.GetLockSetFactory ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CosNaming::Name concurrency_context_name (1); @@ -150,7 +150,7 @@ Concurrency_Service::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) this->concurrency_context_ = this->my_name_server_->bind_new_context (concurrency_context_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CosNaming::Name lockset_name (1); @@ -158,7 +158,7 @@ Concurrency_Service::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) lockset_name[0].id = CORBA::string_dup ("LockSetFactory"); this->concurrency_context_->bind (lockset_name, lockset_factory_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; } @@ -166,12 +166,12 @@ Concurrency_Service::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) // Run the ORB event loop. int -Concurrency_Service::run (TAO_ENV_SINGLE_ARG_DECL) +Concurrency_Service::run (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "Concurrency_Service::run (...)\n")); - int retval = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER); + int retval = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (retval == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -196,16 +196,16 @@ main (int argc, char ** argv) ACE_DEBUG ((LM_DEBUG, "\n \t Concurrency Service:SERVER \n \n")); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - int r = concurrency_service.init (argc, argv TAO_ENV_ARG_PARAMETER); + int r = concurrency_service.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (r == -1) return 1; - concurrency_service.run (TAO_ENV_SINGLE_ARG_PARAMETER); + concurrency_service.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h index 2868e7fa379..05b037b7cd8 100644 --- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h +++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h @@ -47,7 +47,7 @@ public: Concurrency_Service (int argc, char **argv - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Constructor taking the command-line arguments. ~Concurrency_Service (void); @@ -55,17 +55,17 @@ public: int init (int argc, char **argv - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize the Concurrency Service with the arguments. - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the Concurrency_Service. private: int parse_args (void); // Parses the commandline arguments. - int init_naming_service (TAO_ENV_SINGLE_ARG_DECL); + int init_naming_service (ACE_ENV_SINGLE_ARG_DECL); // Initialize the name server and register the concurency server // factory with it. Maybe later it will be convinient to register // the individual lock sets with the naming service. At present the diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp index 8c91a5c6e69..57f220b3075 100644 --- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp +++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp @@ -13,12 +13,12 @@ main (int argc, char* argv[]) { TAO_CEC_Default_Factory::init_svcs (); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Intialize the ORB CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Call TAO_CEC_Event_Loader::init (argc, argv) from here. @@ -41,11 +41,11 @@ main (int argc, char* argv[]) // to 1 by default or something like that... // Don't worry about this change yet... Let's get all the changes // in and then we can fix the EC shutdown problem... - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Destroy the ORB - orb->destroy(TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp index 90f3d797b03..ed59ff96747 100644 --- a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp +++ b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp @@ -18,11 +18,11 @@ main (int argc, char *argv[]) { // Initialize ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "internet" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "internet" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var naming_obj = - orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil(naming_obj.in ())) @@ -31,7 +31,7 @@ main (int argc, char *argv[]) 1); CosNaming::NamingContext_var naming_context = - CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER); + CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; const char *name = 0; @@ -65,7 +65,7 @@ main (int argc, char *argv[]) ACE_Sched_Params::priority_max (ACE_SCHED_FIFO, ACE_SCOPE_THREAD), infos_out, configs_out, anomalies_out - TAO_ENV_ARG_PARAMETER); // FUZZ: ignore check_for_ace_check + ACE_ENV_ARG_PARAMETER); // FUZZ: ignore check_for_ace_check #else /* ! __SUNPRO_CC */ ACE_Scheduler_Factory::server ()->compute_scheduling (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO, @@ -73,7 +73,7 @@ main (int argc, char *argv[]) ACE_Sched_Params::priority_max (ACE_SCHED_FIFO, ACE_SCOPE_THREAD), infos.out (), configs.out (), anomalies.out () - TAO_ENV_ARG_PARAMETER); // FUZZ: ignore check_for_ace_check + ACE_ENV_ARG_PARAMETER); // FUZZ: ignore check_for_ace_check #endif /* ! __SUNPRO_CC */ ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/Event_Service/Event_Service.cpp b/TAO/orbsvcs/Event_Service/Event_Service.cpp index 67c15f96355..36f0f90e886 100644 --- a/TAO/orbsvcs/Event_Service/Event_Service.cpp +++ b/TAO/orbsvcs/Event_Service/Event_Service.cpp @@ -55,7 +55,7 @@ Event_Service::run (int argc, char* argv[]) { // Initialize ORB. this->orb_ = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->parse_args (argc, argv) == -1) @@ -63,7 +63,7 @@ Event_Service::run (int argc, char* argv[]) CORBA::Object_var poa_object = this->orb_->resolve_initial_references("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -71,18 +71,18 @@ Event_Service::run (int argc, char* argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var naming_obj = - this->orb_->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (naming_obj.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -90,7 +90,7 @@ Event_Service::run (int argc, char* argv[]) 1); CosNaming::NamingContext_var naming_context = - CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER); + CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecScheduler::Scheduler_var scheduler; @@ -112,22 +112,22 @@ Event_Service::run (int argc, char* argv[]) ACE_Config_Scheduler, 1); - scheduler = this->sched_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + scheduler = this->sched_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Register the servant with the Naming Context.... naming_context->rebind (schedule_name, scheduler.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else { CORBA::Object_var tmp = - naming_context->resolve (schedule_name TAO_ENV_ARG_PARAMETER); + naming_context->resolve (schedule_name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; scheduler = RtecScheduler::Scheduler::_narrow (tmp.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -143,7 +143,7 @@ Event_Service::run (int argc, char* argv[]) TAO_EC_Event_Channel (attr), 1); this->ec_impl_ = ec; - ec->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + ec->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } break; @@ -182,11 +182,11 @@ Event_Service::run (int argc, char* argv[]) // forward all the requests to the underlying EC // implementation. RtecEventChannelAdmin::EventChannel_var ec = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var str = - this->orb_->object_to_string (ec.in () TAO_ENV_ARG_PARAMETER); + this->orb_->object_to_string (ec.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->ior_file_name_ != 0) @@ -219,19 +219,19 @@ Event_Service::run (int argc, char* argv[]) CosNaming::Name channel_name (1); channel_name.length (1); channel_name[0].id = CORBA::string_dup (this->service_name_); - naming_context->rebind (channel_name, ec.in () TAO_ENV_ARG_PARAMETER); + naming_context->rebind (channel_name, ec.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "%s; running event service\n", __FILE__)); - this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - naming_context->unbind (channel_name TAO_ENV_ARG_PARAMETER); + naming_context->unbind (channel_name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!CORBA::is_nil (scheduler.in ())) { - naming_context->unbind (schedule_name TAO_ENV_ARG_PARAMETER); + naming_context->unbind (schedule_name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -337,48 +337,48 @@ Event_Service::parse_args (int argc, char *argv []) RtecEventChannelAdmin::ConsumerAdmin_ptr -Event_Service::for_consumers (TAO_ENV_SINGLE_ARG_DECL) +Event_Service::for_consumers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->ec_impl_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->ec_impl_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); } RtecEventChannelAdmin::SupplierAdmin_ptr -Event_Service::for_suppliers (TAO_ENV_SINGLE_ARG_DECL) +Event_Service::for_suppliers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->ec_impl_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->ec_impl_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); } void -Event_Service::destroy (TAO_ENV_SINGLE_ARG_DECL) +Event_Service::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->ec_impl_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->ec_impl_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->orb_->shutdown (); } RtecEventChannelAdmin::Observer_Handle Event_Service::append_observer (RtecEventChannelAdmin::Observer_ptr observer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)) { - return this->ec_impl_->append_observer (observer TAO_ENV_ARG_PARAMETER); + return this->ec_impl_->append_observer (observer ACE_ENV_ARG_PARAMETER); } void Event_Service::remove_observer (RtecEventChannelAdmin::Observer_Handle handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER)) { - this->ec_impl_->remove_observer (handle TAO_ENV_ARG_PARAMETER); + this->ec_impl_->remove_observer (handle ACE_ENV_ARG_PARAMETER); } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/orbsvcs/Event_Service/Event_Service.h b/TAO/orbsvcs/Event_Service/Event_Service.h index dd32fc469b1..c1846d29425 100644 --- a/TAO/orbsvcs/Event_Service/Event_Service.h +++ b/TAO/orbsvcs/Event_Service/Event_Service.h @@ -42,22 +42,22 @@ public: // = The RtecEventChannelAdmin::Event_Channel methods virtual RtecEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + for_consumers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual RtecEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + for_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual RtecEventChannelAdmin::Observer_Handle append_observer (RtecEventChannelAdmin::Observer_ptr observer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)); virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, diff --git a/TAO/orbsvcs/IFR_Service/AbstractInterfaceDef_i.cpp b/TAO/orbsvcs/IFR_Service/AbstractInterfaceDef_i.cpp index 227549eb3b9..e572cb5d162 100644 --- a/TAO/orbsvcs/IFR_Service/AbstractInterfaceDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/AbstractInterfaceDef_i.cpp @@ -23,7 +23,7 @@ TAO_AbstractInterfaceDef_i::~TAO_AbstractInterfaceDef_i (void) } CORBA::DefinitionKind -TAO_AbstractInterfaceDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_AbstractInterfaceDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_AbstractInterface; @@ -31,18 +31,18 @@ TAO_AbstractInterfaceDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) CORBA::Boolean TAO_AbstractInterfaceDef_i::is_a (const char *interface_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); return this->is_a_i (interface_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Boolean TAO_AbstractInterfaceDef_i::is_a_i (const char *interface_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (ACE_OS::strcmp (interface_id, "IDL:omg.org/CORBA/AbstractBase:1.0") == 0) @@ -51,6 +51,6 @@ TAO_AbstractInterfaceDef_i::is_a_i (const char *interface_id } return this->TAO_InterfaceDef_i::is_a_i (interface_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/IFR_Service/AbstractInterfaceDef_i.h b/TAO/orbsvcs/IFR_Service/AbstractInterfaceDef_i.h index 7bcb10f68c4..c70230831ec 100644 --- a/TAO/orbsvcs/IFR_Service/AbstractInterfaceDef_i.h +++ b/TAO/orbsvcs/IFR_Service/AbstractInterfaceDef_i.h @@ -50,20 +50,20 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual CORBA::Boolean is_a ( const char *interface_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Boolean is_a_i ( const char *interface_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/AliasDef_i.cpp b/TAO/orbsvcs/IFR_Service/AliasDef_i.cpp index 555df7e18e5..9188ace6df3 100644 --- a/TAO/orbsvcs/IFR_Service/AliasDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/AliasDef_i.cpp @@ -22,23 +22,23 @@ TAO_AliasDef_i::~TAO_AliasDef_i (void) } CORBA::DefinitionKind -TAO_AliasDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_AliasDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Alias; } CORBA::TypeCode_ptr -TAO_AliasDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_AliasDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_AliasDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_AliasDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString id; @@ -64,31 +64,31 @@ TAO_AliasDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) TAO_IDLType_i *impl = this->repo_->servant_factory ()->create_idltype (ot_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); auto_ptr safety (impl); - CORBA::TypeCode_var tc = impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var tc = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); return this->repo_->tc_factory ()->create_alias_tc (id.c_str (), name.c_str (), tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_IDLType_ptr -TAO_AliasDef_i::original_type_def (TAO_ENV_SINGLE_ARG_DECL) +TAO_AliasDef_i::original_type_def (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ()); - return this->original_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->original_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_IDLType_ptr -TAO_AliasDef_i::original_type_def_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_AliasDef_i::original_type_def_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString original_type; @@ -113,32 +113,32 @@ TAO_AliasDef_i::original_type_def_i (TAO_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (def_kind, original_type.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_IDLType::_nil ()); return CORBA_IDLType::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_AliasDef_i::original_type_def (CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->original_type_def_i (original_type_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_AliasDef_i::original_type_def_i (CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (original_type_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var original_type = diff --git a/TAO/orbsvcs/IFR_Service/AliasDef_i.h b/TAO/orbsvcs/IFR_Service/AliasDef_i.h index e2d6535f5c1..e28db7455e2 100644 --- a/TAO/orbsvcs/IFR_Service/AliasDef_i.h +++ b/TAO/orbsvcs/IFR_Service/AliasDef_i.h @@ -51,42 +51,42 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA_IDLType_ptr original_type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_IDLType_ptr original_type_def_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void original_type_def ( CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void original_type_def_i ( CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/ArrayDef_i.cpp b/TAO/orbsvcs/IFR_Service/ArrayDef_i.cpp index 95dbe76c837..eb2709dbf92 100644 --- a/TAO/orbsvcs/IFR_Service/ArrayDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/ArrayDef_i.cpp @@ -20,27 +20,27 @@ TAO_ArrayDef_i::~TAO_ArrayDef_i (void) } CORBA::DefinitionKind -TAO_ArrayDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ArrayDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Array; } void -TAO_ArrayDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_ArrayDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_ArrayDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_ArrayDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Only if it is (w)string, fixed, array or sequence. - this->destroy_element_type (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_element_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_TString name; @@ -54,43 +54,43 @@ TAO_ArrayDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL) } CORBA::TypeCode_ptr -TAO_ArrayDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_ArrayDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_ArrayDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_ArrayDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::TypeCode_var element_typecode = - this->element_type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->element_type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); - CORBA::ULong length = this->length_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong length = this->length_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); return this->repo_->tc_factory ()->create_array_tc ( length, element_typecode.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA::ULong -TAO_ArrayDef_i::length (TAO_ENV_SINGLE_ARG_DECL) +TAO_ArrayDef_i::length (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->length_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->length_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::ULong -TAO_ArrayDef_i::length_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ArrayDef_i::length_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { u_int length = 0; @@ -103,18 +103,18 @@ TAO_ArrayDef_i::length_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_ArrayDef_i::length (CORBA::ULong length - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->length_i (length - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ArrayDef_i::length_i (CORBA::ULong length - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->set_integer_value (this->section_key_, @@ -123,16 +123,16 @@ TAO_ArrayDef_i::length_i (CORBA::ULong length } CORBA::TypeCode_ptr -TAO_ArrayDef_i::element_type (TAO_ENV_SINGLE_ARG_DECL) +TAO_ArrayDef_i::element_type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->element_type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->element_type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_ArrayDef_i::element_type_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_ArrayDef_i::element_type_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString element_path; @@ -148,25 +148,25 @@ TAO_ArrayDef_i::element_type_i (TAO_ENV_SINGLE_ARG_DECL) TAO_IDLType_i *impl = this->repo_->servant_factory ()->create_idltype (element_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); auto_ptr safety (impl); - return impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_IDLType_ptr -TAO_ArrayDef_i::element_type_def (TAO_ENV_SINGLE_ARG_DECL) +TAO_ArrayDef_i::element_type_def (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ()); - return this->element_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->element_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_IDLType_ptr -TAO_ArrayDef_i::element_type_def_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_ArrayDef_i::element_type_def_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString element_path; @@ -191,35 +191,35 @@ TAO_ArrayDef_i::element_type_def_i (TAO_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (def_kind, element_path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_IDLType::_nil ()); return CORBA_IDLType::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ArrayDef_i::element_type_def (CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->element_type_def_i (element_type_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ArrayDef_i::element_type_def_i (CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->destroy_element_type (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_element_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (element_type_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var new_element_path = @@ -232,7 +232,7 @@ TAO_ArrayDef_i::element_type_def_i (CORBA_IDLType_ptr element_type_def void TAO_ArrayDef_i::destroy_element_type ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString element_path; @@ -267,12 +267,12 @@ TAO_ArrayDef_i::destroy_element_type ( { TAO_IDLType_i *impl = this->repo_->servant_factory ()->create_idltype (element_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; auto_ptr safety (impl); - impl->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + impl->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; break; } diff --git a/TAO/orbsvcs/IFR_Service/ArrayDef_i.h b/TAO/orbsvcs/IFR_Service/ArrayDef_i.h index 829ad7154db..5323355564c 100644 --- a/TAO/orbsvcs/IFR_Service/ArrayDef_i.h +++ b/TAO/orbsvcs/IFR_Service/ArrayDef_i.h @@ -50,89 +50,89 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::ULong length ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::ULong length_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void length ( CORBA::ULong length - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void length_i ( CORBA::ULong length - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr element_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr element_type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_IDLType_ptr element_type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_IDLType_ptr element_type_def_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void element_type_def ( CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void element_type_def_i ( CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: void destroy_element_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Destroys an anonymous non-primitive element type. diff --git a/TAO/orbsvcs/IFR_Service/AttributeDef_i.cpp b/TAO/orbsvcs/IFR_Service/AttributeDef_i.cpp index fb94c9430cd..4bf09e2fcf8 100644 --- a/TAO/orbsvcs/IFR_Service/AttributeDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/AttributeDef_i.cpp @@ -24,23 +24,23 @@ TAO_AttributeDef_i::~TAO_AttributeDef_i (void) } CORBA::DefinitionKind -TAO_AttributeDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_AttributeDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Attribute; } CORBA_Contained::Description * -TAO_AttributeDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) +TAO_AttributeDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_AttributeDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_AttributeDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA_Contained::Description *desc_ptr = 0; @@ -51,26 +51,26 @@ TAO_AttributeDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) CORBA_Contained::Description_var retval = desc_ptr; - retval->kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - retval->value <<= this->make_description (TAO_ENV_SINGLE_ARG_PARAMETER); + retval->value <<= this->make_description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return retval._retn (); } CORBA::TypeCode_ptr -TAO_AttributeDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_AttributeDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_AttributeDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_AttributeDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString type_path; @@ -86,25 +86,25 @@ TAO_AttributeDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) TAO_IDLType_i *impl = this->repo_->servant_factory ()->create_idltype (type_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); auto_ptr safety (impl); - return impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_IDLType_ptr -TAO_AttributeDef_i::type_def (TAO_ENV_SINGLE_ARG_DECL) +TAO_AttributeDef_i::type_def (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ()); - return this->type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_IDLType_ptr -TAO_AttributeDef_i::type_def_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_AttributeDef_i::type_def_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString type_path; @@ -129,11 +129,11 @@ TAO_AttributeDef_i::type_def_i (TAO_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (def_kind, type_path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_IDLType::_nil ()); CORBA_IDLType_var retval = CORBA_IDLType::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_IDLType::_nil ()); return retval._retn (); @@ -141,23 +141,23 @@ TAO_AttributeDef_i::type_def_i (TAO_ENV_SINGLE_ARG_DECL) void TAO_AttributeDef_i::type_def (CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->type_def_i (type_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_AttributeDef_i::type_def_i (CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (type_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var type_path = @@ -169,16 +169,16 @@ TAO_AttributeDef_i::type_def_i (CORBA_IDLType_ptr type_def } CORBA::AttributeMode -TAO_AttributeDef_i::mode (TAO_ENV_SINGLE_ARG_DECL) +TAO_AttributeDef_i::mode (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::ATTR_NORMAL); - return this->mode_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->mode_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::AttributeMode -TAO_AttributeDef_i::mode_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_AttributeDef_i::mode_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { u_int mode = 0; @@ -191,18 +191,18 @@ TAO_AttributeDef_i::mode_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_AttributeDef_i::mode (CORBA::AttributeMode mode - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->mode_i (mode - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_AttributeDef_i::mode_i (CORBA::AttributeMode mode - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->set_integer_value (this->section_key_, @@ -211,15 +211,15 @@ TAO_AttributeDef_i::mode_i (CORBA::AttributeMode mode } CORBA_AttributeDescription -TAO_AttributeDef_i::make_description (TAO_ENV_SINGLE_ARG_DECL) +TAO_AttributeDef_i::make_description (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA_AttributeDescription ad; - ad.name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER); + ad.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (ad); - ad.id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER); + ad.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (ad); ACE_TString container_id; @@ -230,13 +230,13 @@ TAO_AttributeDef_i::make_description (TAO_ENV_SINGLE_ARG_DECL) ad.defined_in = container_id.c_str (); - ad.version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER); + ad.version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (ad); - ad.type = this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + ad.type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (ad); - ad.mode = this->mode_i (TAO_ENV_SINGLE_ARG_PARAMETER); + ad.mode = this->mode_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (ad); /* ACE_Unbounded_Queue key_queue; @@ -321,7 +321,7 @@ TAO_AttributeDef_i::make_description (TAO_ENV_SINGLE_ARG_DECL) TAO_ExceptionDef_i impl (this->repo_, key); - get_ed.type = impl.type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + get_ed.type = impl.type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (ad); get_ed_seq[i] = get_ed; @@ -405,7 +405,7 @@ TAO_AttributeDef_i::make_description (TAO_ENV_SINGLE_ARG_DECL) TAO_ExceptionDef_i impl (this->repo_, key); - put_ed.type = impl.type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + put_ed.type = impl.type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (ad); put_ed_seq[i] = put_ed; @@ -417,7 +417,7 @@ TAO_AttributeDef_i::make_description (TAO_ENV_SINGLE_ARG_DECL) } CORBA_ExceptionDefSeq * -TAO_AttributeDef_i::get_exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_AttributeDef_i::get_exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Unbounded_Queue path_queue; @@ -482,11 +482,11 @@ TAO_AttributeDef_i::get_exceptions (TAO_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_Exception, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); retval[i] = CORBA_ExceptionDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -494,7 +494,7 @@ TAO_AttributeDef_i::get_exceptions (TAO_ENV_SINGLE_ARG_DECL) } CORBA_ExceptionDefSeq * -TAO_AttributeDef_i::put_exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_AttributeDef_i::put_exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Unbounded_Queue path_queue; @@ -559,11 +559,11 @@ TAO_AttributeDef_i::put_exceptions (TAO_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_Exception, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); retval[i] = CORBA_ExceptionDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } diff --git a/TAO/orbsvcs/IFR_Service/AttributeDef_i.h b/TAO/orbsvcs/IFR_Service/AttributeDef_i.h index e0257965c6d..dba8eb077c1 100644 --- a/TAO/orbsvcs/IFR_Service/AttributeDef_i.h +++ b/TAO/orbsvcs/IFR_Service/AttributeDef_i.h @@ -51,79 +51,79 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_IDLType_ptr type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_IDLType_ptr type_def_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void type_def ( CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void type_def_i ( CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::AttributeMode mode ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::AttributeMode mode_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void mode ( CORBA::AttributeMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void mode_i ( CORBA::AttributeMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_AttributeDescription make_description ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Common code for InterfaceDef to call in @@ -131,12 +131,12 @@ public: // These two are called by Contained::move(). CORBA_ExceptionDefSeq *get_exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_ExceptionDefSeq *put_exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/ComponentDef_i.cpp b/TAO/orbsvcs/IFR_Service/ComponentDef_i.cpp index 58ea7753775..404cbceb9d2 100644 --- a/TAO/orbsvcs/IFR_Service/ComponentDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/ComponentDef_i.cpp @@ -23,39 +23,39 @@ TAO_ComponentDef_i::~TAO_ComponentDef_i (void) } CORBA::DefinitionKind -TAO_ComponentDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ComponentDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Component; } void -TAO_ComponentDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_ComponentDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_ComponentDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ComponentDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA_Contained::Description * -TAO_ComponentDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) +TAO_ComponentDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_ComponentDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ComponentDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -63,16 +63,16 @@ TAO_ComponentDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SING } CORBA::TypeCode_ptr -TAO_ComponentDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_ComponentDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_ComponentDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ComponentDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -80,16 +80,16 @@ TAO_ComponentDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_A } CORBA_InterfaceDefSeq * -TAO_ComponentDef_i::supported_interfaces (TAO_ENV_SINGLE_ARG_DECL) +TAO_ComponentDef_i::supported_interfaces (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->supported_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->supported_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_InterfaceDefSeq * -TAO_ComponentDef_i::supported_interfaces_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ComponentDef_i::supported_interfaces_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -99,20 +99,20 @@ TAO_ComponentDef_i::supported_interfaces_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* void TAO_ComponentDef_i::supported_interfaces ( const CORBA_InterfaceDefSeq &supported_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->supported_interfaces_i (supported_interfaces - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ComponentDef_i::supported_interfaces_i ( const CORBA_InterfaceDefSeq & /* supported_interfaces */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -120,16 +120,16 @@ TAO_ComponentDef_i::supported_interfaces_i ( } IR::ComponentDef_ptr -TAO_ComponentDef_i::base_component (TAO_ENV_SINGLE_ARG_DECL) +TAO_ComponentDef_i::base_component (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (IR::ComponentDef::_nil ()); - return this->base_component_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->base_component_i (ACE_ENV_SINGLE_ARG_PARAMETER); } IR::ComponentDef_ptr -TAO_ComponentDef_i::base_component_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ComponentDef_i::base_component_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -137,16 +137,16 @@ TAO_ComponentDef_i::base_component_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_EN } IR::ProvidesDefSeq * -TAO_ComponentDef_i::provides_interfaces (TAO_ENV_SINGLE_ARG_DECL) +TAO_ComponentDef_i::provides_interfaces (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->provides_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->provides_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER); } IR::ProvidesDefSeq * -TAO_ComponentDef_i::provides_interfaces_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ComponentDef_i::provides_interfaces_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -154,16 +154,16 @@ TAO_ComponentDef_i::provides_interfaces_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* T } IR::UsesDefSeq * -TAO_ComponentDef_i::uses_interfaces (TAO_ENV_SINGLE_ARG_DECL) +TAO_ComponentDef_i::uses_interfaces (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->uses_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->uses_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER); } IR::UsesDefSeq * -TAO_ComponentDef_i::uses_interfaces_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ComponentDef_i::uses_interfaces_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -171,16 +171,16 @@ TAO_ComponentDef_i::uses_interfaces_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_E } IR::EmitsDefSeq * -TAO_ComponentDef_i::emits_events (TAO_ENV_SINGLE_ARG_DECL) +TAO_ComponentDef_i::emits_events (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->emits_events_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->emits_events_i (ACE_ENV_SINGLE_ARG_PARAMETER); } IR::EmitsDefSeq * -TAO_ComponentDef_i::emits_events_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ComponentDef_i::emits_events_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -188,16 +188,16 @@ TAO_ComponentDef_i::emits_events_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_ } IR::PublishesDefSeq * -TAO_ComponentDef_i::publishes_events (TAO_ENV_SINGLE_ARG_DECL) +TAO_ComponentDef_i::publishes_events (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->publishes_events_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->publishes_events_i (ACE_ENV_SINGLE_ARG_PARAMETER); } IR::PublishesDefSeq * -TAO_ComponentDef_i::publishes_events_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ComponentDef_i::publishes_events_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -205,16 +205,16 @@ TAO_ComponentDef_i::publishes_events_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ } IR::ConsumesDefSeq * -TAO_ComponentDef_i::consumes_events (TAO_ENV_SINGLE_ARG_DECL) +TAO_ComponentDef_i::consumes_events (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->consumes_events_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->consumes_events_i (ACE_ENV_SINGLE_ARG_PARAMETER); } IR::ConsumesDefSeq * -TAO_ComponentDef_i::consumes_events_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ComponentDef_i::consumes_events_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -222,7 +222,7 @@ TAO_ComponentDef_i::consumes_events_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_E } CORBA::Boolean -TAO_ComponentDef_i::is_basic (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ComponentDef_i::is_basic (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -235,7 +235,7 @@ TAO_ComponentDef_i::create_provides ( const char *name, const char *version, CORBA_InterfaceDef_ptr interface_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -245,7 +245,7 @@ TAO_ComponentDef_i::create_provides ( name, version, interface_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } IR::ProvidesDef_ptr @@ -254,7 +254,7 @@ TAO_ComponentDef_i::create_provides_i ( const char * /* name */, const char * /* version */, CORBA_InterfaceDef_ptr /* interface_type */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -268,7 +268,7 @@ TAO_ComponentDef_i::create_uses (const char *id, const char *version, CORBA_InterfaceDef_ptr interface_type, CORBA::Boolean is_multiple - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (IR::UsesDef::_nil ()); @@ -278,7 +278,7 @@ TAO_ComponentDef_i::create_uses (const char *id, version, interface_type, is_multiple - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } IR::UsesDef_ptr @@ -287,7 +287,7 @@ TAO_ComponentDef_i::create_uses_i (const char * /* id */, const char * /* version */, CORBA_InterfaceDef_ptr /* interface_type */, CORBA::Boolean /* is_multiple */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ ) + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -299,7 +299,7 @@ TAO_ComponentDef_i::create_emits (const char *id, const char *name, const char *version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (IR::EmitsDef::_nil ()); @@ -308,7 +308,7 @@ TAO_ComponentDef_i::create_emits (const char *id, name, version, value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } IR::EmitsDef_ptr @@ -316,7 +316,7 @@ TAO_ComponentDef_i::create_emits_i (const char * /* id */, const char * /* name */, const char * /* version */, CORBA_ValueDef_ptr /* value */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -328,7 +328,7 @@ TAO_ComponentDef_i::create_publishes (const char *id, const char *name, const char *version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (IR::PublishesDef::_nil ()); @@ -337,7 +337,7 @@ TAO_ComponentDef_i::create_publishes (const char *id, name, version, value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } IR::PublishesDef_ptr @@ -345,7 +345,7 @@ TAO_ComponentDef_i::create_publishes_i (const char * /* id */, const char * /* name */, const char * /* version */, CORBA_ValueDef_ptr /* value */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -357,7 +357,7 @@ TAO_ComponentDef_i::create_consumes (const char *id, const char *name, const char *version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (IR::ConsumesDef::_nil ()); @@ -366,7 +366,7 @@ TAO_ComponentDef_i::create_consumes (const char *id, name, version, value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } IR::ConsumesDef_ptr @@ -374,7 +374,7 @@ TAO_ComponentDef_i::create_consumes_i (const char * /* id */, const char * /* name */, const char * /* version */, CORBA_ValueDef_ptr /* value */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO diff --git a/TAO/orbsvcs/IFR_Service/ComponentDef_i.h b/TAO/orbsvcs/IFR_Service/ComponentDef_i.h index b133e020ab2..cd67aca14c1 100644 --- a/TAO/orbsvcs/IFR_Service/ComponentDef_i.h +++ b/TAO/orbsvcs/IFR_Service/ComponentDef_i.h @@ -52,136 +52,136 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA_InterfaceDefSeq *supported_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_InterfaceDefSeq *supported_interfaces_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void supported_interfaces ( const CORBA_InterfaceDefSeq &supported_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void supported_interfaces_i ( const CORBA_InterfaceDefSeq &supported_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual IR::ComponentDef_ptr base_component ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); IR::ComponentDef_ptr base_component_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual IR::ProvidesDefSeq *provides_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); IR::ProvidesDefSeq *provides_interfaces_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual IR::UsesDefSeq *uses_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); IR::UsesDefSeq *uses_interfaces_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual IR::EmitsDefSeq *emits_events ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); IR::EmitsDefSeq *emits_events_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual IR::PublishesDefSeq *publishes_events ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); IR::PublishesDefSeq *publishes_events_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual IR::ConsumesDefSeq *consumes_events ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); IR::ConsumesDefSeq *consumes_events_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean is_basic ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Boolean is_basic_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -190,7 +190,7 @@ public: const char *name, const char *version, CORBA_InterfaceDef_ptr interface_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -199,7 +199,7 @@ public: const char *name, const char *version, CORBA_InterfaceDef_ptr interface_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -209,7 +209,7 @@ public: const char *version, CORBA_InterfaceDef_ptr interface_type, CORBA::Boolean is_multiple - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -219,7 +219,7 @@ public: const char *version, CORBA_InterfaceDef_ptr interface_type, CORBA::Boolean is_multiple - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -228,7 +228,7 @@ public: const char *name, const char *version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -237,7 +237,7 @@ public: const char *name, const char *version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -246,7 +246,7 @@ public: const char *name, const char *version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -255,7 +255,7 @@ public: const char *name, const char *version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -264,7 +264,7 @@ public: const char *name, const char *version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -273,7 +273,7 @@ public: const char *name, const char *version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/ComponentRepository_i.cpp b/TAO/orbsvcs/IFR_Service/ComponentRepository_i.cpp index 20b5ee7ab3e..cbaeaae6da6 100644 --- a/TAO/orbsvcs/IFR_Service/ComponentRepository_i.cpp +++ b/TAO/orbsvcs/IFR_Service/ComponentRepository_i.cpp @@ -27,7 +27,7 @@ TAO_ComponentRepository_i::create_component ( const char *version, IR::ComponentDef_ptr base_component, const CORBA_InterfaceDefSeq & supports_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -38,7 +38,7 @@ TAO_ComponentRepository_i::create_component ( version, base_component, supports_interfaces - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } IR::ComponentDef_ptr @@ -48,7 +48,7 @@ TAO_ComponentRepository_i::create_component_i ( const char * /* version */, IR::ComponentDef_ptr /* base_component */, const CORBA_InterfaceDefSeq & /* supports_interfaces */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -64,7 +64,7 @@ TAO_ComponentRepository_i::create_home ( IR::HomeDef_ptr base_component, IR::ComponentDef_ptr managed_component, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -76,7 +76,7 @@ TAO_ComponentRepository_i::create_home ( base_component, managed_component, primary_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } IR::HomeDef_ptr @@ -87,7 +87,7 @@ TAO_ComponentRepository_i::create_home_i ( IR::HomeDef_ptr /* base_component */, IR::ComponentDef_ptr /* managed_component */, CORBA_ValueDef_ptr /* primary_key */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/orbsvcs/IFR_Service/ComponentRepository_i.h b/TAO/orbsvcs/IFR_Service/ComponentRepository_i.h index 32aae9cde29..304f4580544 100644 --- a/TAO/orbsvcs/IFR_Service/ComponentRepository_i.h +++ b/TAO/orbsvcs/IFR_Service/ComponentRepository_i.h @@ -60,7 +60,7 @@ public: const char *version, IR::ComponentDef_ptr base_component, const CORBA_InterfaceDefSeq & supports_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -70,7 +70,7 @@ public: const char *version, IR::ComponentDef_ptr base_component, const CORBA_InterfaceDefSeq & supports_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -81,7 +81,7 @@ public: IR::HomeDef_ptr base_home, IR::ComponentDef_ptr managed_component, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -92,7 +92,7 @@ public: IR::HomeDef_ptr base_home, IR::ComponentDef_ptr managed_component, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/ConstantDef_i.cpp b/TAO/orbsvcs/IFR_Service/ConstantDef_i.cpp index c522edbd8f3..c00c5737571 100644 --- a/TAO/orbsvcs/IFR_Service/ConstantDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/ConstantDef_i.cpp @@ -23,23 +23,23 @@ TAO_ConstantDef_i::~TAO_ConstantDef_i (void) } CORBA::DefinitionKind -TAO_ConstantDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ConstantDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Constant; } CORBA_Contained::Description * -TAO_ConstantDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) +TAO_ConstantDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_ConstantDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_ConstantDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA_Contained::Description *desc_ptr = 0; @@ -50,15 +50,15 @@ TAO_ConstantDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) CORBA_Contained::Description_var retval = desc_ptr; - retval->kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA_ConstantDescription cd; - cd.name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER); + cd.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - cd.id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER); + cd.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_TString container_id; @@ -69,13 +69,13 @@ TAO_ConstantDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) cd.defined_in = container_id.c_str (); - cd.version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER); + cd.version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - cd.type = this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + cd.type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - CORBA::Any_var val = this->value_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Any_var val = this->value_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); cd.value = val.in (); @@ -86,16 +86,16 @@ TAO_ConstantDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) } CORBA::TypeCode_ptr -TAO_ConstantDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_ConstantDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_ConstantDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_ConstantDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString type_path; @@ -111,25 +111,25 @@ TAO_ConstantDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) TAO_IDLType_i *impl = this->repo_->servant_factory ()->create_idltype (type_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); auto_ptr safety (impl); - return impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_IDLType_ptr -TAO_ConstantDef_i::type_def (TAO_ENV_SINGLE_ARG_DECL) +TAO_ConstantDef_i::type_def (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ()); - return this->type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_IDLType_ptr -TAO_ConstantDef_i::type_def_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_ConstantDef_i::type_def_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString type_path; @@ -154,32 +154,32 @@ TAO_ConstantDef_i::type_def_i (TAO_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (def_kind, type_path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_IDLType::_nil ()); return CORBA_IDLType::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ConstantDef_i::type_def (CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->type_def_i (type_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ConstantDef_i::type_def_i (CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (type_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var type_path = @@ -191,19 +191,19 @@ TAO_ConstantDef_i::type_def_i (CORBA_IDLType_ptr type_def } CORBA::Any * -TAO_ConstantDef_i::value (TAO_ENV_SINGLE_ARG_DECL) +TAO_ConstantDef_i::value (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->value_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->value_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::Any * -TAO_ConstantDef_i::value_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_ConstantDef_i::value_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::TypeCode_var tc = this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var tc = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); void *ref = 0; @@ -239,21 +239,21 @@ TAO_ConstantDef_i::value_i (TAO_ENV_SINGLE_ARG_DECL) void TAO_ConstantDef_i::value (const CORBA::Any &value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->value_i (value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ConstantDef_i::value_i (const CORBA::Any &value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::TypeCode_var my_tc = this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var my_tc = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::TypeCode_var val_tc = value.type (); @@ -263,7 +263,7 @@ TAO_ConstantDef_i::value_i (const CORBA::Any &value ACE_Message_Block *mb = value._tao_get_cdr (); - CORBA::TCKind kind = val_tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind kind = val_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; switch (kind) diff --git a/TAO/orbsvcs/IFR_Service/ConstantDef_i.h b/TAO/orbsvcs/IFR_Service/ConstantDef_i.h index e2ad2105210..05b997877db 100644 --- a/TAO/orbsvcs/IFR_Service/ConstantDef_i.h +++ b/TAO/orbsvcs/IFR_Service/ConstantDef_i.h @@ -50,74 +50,74 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_IDLType_ptr type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_IDLType_ptr type_def_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void type_def ( CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void type_def_i ( CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any *value ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Any *value_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void value ( const CORBA::Any &value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void value_i ( const CORBA::Any &value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/ConsumesDef_i.cpp b/TAO/orbsvcs/IFR_Service/ConsumesDef_i.cpp index 9710a5fb7ee..e03833001b3 100644 --- a/TAO/orbsvcs/IFR_Service/ConsumesDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/ConsumesDef_i.cpp @@ -21,39 +21,39 @@ TAO_ConsumesDef_i::~TAO_ConsumesDef_i (void) } CORBA::DefinitionKind -TAO_ConsumesDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ConsumesDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Consumes; } -void -TAO_ConsumesDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +void +TAO_ConsumesDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -void -TAO_ConsumesDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +void +TAO_ConsumesDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA_Contained::Description * -TAO_ConsumesDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) +TAO_ConsumesDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_ConsumesDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ConsumesDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO diff --git a/TAO/orbsvcs/IFR_Service/ConsumesDef_i.h b/TAO/orbsvcs/IFR_Service/ConsumesDef_i.h index 20c1acf586d..854462108ed 100644 --- a/TAO/orbsvcs/IFR_Service/ConsumesDef_i.h +++ b/TAO/orbsvcs/IFR_Service/ConsumesDef_i.h @@ -51,30 +51,30 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. diff --git a/TAO/orbsvcs/IFR_Service/Contained_i.cpp b/TAO/orbsvcs/IFR_Service/Contained_i.cpp index 44414e16b2a..a4cf9266e73 100644 --- a/TAO/orbsvcs/IFR_Service/Contained_i.cpp +++ b/TAO/orbsvcs/IFR_Service/Contained_i.cpp @@ -20,16 +20,16 @@ TAO_Contained_i::~TAO_Contained_i (void) } void -TAO_Contained_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_Contained_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Contained_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Contained_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString id; @@ -85,16 +85,16 @@ TAO_Contained_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } char * -TAO_Contained_i::id (TAO_ENV_SINGLE_ARG_DECL) +TAO_Contained_i::id (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER); } char * -TAO_Contained_i::id_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Contained_i::id_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString retval; @@ -107,18 +107,18 @@ TAO_Contained_i::id_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_Contained_i::id (const char *id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->id_i (id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_Contained_i::id_i (const char *id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString tmp; @@ -162,16 +162,16 @@ TAO_Contained_i::id_i (const char *id } char * -TAO_Contained_i::name (TAO_ENV_SINGLE_ARG_DECL) +TAO_Contained_i::name (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER); } char * -TAO_Contained_i::name_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Contained_i::name_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString retval; @@ -183,16 +183,16 @@ TAO_Contained_i::name_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } char * -TAO_Contained_i::version (TAO_ENV_SINGLE_ARG_DECL) +TAO_Contained_i::version (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER); } char * -TAO_Contained_i::version_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Contained_i::version_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString retval; @@ -205,23 +205,23 @@ TAO_Contained_i::version_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_Contained_i::name (const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->name_i (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_Contained_i::name_i (const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Check if name already exists in this container. CORBA::Boolean exists = this->name_exists (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (exists) @@ -253,18 +253,18 @@ TAO_Contained_i::name_i (const char *name void TAO_Contained_i::version (const char *version - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->version_i (version - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_Contained_i::version_i (const char *version - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->set_string_value (this->section_key_, @@ -273,16 +273,16 @@ TAO_Contained_i::version_i (const char *version } CORBA_Container_ptr -TAO_Contained_i::defined_in (TAO_ENV_SINGLE_ARG_DECL) +TAO_Contained_i::defined_in (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA_Container::_nil ()); - return this->defined_in_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->defined_in_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Container_ptr -TAO_Contained_i::defined_in_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_Contained_i::defined_in_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString container_id; @@ -315,27 +315,27 @@ TAO_Contained_i::defined_in_i (TAO_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (def_kind, container_path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_Container::_nil ()); CORBA_Container_var retval = CORBA_Container::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_Container::_nil ()); return retval._retn (); } char * -TAO_Contained_i::absolute_name (TAO_ENV_SINGLE_ARG_DECL) +TAO_Contained_i::absolute_name (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->absolute_name_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->absolute_name_i (ACE_ENV_SINGLE_ARG_PARAMETER); } char * -TAO_Contained_i::absolute_name_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Contained_i::absolute_name_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString absolute_name; @@ -347,16 +347,16 @@ TAO_Contained_i::absolute_name_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } CORBA_Repository_ptr -TAO_Contained_i::containing_repository (TAO_ENV_SINGLE_ARG_DECL) +TAO_Contained_i::containing_repository (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA_Repository::_nil ()); - return this->containing_repository_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->containing_repository_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Repository_ptr -TAO_Contained_i::containing_repository_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Contained_i::containing_repository_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->repo_->repo_objref (); @@ -366,7 +366,7 @@ void TAO_Contained_i::move (CORBA_Container_ptr new_container, const char *new_name, const char *new_version - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -375,12 +375,12 @@ TAO_Contained_i::move (CORBA_Container_ptr new_container, new_name, new_version, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Boolean TAO_Contained_i::name_exists (const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString container_id; @@ -391,7 +391,7 @@ TAO_Contained_i::name_exists (const char *name if (container_id == "") { return this->repo_->name_exists (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_TString container_path; @@ -485,15 +485,15 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, const char *new_name, const char *new_version, CORBA::Boolean cleanup - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA_Repository_var my_repo = - this->containing_repository_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->containing_repository_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::DefinitionKind container_dk = - new_container->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + new_container->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_Configuration_Section_Key container_key; @@ -516,7 +516,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, { PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (new_container - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var container_path = @@ -529,13 +529,13 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, TAO_Contained_i *impl = this->repo_->servant_factory ()->create_contained (container_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; auto_ptr safety (impl); CORBA_Repository_var your_repo = - impl->containing_repository_i (TAO_ENV_SINGLE_ARG_PARAMETER); + impl->containing_repository_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (my_repo.in () != your_repo.in ()) @@ -545,14 +545,14 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, container_impl = this->repo_->servant_factory ()->create_container (container_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - CORBA::DefinitionKind my_dk = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::DefinitionKind my_dk = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::String_var id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // If an exception is thrown, this must be restored. @@ -576,7 +576,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, TAO_EnumDef_i impl (this->repo_, this->section_key_); - CORBA_EnumMemberSeq_var members = impl.members_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_EnumMemberSeq_var members = impl.members_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (container_dk == CORBA::dk_Struct @@ -586,7 +586,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, this->move_pre_process (new_container, my_path.c_str (), new_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -595,7 +595,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, new_name, new_version, members.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; break; } @@ -604,14 +604,14 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, TAO_AliasDef_i impl (this->repo_, this->section_key_); - CORBA_IDLType_var otype = impl.original_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_IDLType_var otype = impl.original_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; container_impl->create_alias_i (id.in (), new_name, new_version, otype.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; break; } @@ -620,7 +620,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, container_impl->create_native_i (id.in (), new_name, new_version - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; break; } @@ -629,14 +629,14 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, TAO_ValueBoxDef_i impl (this->repo_, this->section_key_); - CORBA_IDLType_var otype = impl.original_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_IDLType_var otype = impl.original_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; container_impl->create_value_box_i (id.in (), new_name, new_version, otype.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; break; } @@ -645,7 +645,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, TAO_StructDef_i impl (this->repo_, this->section_key_); - CORBA_StructMemberSeq_var members = impl.members_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_StructMemberSeq_var members = impl.members_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (container_dk == CORBA::dk_Struct @@ -655,7 +655,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, this->move_pre_process (new_container, my_path.c_str (), new_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -664,11 +664,11 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, new_name, new_version, members.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->move_contents (new_defn.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); break; } @@ -678,10 +678,10 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, this->section_key_); CORBA_IDLType_var disc_type = - impl.discriminator_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER); + impl.discriminator_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA_UnionMemberSeq_var members = impl.members_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_UnionMemberSeq_var members = impl.members_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (container_dk == CORBA::dk_Struct @@ -691,7 +691,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, this->move_pre_process (new_container, my_path.c_str (), new_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -701,11 +701,11 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, new_version, disc_type.in (), members.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->move_contents (new_defn.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); break; } @@ -715,11 +715,11 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, container_impl->create_module_i (id.in (), new_name, new_version - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->move_contents (new_defn.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); break; } @@ -728,7 +728,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, TAO_ExceptionDef_i impl (this->repo_, this->section_key_); - CORBA_StructMemberSeq_var members = impl.members_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_StructMemberSeq_var members = impl.members_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA_ExceptionDef_var new_defn = @@ -736,11 +736,11 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, new_name, new_version, members.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->move_contents (new_defn.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); break; } @@ -750,7 +750,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, this->section_key_); CORBA_InterfaceDefSeq_var bases = - impl.base_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER); + impl.base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA_InterfaceDef_var new_defn = @@ -758,11 +758,11 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, new_name, new_version, bases.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->move_contents (new_defn.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); break; } @@ -771,10 +771,10 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, TAO_ConstantDef_i impl (this->repo_, this->section_key_); - CORBA_IDLType_var type_def = impl.type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_IDLType_var type_def = impl.type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::Any_var value = impl.value_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Any_var value = impl.value_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; container_impl->create_constant_i (id.in (), @@ -782,7 +782,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, new_version, type_def.in (), value.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; break; } @@ -791,10 +791,10 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, TAO_AttributeDef_i impl (this->repo_, this->section_key_); - CORBA_IDLType_var type_def = impl.type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_IDLType_var type_def = impl.type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::AttributeMode mode = impl.mode_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::AttributeMode mode = impl.mode_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (container_dk == CORBA::dk_Interface) @@ -807,7 +807,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, new_version, type_def.in (), mode - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; break; } @@ -821,7 +821,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, new_version, type_def.in (), mode - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; break; } @@ -835,20 +835,20 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, TAO_OperationDef_i impl (this->repo_, this->section_key_); - CORBA_IDLType_var result = impl.result_def_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_IDLType_var result = impl.result_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::OperationMode mode = impl.mode_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::OperationMode mode = impl.mode_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA_ParDescriptionSeq_var params = impl.params_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_ParDescriptionSeq_var params = impl.params_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA_ExceptionDefSeq_var exceptions = - impl.exceptions_i (TAO_ENV_SINGLE_ARG_PARAMETER); + impl.exceptions_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA_ContextIdSeq_var contexts = impl.contexts_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_ContextIdSeq_var contexts = impl.contexts_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (container_dk == CORBA::dk_Interface) @@ -864,7 +864,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, params.in (), exceptions.in (), contexts.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; break; } @@ -881,7 +881,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, params.in (), exceptions.in (), contexts.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; break; } @@ -967,12 +967,12 @@ void TAO_Contained_i::move_pre_process (CORBA_Container_ptr container, const char *contained_path, const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ObjectId_var container_oid = this->repo_->ir_poa ()->reference_to_id (container - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var container_path = @@ -1027,7 +1027,7 @@ TAO_Contained_i::move_pre_process (CORBA_Container_ptr container, void TAO_Contained_i::move_contents (CORBA_Container_ptr new_container - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString name; @@ -1070,7 +1070,7 @@ TAO_Contained_i::move_contents (CORBA_Container_ptr new_container TAO_Contained_i *impl = this->repo_->servant_factory ()->create_contained ( defn_key - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -1080,13 +1080,13 @@ TAO_Contained_i::move_contents (CORBA_Container_ptr new_container name.c_str (), version.c_str (), 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } } - CORBA::DefinitionKind kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::DefinitionKind kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Specific to InterfaceDef_i and ValueDef_i @@ -1131,7 +1131,7 @@ TAO_Contained_i::move_contents (CORBA_Container_ptr new_container name.c_str (), version.c_str (), 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -1174,7 +1174,7 @@ TAO_Contained_i::move_contents (CORBA_Container_ptr new_container name.c_str (), version.c_str (), 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/orbsvcs/IFR_Service/Contained_i.h b/TAO/orbsvcs/IFR_Service/Contained_i.h index 299288402e9..bcc023d9457 100644 --- a/TAO/orbsvcs/IFR_Service/Contained_i.h +++ b/TAO/orbsvcs/IFR_Service/Contained_i.h @@ -51,120 +51,120 @@ public: // Destructor. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char *id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); char *id_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void id ( const char *id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void id_i ( const char *id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char *name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); char *name_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void name ( const char *name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void name_i ( const char *name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char *version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); char *version_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void version ( const char *version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void version_i ( const char *version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_Container_ptr defined_in_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char *absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); char *absolute_name_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_Repository_ptr containing_repository_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; // Pure virtual. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; // Pure virtual. @@ -173,7 +173,7 @@ public: CORBA_Container_ptr new_container, const char *new_name, const char *new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -183,7 +183,7 @@ protected: const char *new_name, const char *new_version, CORBA::Boolean cleanup - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Engine for move() with an extra 'cleanup' @@ -194,7 +194,7 @@ protected: private: CORBA::Boolean name_exists ( const char *name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Check if already exists in our container @@ -209,7 +209,7 @@ private: CORBA_Container_ptr container, const char *contained_path, const char *name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Mangle the names of references that are also @@ -219,7 +219,7 @@ private: void move_contents ( CORBA_Container_ptr new_container - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Recursively calls move_i for definitions, diff --git a/TAO/orbsvcs/IFR_Service/Container_i.cpp b/TAO/orbsvcs/IFR_Service/Container_i.cpp index c3bbfcc8e0f..88e98631ddf 100644 --- a/TAO/orbsvcs/IFR_Service/Container_i.cpp +++ b/TAO/orbsvcs/IFR_Service/Container_i.cpp @@ -21,16 +21,16 @@ TAO_Container_i::~TAO_Container_i (void) } void -TAO_Container_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_Container_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { int index = 0; @@ -77,12 +77,12 @@ TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL) { TAO_IDLType_i *impl = this->repo_->servant_factory ()->create_idltype (entry_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; auto_ptr safety (impl); - CORBA::DefinitionKind def_kind = impl->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::DefinitionKind def_kind = impl->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; switch (def_kind) @@ -95,7 +95,7 @@ TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL) case CORBA::dk_Fixed: case CORBA::dk_Array: case CORBA::dk_Sequence: - impl->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + impl->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; break; default: @@ -146,12 +146,12 @@ TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL) TAO_Contained_i *impl = this->repo_->servant_factory ()->create_contained (defn_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; auto_ptr safety (impl); - impl->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + impl->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -163,18 +163,18 @@ TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL) CORBA_Contained_ptr TAO_Container_i::lookup (const char *search_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); return this->lookup_i (search_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_Contained_ptr TAO_Container_i::lookup_i (const char *search_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Configuration_Section_Key iter_key; @@ -378,30 +378,30 @@ TAO_Container_i::lookup_i (const char *search_name CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (def_kind, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_Contained::_nil ()); return CORBA_Contained::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_ContainedSeq * TAO_Container_i::contents (CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); return this->contents_i (limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_ContainedSeq * TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (limit_type == CORBA::dk_none) @@ -467,7 +467,7 @@ TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type, // Base interfaces - CORBA::DefinitionKind def_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::DefinitionKind def_kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (def_kind == CORBA::dk_Interface) @@ -483,7 +483,7 @@ TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type, path_queue, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } } @@ -511,12 +511,12 @@ TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type, CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (next_kind, next_path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA_Contained_var next_cont = CORBA_Contained::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); retval[j] = next_cont._retn (); @@ -530,7 +530,7 @@ TAO_Container_i::lookup_name (const char *search_name, CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -539,7 +539,7 @@ TAO_Container_i::lookup_name (const char *search_name, levels_to_search, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_ContainedSeq * @@ -547,7 +547,7 @@ TAO_Container_i::lookup_name_i (const char *search_name, CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Unbounded_Queue kind_queue; @@ -559,7 +559,7 @@ TAO_Container_i::lookup_name_i (const char *search_name, levels_to_search, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); size_t size = kind_queue.size (); @@ -583,12 +583,12 @@ TAO_Container_i::lookup_name_i (const char *search_name, CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (next_kind, next_path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA_Contained_var next_cont = CORBA_Contained::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); retval[i] = next_cont._retn (); @@ -601,7 +601,7 @@ CORBA_Container::DescriptionSeq * TAO_Container_i::describe_contents (CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -609,19 +609,19 @@ TAO_Container_i::describe_contents (CORBA::DefinitionKind limit_type, return this->describe_contents_i (limit_type, exclude_inherited, max_returned_objs - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_Container::DescriptionSeq * TAO_Container_i::describe_contents_i (CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA_ContainedSeq_var contents = this->contents_i (limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::ULong length = contents->length (); @@ -654,7 +654,7 @@ TAO_Container_i::describe_contents_i (CORBA::DefinitionKind limit_type, for (CORBA::ULong i = 0; i < ret_len; i++) { oid = this->repo_->ir_poa ()->reference_to_id (contents[i] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); contained_path = @@ -667,12 +667,12 @@ TAO_Container_i::describe_contents_i (CORBA::DefinitionKind limit_type, impl = this->repo_->servant_factory ()->create_contained (contained_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); auto_ptr safety (impl); - desc = impl->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + desc = impl->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); retval[i].contained_object = @@ -690,7 +690,7 @@ CORBA_ModuleDef_ptr TAO_Container_i::create_module (const char *id, const char *name, const char *version - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_ModuleDef::_nil ()); @@ -698,18 +698,18 @@ TAO_Container_i::create_module (const char *id, return this->create_module_i (id, name, version - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_ModuleDef_ptr TAO_Container_i::create_module_i (const char *id, const char *name, const char *version - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Module - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ModuleDef::_nil ()); if (!legal_op) @@ -717,7 +717,7 @@ TAO_Container_i::create_module_i (const char *id, CORBA::Boolean bad_params = this->pre_exist (id, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ModuleDef::_nil ()); if (bad_params) @@ -752,11 +752,11 @@ TAO_Container_i::create_module_i (const char *id, CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_Module, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ModuleDef::_nil ()); return CORBA_ModuleDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_ConstantDef_ptr @@ -765,7 +765,7 @@ TAO_Container_i::create_constant (const char *id, const char *version, CORBA_IDLType_ptr type, const CORBA::Any &value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_ConstantDef::_nil ()); @@ -775,7 +775,7 @@ TAO_Container_i::create_constant (const char *id, version, type, value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_ConstantDef_ptr @@ -784,11 +784,11 @@ TAO_Container_i::create_constant_i (const char *id, const char *version, CORBA_IDLType_ptr type, const CORBA::Any &value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Constant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ()); if (!legal_op) @@ -796,7 +796,7 @@ TAO_Container_i::create_constant_i (const char *id, CORBA::Boolean bad_params = this->pre_exist (id, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ()); if (bad_params) @@ -823,7 +823,7 @@ TAO_Container_i::create_constant_i (const char *id, // Get the path to our type and store it. PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ()); CORBA::String_var type_path = @@ -838,7 +838,7 @@ TAO_Container_i::create_constant_i (const char *id, CORBA::TypeCode_var val_tc = value.type (); - CORBA::TCKind kind = val_tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind kind = val_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ()); switch (kind) @@ -869,11 +869,11 @@ TAO_Container_i::create_constant_i (const char *id, CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_Constant, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ()); return CORBA_ConstantDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_StructDef_ptr @@ -881,7 +881,7 @@ TAO_Container_i::create_struct (const char *id, const char *name, const char *version, const CORBA_StructMemberSeq &members - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_StructDef::_nil ()); @@ -890,7 +890,7 @@ TAO_Container_i::create_struct (const char *id, name, version, members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_StructDef_ptr @@ -898,11 +898,11 @@ TAO_Container_i::create_struct_i (const char *id, const char *name, const char *version, const CORBA_StructMemberSeq &members - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Struct - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_StructDef::_nil ()); if (!legal_op) @@ -910,7 +910,7 @@ TAO_Container_i::create_struct_i (const char *id, CORBA::Boolean bad_params = this->pre_exist (id, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_StructDef::_nil ()); if (bad_params) @@ -963,7 +963,7 @@ TAO_Container_i::create_struct_i (const char *id, PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_StructDef::_nil ()); CORBA::String_var member_path = @@ -974,7 +974,7 @@ TAO_Container_i::create_struct_i (const char *id, member_path.in ()); } - CORBA::DefinitionKind def_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::DefinitionKind def_kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_StructDef::_nil ()); if (def_kind == CORBA::dk_Struct @@ -989,11 +989,11 @@ TAO_Container_i::create_struct_i (const char *id, CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_Struct, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_StructDef::_nil ()); return CORBA_StructDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_UnionDef_ptr @@ -1002,7 +1002,7 @@ TAO_Container_i::create_union (const char *id, const char *version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq &members - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_UnionDef::_nil ()); @@ -1012,7 +1012,7 @@ TAO_Container_i::create_union (const char *id, version, discriminator_type, members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_UnionDef_ptr @@ -1021,11 +1021,11 @@ TAO_Container_i::create_union_i (const char *id, const char *version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq &members - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Union - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_UnionDef::_nil ()); if (!legal_op) @@ -1033,7 +1033,7 @@ TAO_Container_i::create_union_i (const char *id, CORBA::Boolean bad_params = this->pre_exist (id, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_UnionDef::_nil ()); if (bad_params) @@ -1059,7 +1059,7 @@ TAO_Container_i::create_union_i (const char *id, // Add a field to hold the path to the discriminator type. PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (discriminator_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_UnionDef::_nil ()); CORBA::String_var disc_path = @@ -1099,7 +1099,7 @@ TAO_Container_i::create_union_i (const char *id, PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_UnionDef::_nil ()); CORBA::String_var member_path = @@ -1111,10 +1111,10 @@ TAO_Container_i::create_union_i (const char *id, this->store_label (member_key, members[i].label - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } - CORBA::DefinitionKind def_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::DefinitionKind def_kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_UnionDef::_nil ()); if (def_kind == CORBA::dk_Struct @@ -1129,11 +1129,11 @@ TAO_Container_i::create_union_i (const char *id, CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_Union, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_UnionDef::_nil ()); return CORBA_UnionDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_EnumDef_ptr @@ -1141,7 +1141,7 @@ TAO_Container_i::create_enum (const char *id, const char *name, const char *version, const CORBA_EnumMemberSeq &members - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_EnumDef::_nil ()); @@ -1150,7 +1150,7 @@ TAO_Container_i::create_enum (const char *id, name, version, members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_EnumDef_ptr @@ -1158,11 +1158,11 @@ TAO_Container_i::create_enum_i (const char *id, const char *name, const char *version, const CORBA_EnumMemberSeq &members - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Enum - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_EnumDef::_nil ()); if (!legal_op) @@ -1170,7 +1170,7 @@ TAO_Container_i::create_enum_i (const char *id, CORBA::Boolean bad_params = this->pre_exist (id, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_EnumDef::_nil ()); if (bad_params) @@ -1215,7 +1215,7 @@ TAO_Container_i::create_enum_i (const char *id, members[i].in ()); } - CORBA::DefinitionKind def_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::DefinitionKind def_kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_EnumDef::_nil ()); if (def_kind == CORBA::dk_Struct @@ -1230,11 +1230,11 @@ TAO_Container_i::create_enum_i (const char *id, CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_Enum, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_EnumDef::_nil ()); return CORBA_EnumDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_AliasDef_ptr @@ -1242,7 +1242,7 @@ TAO_Container_i::create_alias (const char *id, const char *name, const char *version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_AliasDef::_nil ()); @@ -1251,7 +1251,7 @@ TAO_Container_i::create_alias (const char *id, name, version, original_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_AliasDef_ptr @@ -1259,11 +1259,11 @@ TAO_Container_i::create_alias_i (const char *id, const char *name, const char *version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Alias - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_AliasDef::_nil ()); if (!legal_op) @@ -1271,7 +1271,7 @@ TAO_Container_i::create_alias_i (const char *id, CORBA::Boolean bad_params = this->pre_exist (id, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_AliasDef::_nil ()); if (bad_params) @@ -1297,7 +1297,7 @@ TAO_Container_i::create_alias_i (const char *id, // Get the path to our original type and store it. PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (original_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_AliasDef::_nil ()); CORBA::String_var unalias_path = @@ -1311,11 +1311,11 @@ TAO_Container_i::create_alias_i (const char *id, CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_Alias, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_AliasDef::_nil ()); return CORBA_AliasDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_InterfaceDef_ptr @@ -1323,7 +1323,7 @@ TAO_Container_i::create_interface (const char *id, const char *name, const char *version, const CORBA_InterfaceDefSeq &base_interfaces - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_InterfaceDef::_nil ()); @@ -1332,7 +1332,7 @@ TAO_Container_i::create_interface (const char *id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_InterfaceDef_ptr @@ -1340,11 +1340,11 @@ TAO_Container_i::create_interface_i (const char *id, const char *name, const char *version, const CORBA_InterfaceDefSeq &base_interfaces - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Interface - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ()); if (!legal_op) @@ -1352,7 +1352,7 @@ TAO_Container_i::create_interface_i (const char *id, CORBA::Boolean bad_params = this->pre_exist (id, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ()); if (bad_params) @@ -1392,7 +1392,7 @@ TAO_Container_i::create_interface_i (const char *id, { PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (base_interfaces[i] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ()); CORBA::String_var inherited_path = @@ -1410,11 +1410,11 @@ TAO_Container_i::create_interface_i (const char *id, CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_Interface, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ()); return CORBA_InterfaceDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_ValueDef_ptr @@ -1428,7 +1428,7 @@ TAO_Container_i::create_value (const char *id, const CORBA_ValueDefSeq &abstract_base_values, const CORBA_InterfaceDefSeq &supported_interfaces, const CORBA_InitializerSeq &initializers - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_ValueDef::_nil ()); @@ -1443,7 +1443,7 @@ TAO_Container_i::create_value (const char *id, abstract_base_values, supported_interfaces, initializers - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_ValueDef_ptr @@ -1457,7 +1457,7 @@ TAO_Container_i::create_value_i (const char * /* id */, const CORBA_ValueDefSeq & /* abstract_base_values */, const CORBA_InterfaceDefSeq & /* supported_interfaces */, const CORBA_InitializerSeq & /* initializers */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -1469,7 +1469,7 @@ TAO_Container_i::create_value_box (const char *id, const char *name, const char *version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_ValueBoxDef::_nil ()); @@ -1478,7 +1478,7 @@ TAO_Container_i::create_value_box (const char *id, name, version, original_type_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_ValueBoxDef_ptr @@ -1486,11 +1486,11 @@ TAO_Container_i::create_value_box_i (const char *id, const char *name, const char *version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL ) + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean legal_op = this->valid_container (CORBA::dk_ValueBox - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ValueBoxDef::_nil ()); if (!legal_op) @@ -1498,7 +1498,7 @@ TAO_Container_i::create_value_box_i (const char *id, CORBA::Boolean bad_params = this->pre_exist (id, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ValueBoxDef::_nil ()); if (bad_params) @@ -1524,7 +1524,7 @@ TAO_Container_i::create_value_box_i (const char *id, // Get the path to our original type and store it. PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (original_type_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ValueBoxDef::_nil ()); CORBA::String_var boxed_path = @@ -1538,11 +1538,11 @@ TAO_Container_i::create_value_box_i (const char *id, CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_ValueBox, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ValueBoxDef::_nil ()); return CORBA_ValueBoxDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_ExceptionDef_ptr @@ -1550,7 +1550,7 @@ TAO_Container_i::create_exception (const char *id, const char *name, const char *version, const CORBA_StructMemberSeq &members - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_ExceptionDef::_nil ()); @@ -1559,7 +1559,7 @@ TAO_Container_i::create_exception (const char *id, name, version, members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_ExceptionDef_ptr @@ -1567,11 +1567,11 @@ TAO_Container_i::create_exception_i (const char *id, const char *name, const char *version, const CORBA_StructMemberSeq &members - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Exception - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ExceptionDef::_nil ()); if (!legal_op) @@ -1579,7 +1579,7 @@ TAO_Container_i::create_exception_i (const char *id, CORBA::Boolean bad_params = this->pre_exist (id, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ExceptionDef::_nil ()); if (bad_params) @@ -1630,7 +1630,7 @@ TAO_Container_i::create_exception_i (const char *id, PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ExceptionDef::_nil ()); CORBA::String_var member_path = @@ -1645,18 +1645,18 @@ TAO_Container_i::create_exception_i (const char *id, CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_Exception, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ExceptionDef::_nil ()); return CORBA_ExceptionDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_NativeDef_ptr TAO_Container_i::create_native (const char *id, const char *name, const char *version - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_NativeDef::_nil ()); @@ -1664,18 +1664,18 @@ TAO_Container_i::create_native (const char *id, return this->create_native_i (id, name, version - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_NativeDef_ptr TAO_Container_i::create_native_i (const char *id, const char *name, const char *version - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Native - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_NativeDef::_nil ()); if (!legal_op) @@ -1683,7 +1683,7 @@ TAO_Container_i::create_native_i (const char *id, CORBA::Boolean bad_params = this->pre_exist (id, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_NativeDef::_nil ()); if (bad_params) @@ -1710,11 +1710,11 @@ TAO_Container_i::create_native_i (const char *id, CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_Native, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_NativeDef::_nil ()); return CORBA_NativeDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_AbstractInterfaceDef_ptr @@ -1723,7 +1723,7 @@ TAO_Container_i::create_abstract_interface ( const char *name, const char *version, const CORBA_AbstractInterfaceDefSeq &base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1733,7 +1733,7 @@ TAO_Container_i::create_abstract_interface ( name, version, base_interfaces - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_AbstractInterfaceDef_ptr @@ -1742,13 +1742,13 @@ TAO_Container_i::create_abstract_interface_i ( const char *name, const char *version, const CORBA_AbstractInterfaceDefSeq &base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean legal_op = this->valid_container ( CORBA::dk_AbstractInterface - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (CORBA_AbstractInterfaceDef::_nil ()); @@ -1757,7 +1757,7 @@ TAO_Container_i::create_abstract_interface_i ( CORBA::Boolean bad_params = this->pre_exist (id, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_AbstractInterfaceDef::_nil ()); if (bad_params) @@ -1797,7 +1797,7 @@ TAO_Container_i::create_abstract_interface_i ( { PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (base_interfaces[i] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_AbstractInterfaceDef::_nil ()); CORBA::String_var inherited_path = @@ -1815,11 +1815,11 @@ TAO_Container_i::create_abstract_interface_i ( CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_AbstractInterface, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_AbstractInterfaceDef::_nil ()); return CORBA_AbstractInterfaceDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_LocalInterfaceDef_ptr @@ -1828,7 +1828,7 @@ TAO_Container_i::create_local_interface ( const char *name, const char *version, const CORBA_InterfaceDefSeq &base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1838,7 +1838,7 @@ TAO_Container_i::create_local_interface ( name, version, base_interfaces - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_LocalInterfaceDef_ptr @@ -1847,12 +1847,12 @@ TAO_Container_i::create_local_interface_i ( const char *name, const char *version, const CORBA_InterfaceDefSeq &base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean legal_op = this->valid_container (CORBA::dk_LocalInterface - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_LocalInterfaceDef::_nil ()); if (!legal_op) @@ -1860,7 +1860,7 @@ TAO_Container_i::create_local_interface_i ( CORBA::Boolean bad_params = this->pre_exist (id, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_LocalInterfaceDef::_nil ()); if (bad_params) @@ -1900,7 +1900,7 @@ TAO_Container_i::create_local_interface_i ( { PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (base_interfaces[i] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_LocalInterfaceDef::_nil ()); CORBA::String_var inherited_path = @@ -1918,16 +1918,16 @@ TAO_Container_i::create_local_interface_i ( CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_LocalInterface, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_LocalInterfaceDef::_nil ()); return CORBA_LocalInterfaceDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Boolean TAO_Container_i::name_exists (const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { int index = 0; @@ -2003,7 +2003,7 @@ TAO_Container_i::name_exists (const char *name } // If we are an interface, check the inherited members. - CORBA::DefinitionKind def_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::DefinitionKind def_kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (1); if (def_kind == CORBA::dk_Interface) @@ -2060,7 +2060,7 @@ TAO_Container_i::lookup_name_recursive ( CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_Configuration_Section_Key defns_key; @@ -2125,7 +2125,7 @@ TAO_Container_i::lookup_name_recursive ( TAO_Container_i *impl = this->repo_->servant_factory ()->create_container ( defn_key - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -2143,13 +2143,13 @@ TAO_Container_i::lookup_name_recursive ( : levels_to_search - 1, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } } - CORBA::DefinitionKind kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::DefinitionKind kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (kind == CORBA::dk_Interface || kind == CORBA::dk_Value) @@ -2378,7 +2378,7 @@ TAO_Container_i::lookup_op ( CORBA::Boolean TAO_Container_i::id_exists (const char *id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // The repo id must not already exist. @@ -2400,16 +2400,16 @@ TAO_Container_i::id_exists (const char *id CORBA::Boolean TAO_Container_i::pre_exist (const char *id, const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::Boolean exist = this->id_exists (id TAO_ENV_ARG_PARAMETER); + CORBA::Boolean exist = this->id_exists (id ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (1); if (exist) return 1; - return name_exists (name TAO_ENV_ARG_PARAMETER); + return name_exists (name ACE_ENV_ARG_PARAMETER); } ACE_TString @@ -2516,10 +2516,10 @@ TAO_Container_i::create_common ( CORBA::Boolean TAO_Container_i::valid_container (const CORBA::DefinitionKind op_kind - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::DefinitionKind my_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::DefinitionKind my_kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); int error_flag = 0; @@ -2579,12 +2579,12 @@ TAO_Container_i::valid_container (const CORBA::DefinitionKind op_kind void TAO_Container_i::store_label (ACE_Configuration_Section_Key key, const CORBA::Any &value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::TypeCode_var tc = value.type (); - CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; TAO_InputCDR cdr (value._tao_get_cdr (), diff --git a/TAO/orbsvcs/IFR_Service/Container_i.h b/TAO/orbsvcs/IFR_Service/Container_i.h index df454997d72..e3435b72c31 100644 --- a/TAO/orbsvcs/IFR_Service/Container_i.h +++ b/TAO/orbsvcs/IFR_Service/Container_i.h @@ -54,39 +54,39 @@ public: // Destructor. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove our contents. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Contained_ptr lookup ( const char *search_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_Contained_ptr lookup_i ( const char *search_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_ContainedSeq *contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_ContainedSeq *contents_i ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -95,7 +95,7 @@ public: CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -104,7 +104,7 @@ public: CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -112,7 +112,7 @@ public: CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -120,7 +120,7 @@ public: CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -128,7 +128,7 @@ public: const char *id, const char *name, const char *version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -136,7 +136,7 @@ public: const char *id, const char *name, const char *version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -146,7 +146,7 @@ public: const char *version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -156,7 +156,7 @@ public: const char *version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -165,7 +165,7 @@ public: const char *name, const char *version, const CORBA_StructMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -174,7 +174,7 @@ public: const char *name, const char *version, const CORBA_StructMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -184,7 +184,7 @@ public: const char *version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -194,7 +194,7 @@ public: const char *version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -203,7 +203,7 @@ public: const char *name, const char *version, const CORBA_EnumMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -212,7 +212,7 @@ public: const char *name, const char *version, const CORBA_EnumMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -221,7 +221,7 @@ public: const char *name, const char *version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -230,7 +230,7 @@ public: const char *name, const char *version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -239,7 +239,7 @@ public: const char *name, const char *version, const CORBA_InterfaceDefSeq &base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -248,7 +248,7 @@ public: const char *name, const char *version, const CORBA_InterfaceDefSeq &base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -263,7 +263,7 @@ public: const CORBA_ValueDefSeq &abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq &initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -278,7 +278,7 @@ public: const CORBA_ValueDefSeq &abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq &initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -287,7 +287,7 @@ public: const char *name, const char *version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -296,7 +296,7 @@ public: const char *name, const char *version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -305,7 +305,7 @@ public: const char *name, const char *version, const CORBA_StructMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -314,7 +314,7 @@ public: const char *name, const char *version, const CORBA_StructMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -322,7 +322,7 @@ public: const char *id, const char *name, const char *version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -330,7 +330,7 @@ public: const char *id, const char *name, const char *version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -339,7 +339,7 @@ public: const char *name, const char *version, const CORBA_AbstractInterfaceDefSeq &base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -348,7 +348,7 @@ public: const char *name, const char *version, const CORBA_AbstractInterfaceDefSeq &base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -357,7 +357,7 @@ public: const char *name, const char *version, const CORBA_InterfaceDefSeq &base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -366,13 +366,13 @@ public: const char *name, const char *version, const CORBA_InterfaceDefSeq &base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Boolean name_exists ( const char *name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Checks for local existence of . @@ -381,7 +381,7 @@ protected: void store_label ( ACE_Configuration_Section_Key key, const CORBA::Any &value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Store a union member's label value. @@ -389,7 +389,7 @@ protected: CORBA::Boolean pre_exist ( const char *id, const char *name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Bundles id_exists and name_exists together. @@ -427,19 +427,19 @@ private: CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); CORBA::Boolean id_exists ( const char *id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Checks for global existence of the repo id. CORBA::Boolean valid_container ( const CORBA::DefinitionKind op_kind - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Is this operation valid for this container type? diff --git a/TAO/orbsvcs/IFR_Service/EmitsDef_i.cpp b/TAO/orbsvcs/IFR_Service/EmitsDef_i.cpp index eac6599262e..97ad175d7ad 100644 --- a/TAO/orbsvcs/IFR_Service/EmitsDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/EmitsDef_i.cpp @@ -19,39 +19,39 @@ TAO_EmitsDef_i::~TAO_EmitsDef_i (void) } CORBA::DefinitionKind -TAO_EmitsDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EmitsDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Emits; } -void -TAO_EmitsDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +void +TAO_EmitsDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -void -TAO_EmitsDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +void +TAO_EmitsDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA_Contained::Description * -TAO_EmitsDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) +TAO_EmitsDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_EmitsDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_EmitsDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO diff --git a/TAO/orbsvcs/IFR_Service/EmitsDef_i.h b/TAO/orbsvcs/IFR_Service/EmitsDef_i.h index 4759d541ab8..5b7141e3ee8 100644 --- a/TAO/orbsvcs/IFR_Service/EmitsDef_i.h +++ b/TAO/orbsvcs/IFR_Service/EmitsDef_i.h @@ -51,30 +51,30 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. diff --git a/TAO/orbsvcs/IFR_Service/EnumDef_i.cpp b/TAO/orbsvcs/IFR_Service/EnumDef_i.cpp index 04ab433cb5b..288a13fdd66 100644 --- a/TAO/orbsvcs/IFR_Service/EnumDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/EnumDef_i.cpp @@ -21,23 +21,23 @@ TAO_EnumDef_i::~TAO_EnumDef_i (void) } CORBA::DefinitionKind -TAO_EnumDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EnumDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Enum; } CORBA::TypeCode_ptr -TAO_EnumDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_EnumDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_EnumDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_EnumDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString id; @@ -50,26 +50,26 @@ TAO_EnumDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) "name", name); - CORBA_EnumMemberSeq_var members = this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_EnumMemberSeq_var members = this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); return this->repo_->tc_factory ()->create_enum_tc (id.c_str (), name.c_str (), members.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_EnumMemberSeq * -TAO_EnumDef_i::members (TAO_ENV_SINGLE_ARG_DECL) +TAO_EnumDef_i::members (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_EnumMemberSeq * -TAO_EnumDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_EnumDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { u_int count = 0; @@ -107,18 +107,18 @@ TAO_EnumDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL) void TAO_EnumDef_i::members (const CORBA_EnumMemberSeq &members - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->members_i (members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_EnumDef_i::members_i (const CORBA_EnumMemberSeq &members - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->remove_section (this->section_key_, diff --git a/TAO/orbsvcs/IFR_Service/EnumDef_i.h b/TAO/orbsvcs/IFR_Service/EnumDef_i.h index ba0aefb5c6f..202696fe9e0 100644 --- a/TAO/orbsvcs/IFR_Service/EnumDef_i.h +++ b/TAO/orbsvcs/IFR_Service/EnumDef_i.h @@ -51,42 +51,42 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA_EnumMemberSeq *members ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_EnumMemberSeq *members_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void members ( const CORBA_EnumMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void members_i ( const CORBA_EnumMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/EventDef_i.cpp b/TAO/orbsvcs/IFR_Service/EventDef_i.cpp index b7e4549e081..92500cea21e 100644 --- a/TAO/orbsvcs/IFR_Service/EventDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/EventDef_i.cpp @@ -18,32 +18,32 @@ TAO_EventDef_i::~TAO_EventDef_i (void) } void -TAO_EventDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_EventDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_EventDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_EventDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA_Contained::Description * -TAO_EventDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) +TAO_EventDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_EventDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_EventDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -52,18 +52,18 @@ TAO_EventDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_A CORBA::Boolean TAO_EventDef_i::is_a (const char *event_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); return this->is_a_i (event_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Boolean TAO_EventDef_i::is_a_i (const char * /* event_id */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -71,16 +71,16 @@ TAO_EventDef_i::is_a_i (const char * /* event_id */ } CORBA_ValueDef_ptr -TAO_EventDef_i::event (TAO_ENV_SINGLE_ARG_DECL) +TAO_EventDef_i::event (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA_ValueDef::_nil ()); - return this->event_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->event_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_ValueDef_ptr -TAO_EventDef_i::event_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_EventDef_i::event_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO diff --git a/TAO/orbsvcs/IFR_Service/EventDef_i.h b/TAO/orbsvcs/IFR_Service/EventDef_i.h index e86186fc725..67b0fe1884f 100644 --- a/TAO/orbsvcs/IFR_Service/EventDef_i.h +++ b/TAO/orbsvcs/IFR_Service/EventDef_i.h @@ -51,47 +51,47 @@ public: // Destructor virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA::Boolean is_a ( const char *event_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Boolean is_a_i ( const char *event_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_ValueDef_ptr event ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_ValueDef_ptr event_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/ExceptionDef_i.cpp b/TAO/orbsvcs/IFR_Service/ExceptionDef_i.cpp index 3bffdcc71d6..6dc98d5c663 100644 --- a/TAO/orbsvcs/IFR_Service/ExceptionDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/ExceptionDef_i.cpp @@ -24,45 +24,45 @@ TAO_ExceptionDef_i::~TAO_ExceptionDef_i (void) } CORBA::DefinitionKind -TAO_ExceptionDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ExceptionDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Exception; } void -TAO_ExceptionDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_ExceptionDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_ExceptionDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_ExceptionDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Destroy our members. - TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Destroy ourself. - TAO_Contained_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Contained_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } CORBA_Contained::Description * -TAO_ExceptionDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) +TAO_ExceptionDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_ExceptionDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_ExceptionDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA_Contained::Description *desc_ptr = 0; @@ -73,15 +73,15 @@ TAO_ExceptionDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) CORBA_Contained::Description_var retval = desc_ptr; - retval->kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA_ExceptionDescription ed; - ed.name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER); + ed.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - ed.id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER); + ed.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_TString container_id; @@ -92,10 +92,10 @@ TAO_ExceptionDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) ed.defined_in = container_id.c_str (); - ed.version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER); + ed.version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - ed.type = this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + ed.type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); retval->value <<= ed; @@ -104,16 +104,16 @@ TAO_ExceptionDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) } CORBA::TypeCode_ptr -TAO_ExceptionDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_ExceptionDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_ExceptionDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_ExceptionDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString id; @@ -126,26 +126,26 @@ TAO_ExceptionDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) "name", name); - CORBA_StructMemberSeq_var members = this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_StructMemberSeq_var members = this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); return this->repo_->tc_factory ()->create_exception_tc (id.c_str (), name.c_str (), members.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_StructMemberSeq * -TAO_ExceptionDef_i::members (TAO_ENV_SINGLE_ARG_DECL) +TAO_ExceptionDef_i::members (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_StructMemberSeq * -TAO_ExceptionDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_ExceptionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Unbounded_Queue kind_queue; @@ -240,11 +240,11 @@ TAO_ExceptionDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL) obj = this->repo_->servant_factory ()->create_objref (kind, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); retval[k].type_def = CORBA_IDLType::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); this->repo_->config ()->expand_path (this->repo_->root_key (), @@ -254,12 +254,12 @@ TAO_ExceptionDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL) impl = this->repo_->servant_factory ()->create_idltype (member_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); auto_ptr safety (impl); - retval[k].type = impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + retval[k].type = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -268,22 +268,22 @@ TAO_ExceptionDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL) void TAO_ExceptionDef_i::members (const CORBA_StructMemberSeq &members - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->members_i (members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ExceptionDef_i::members_i (const CORBA_StructMemberSeq &members - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Destroy our old members, both refs and defns. - TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::ULong count = members.length (); @@ -317,7 +317,7 @@ TAO_ExceptionDef_i::members_i (const CORBA_StructMemberSeq &members PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var path = diff --git a/TAO/orbsvcs/IFR_Service/ExceptionDef_i.h b/TAO/orbsvcs/IFR_Service/ExceptionDef_i.h index 0a1d55cad82..d2f882f1a8a 100644 --- a/TAO/orbsvcs/IFR_Service/ExceptionDef_i.h +++ b/TAO/orbsvcs/IFR_Service/ExceptionDef_i.h @@ -52,64 +52,64 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_StructMemberSeq *members ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_StructMemberSeq *members_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void members ( const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void members_i ( const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/FactoryDef_i.cpp b/TAO/orbsvcs/IFR_Service/FactoryDef_i.cpp index 597ad4f0235..aa04971500c 100644 --- a/TAO/orbsvcs/IFR_Service/FactoryDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/FactoryDef_i.cpp @@ -21,39 +21,39 @@ TAO_FactoryDef_i::~TAO_FactoryDef_i (void) } CORBA::DefinitionKind -TAO_FactoryDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_FactoryDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Factory; } -void -TAO_FactoryDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +void +TAO_FactoryDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -void -TAO_FactoryDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +void +TAO_FactoryDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA_Contained::Description * -TAO_FactoryDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) +TAO_FactoryDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_FactoryDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ ) +TAO_FactoryDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO diff --git a/TAO/orbsvcs/IFR_Service/FactoryDef_i.h b/TAO/orbsvcs/IFR_Service/FactoryDef_i.h index 09718358b0c..6e5efac51a8 100644 --- a/TAO/orbsvcs/IFR_Service/FactoryDef_i.h +++ b/TAO/orbsvcs/IFR_Service/FactoryDef_i.h @@ -50,30 +50,30 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. diff --git a/TAO/orbsvcs/IFR_Service/FinderDef_i.cpp b/TAO/orbsvcs/IFR_Service/FinderDef_i.cpp index a8a16e4178b..833621ce7e1 100644 --- a/TAO/orbsvcs/IFR_Service/FinderDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/FinderDef_i.cpp @@ -19,39 +19,39 @@ TAO_FinderDef_i::~TAO_FinderDef_i (void) } CORBA::DefinitionKind -TAO_FinderDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_FinderDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Finder; } -void -TAO_FinderDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +void +TAO_FinderDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -void -TAO_FinderDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +void +TAO_FinderDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA_Contained::Description * -TAO_FinderDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) +TAO_FinderDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_FinderDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ ) +TAO_FinderDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO diff --git a/TAO/orbsvcs/IFR_Service/FinderDef_i.h b/TAO/orbsvcs/IFR_Service/FinderDef_i.h index ea9d60edcfa..a8cd01fe2c4 100644 --- a/TAO/orbsvcs/IFR_Service/FinderDef_i.h +++ b/TAO/orbsvcs/IFR_Service/FinderDef_i.h @@ -50,30 +50,30 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. diff --git a/TAO/orbsvcs/IFR_Service/FixedDef_i.cpp b/TAO/orbsvcs/IFR_Service/FixedDef_i.cpp index 42ccaf54ec2..fcf7f2e05f0 100644 --- a/TAO/orbsvcs/IFR_Service/FixedDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/FixedDef_i.cpp @@ -18,39 +18,39 @@ TAO_FixedDef_i::~TAO_FixedDef_i (void) } CORBA::DefinitionKind -TAO_FixedDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_FixedDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Fixed; } void -TAO_FixedDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_FixedDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_FixedDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_FixedDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA::TypeCode_ptr -TAO_FixedDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_FixedDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_FixedDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_FixedDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -58,16 +58,16 @@ TAO_FixedDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_P } CORBA::UShort -TAO_FixedDef_i::digits (TAO_ENV_SINGLE_ARG_DECL) +TAO_FixedDef_i::digits (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->digits_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->digits_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::UShort -TAO_FixedDef_i::digits_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_FixedDef_i::digits_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -76,34 +76,34 @@ TAO_FixedDef_i::digits_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG void TAO_FixedDef_i::digits (CORBA::UShort digits - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->digits_i (digits - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_FixedDef_i::digits_i (CORBA::UShort /* digits */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA::Short -TAO_FixedDef_i::scale (TAO_ENV_SINGLE_ARG_DECL) +TAO_FixedDef_i::scale (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->scale_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->scale_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::Short -TAO_FixedDef_i::scale_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_FixedDef_i::scale_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -112,18 +112,18 @@ TAO_FixedDef_i::scale_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_ void TAO_FixedDef_i::scale (CORBA::Short scale - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->scale_i (scale - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_FixedDef_i::scale_i (CORBA::Short /* scale */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO diff --git a/TAO/orbsvcs/IFR_Service/FixedDef_i.h b/TAO/orbsvcs/IFR_Service/FixedDef_i.h index 6ea79f0cc0b..7c264dc2f5f 100644 --- a/TAO/orbsvcs/IFR_Service/FixedDef_i.h +++ b/TAO/orbsvcs/IFR_Service/FixedDef_i.h @@ -50,75 +50,75 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA::UShort digits ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::UShort digits_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void digits ( CORBA::UShort digits - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void digits_i ( CORBA::UShort digits - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Short scale ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Short scale_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void scale ( CORBA::Short scale - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void scale_i ( CORBA::Short scale - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/HomeDef_i.cpp b/TAO/orbsvcs/IFR_Service/HomeDef_i.cpp index 77617ed7ab9..966b10f2168 100644 --- a/TAO/orbsvcs/IFR_Service/HomeDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/HomeDef_i.cpp @@ -21,39 +21,39 @@ TAO_HomeDef_i::~TAO_HomeDef_i (void) } CORBA::DefinitionKind -TAO_HomeDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_HomeDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Home; } void -TAO_HomeDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_HomeDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_HomeDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_HomeDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA_Contained::Description * -TAO_HomeDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) +TAO_HomeDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_HomeDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_HomeDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -61,16 +61,16 @@ TAO_HomeDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_AR } CORBA::TypeCode_ptr -TAO_HomeDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_HomeDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_HomeDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_HomeDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -78,16 +78,16 @@ TAO_HomeDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PA } IR::HomeDef_ptr -TAO_HomeDef_i::base_home (TAO_ENV_SINGLE_ARG_DECL) +TAO_HomeDef_i::base_home (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (IR::HomeDef::_nil ()); - return this->base_home_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->base_home_i (ACE_ENV_SINGLE_ARG_PARAMETER); } IR::HomeDef_ptr -TAO_HomeDef_i::base_home_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_HomeDef_i::base_home_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -95,16 +95,16 @@ TAO_HomeDef_i::base_home_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_A } IR::ComponentDef_ptr -TAO_HomeDef_i::managed_component (TAO_ENV_SINGLE_ARG_DECL) +TAO_HomeDef_i::managed_component (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (IR::ComponentDef::_nil ()); - return this->managed_component_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->managed_component_i (ACE_ENV_SINGLE_ARG_PARAMETER); } IR::ComponentDef_ptr -TAO_HomeDef_i::managed_component_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_HomeDef_i::managed_component_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -112,16 +112,16 @@ TAO_HomeDef_i::managed_component_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_ } IR::PrimaryKeyDef_ptr -TAO_HomeDef_i::primary_key (TAO_ENV_SINGLE_ARG_DECL) +TAO_HomeDef_i::primary_key (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (IR::PrimaryKeyDef::_nil ()); - return this->primary_key_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->primary_key_i (ACE_ENV_SINGLE_ARG_PARAMETER); } IR::PrimaryKeyDef_ptr -TAO_HomeDef_i::primary_key_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_HomeDef_i::primary_key_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -129,16 +129,16 @@ TAO_HomeDef_i::primary_key_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE } IR::FactoryDefSeq * -TAO_HomeDef_i::factories (TAO_ENV_SINGLE_ARG_DECL) +TAO_HomeDef_i::factories (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->factories_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->factories_i (ACE_ENV_SINGLE_ARG_PARAMETER); } IR::FactoryDefSeq * -TAO_HomeDef_i::factories_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_HomeDef_i::factories_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -146,16 +146,16 @@ TAO_HomeDef_i::factories_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_A } IR::FinderDefSeq * -TAO_HomeDef_i::finders (TAO_ENV_SINGLE_ARG_DECL) +TAO_HomeDef_i::finders (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->finders_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->finders_i (ACE_ENV_SINGLE_ARG_PARAMETER); } IR::FinderDefSeq * -TAO_HomeDef_i::finders_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_HomeDef_i::finders_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -163,16 +163,16 @@ TAO_HomeDef_i::finders_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG } CORBA::Boolean -TAO_HomeDef_i::is_basic (TAO_ENV_SINGLE_ARG_DECL) +TAO_HomeDef_i::is_basic (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->is_basic_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->is_basic_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::Boolean -TAO_HomeDef_i::is_basic_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_HomeDef_i::is_basic_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -184,7 +184,7 @@ TAO_HomeDef_i::create_primary_key (const char *id, const char *name, const char *version, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (IR::PrimaryKeyDef::_nil ()); @@ -193,7 +193,7 @@ TAO_HomeDef_i::create_primary_key (const char *id, name, version, primary_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } IR::PrimaryKeyDef_ptr @@ -201,7 +201,7 @@ TAO_HomeDef_i::create_primary_key_i (const char * /* id */, const char * /* name */, const char * /* version */, CORBA_ValueDef_ptr /* primary_key */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -214,7 +214,7 @@ TAO_HomeDef_i::create_factory (const char *id, const char *version, const CORBA_ParDescriptionSeq ¶ms, const CORBA_ExceptionDefSeq &exceptions - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (IR::FactoryDef::_nil ()); @@ -224,7 +224,7 @@ TAO_HomeDef_i::create_factory (const char *id, version, params, exceptions - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } IR::FactoryDef_ptr @@ -234,7 +234,7 @@ TAO_HomeDef_i::create_factory_i ( const char * /* version */, const CORBA_ParDescriptionSeq & /* params */, const CORBA_ExceptionDefSeq & /* exceptions */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -248,7 +248,7 @@ TAO_HomeDef_i::create_finder (const char *id, const char *version, const CORBA_ParDescriptionSeq ¶ms, const CORBA_ExceptionDefSeq &exceptions - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (IR::FinderDef::_nil ()); @@ -258,7 +258,7 @@ TAO_HomeDef_i::create_finder (const char *id, version, params, exceptions - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } IR::FinderDef_ptr @@ -268,7 +268,7 @@ TAO_HomeDef_i::create_finder_i ( const char * /* version */, const CORBA_ParDescriptionSeq & /* params */, const CORBA_ExceptionDefSeq & /* exceptions */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/orbsvcs/IFR_Service/HomeDef_i.h b/TAO/orbsvcs/IFR_Service/HomeDef_i.h index 473bf92c399..d204facf67e 100644 --- a/TAO/orbsvcs/IFR_Service/HomeDef_i.h +++ b/TAO/orbsvcs/IFR_Service/HomeDef_i.h @@ -52,103 +52,103 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual IR::HomeDef_ptr base_home ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); IR::HomeDef_ptr base_home_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual IR::ComponentDef_ptr managed_component ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); IR::ComponentDef_ptr managed_component_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual IR::PrimaryKeyDef_ptr primary_key ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); IR::PrimaryKeyDef_ptr primary_key_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual IR::FactoryDefSeq *factories ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); IR::FactoryDefSeq *factories_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual IR::FinderDefSeq *finders ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); IR::FinderDefSeq *finders_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean is_basic ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Boolean is_basic_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -157,7 +157,7 @@ public: const char *name, const char *version, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -166,7 +166,7 @@ public: const char *name, const char *version, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -176,7 +176,7 @@ public: const char *version, const CORBA_ParDescriptionSeq ¶ms, const CORBA_ExceptionDefSeq &exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -186,7 +186,7 @@ public: const char *version, const CORBA_ParDescriptionSeq ¶ms, const CORBA_ExceptionDefSeq &exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -196,7 +196,7 @@ public: const char *version, const CORBA_ParDescriptionSeq ¶ms, const CORBA_ExceptionDefSeq &exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -206,7 +206,7 @@ public: const char *version, const CORBA_ParDescriptionSeq ¶ms, const CORBA_ExceptionDefSeq &exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/IDLType_i.h b/TAO/orbsvcs/IFR_Service/IDLType_i.h index 3090d1cf163..faac04d8072 100644 --- a/TAO/orbsvcs/IFR_Service/IDLType_i.h +++ b/TAO/orbsvcs/IFR_Service/IDLType_i.h @@ -54,13 +54,13 @@ public: // Destructor. virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; // Defined in concrete classes. virtual CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; // Defined in concrete classes. diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp b/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp index 571fa45f9c4..c45f8003fce 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp +++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp @@ -163,31 +163,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_IRObject *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::DefinitionKind result); @@ -205,44 +205,44 @@ TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::TAO_ServerRequestInfo_CORBA_I TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_IRObject *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -254,7 +254,7 @@ TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::result (TAO_ENV_SINGLE_ARG_DE char * TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -264,10 +264,10 @@ TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -284,31 +284,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_IRObject *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -325,44 +325,44 @@ TAO_ServerRequestInfo_CORBA_IRObject_destroy::TAO_ServerRequestInfo_CORBA_IRObje TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_IRObject *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_IRObject_destroy::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_IRObject_destroy::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_IRObject_destroy::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_IRObject_destroy::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_IRObject_destroy::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_IRObject_destroy::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -370,7 +370,7 @@ TAO_ServerRequestInfo_CORBA_IRObject_destroy::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_CORBA_IRObject_destroy::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -380,10 +380,10 @@ TAO_ServerRequestInfo_CORBA_IRObject_destroy::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_IRObject_destroy::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -416,17 +416,17 @@ _TAO_CORBA_IRObject_Strategized_Proxy_Broker::~_TAO_CORBA_IRObject_Strategized_P _TAO_CORBA_IRObject_Proxy_Impl& _TAO_CORBA_IRObject_Strategized_Proxy_Broker::select_proxy ( ::CORBA_IRObject *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -436,7 +436,7 @@ _TAO_CORBA_IRObject_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_IRObject_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -506,7 +506,7 @@ _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::_TAO_CORBA_IRObject_ThruPOA_Proxy_Impl ( CORBA::DefinitionKind _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::def_kind ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -522,7 +522,7 @@ CORBA::DefinitionKind _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::def_kind ( _collocated_tao_target_->_object_key (), "def_kind", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -531,13 +531,13 @@ CORBA::DefinitionKind _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::def_kind ( "IDL:omg.org/CORBA/IRObject:1.0" ) )->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::destroy ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -551,7 +551,7 @@ void _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::destroy ( _collocated_tao_target_->_object_key (), "destroy", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -560,7 +560,7 @@ void _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::destroy ( "IDL:omg.org/CORBA/IRObject:1.0" ) )->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); return; } @@ -589,7 +589,7 @@ void POA_CORBA_IRObject::_get_def_kind_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject *_tao_impl = @@ -610,18 +610,18 @@ void POA_CORBA_IRObject::_get_def_kind_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -629,7 +629,7 @@ void POA_CORBA_IRObject::_get_def_kind_skel ( CORBA::DefinitionKind _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -637,12 +637,12 @@ void POA_CORBA_IRObject::_get_def_kind_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -670,7 +670,7 @@ void POA_CORBA_IRObject::destroy_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject *_tao_impl = @@ -691,24 +691,24 @@ void POA_CORBA_IRObject::destroy_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -716,12 +716,12 @@ void POA_CORBA_IRObject::destroy_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -742,7 +742,7 @@ void POA_CORBA_IRObject::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -752,7 +752,7 @@ void POA_CORBA_IRObject::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -765,11 +765,11 @@ void POA_CORBA_IRObject::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject *_tao_impl = (POA_CORBA_IRObject *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -782,7 +782,7 @@ void POA_CORBA_IRObject::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject *_tao_impl = (POA_CORBA_IRObject *) _tao_object_reference; @@ -801,7 +801,7 @@ void POA_CORBA_IRObject::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -828,10 +828,10 @@ void POA_CORBA_IRObject::_interface_skel ( CORBA::Boolean POA_CORBA_IRObject::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -853,12 +853,12 @@ void* POA_CORBA_IRObject::_downcast ( return 0; } -void POA_CORBA_IRObject::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_IRObject::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -868,9 +868,9 @@ const char* POA_CORBA_IRObject::_interface_repository_id (void) const } CORBA_IRObject* -POA_CORBA_IRObject::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_IRObject::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -1036,31 +1036,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (char * result); @@ -1078,44 +1078,44 @@ TAO_ServerRequestInfo_CORBA_Contained_id_get::TAO_ServerRequestInfo_CORBA_Contai TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Contained *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Contained_id_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_id_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Contained_id_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_id_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Contained_id_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_id_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -1127,7 +1127,7 @@ TAO_ServerRequestInfo_CORBA_Contained_id_get::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_CORBA_Contained_id_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1137,10 +1137,10 @@ TAO_ServerRequestInfo_CORBA_Contained_id_get::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_Contained_id_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -1158,31 +1158,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl , const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -1201,7 +1201,7 @@ TAO_ServerRequestInfo_CORBA_Contained_id_set::TAO_ServerRequestInfo_CORBA_Contai TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Contained *tao_impl, const char * id - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -1209,12 +1209,12 @@ TAO_ServerRequestInfo_CORBA_Contained_id_set::TAO_ServerRequestInfo_CORBA_Contai {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Contained_id_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_id_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -1230,25 +1230,25 @@ TAO_ServerRequestInfo_CORBA_Contained_id_set::arguments (TAO_ENV_SINGLE_ARG_DECL } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Contained_id_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_id_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Contained_id_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_id_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -1256,7 +1256,7 @@ TAO_ServerRequestInfo_CORBA_Contained_id_set::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_CORBA_Contained_id_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1266,10 +1266,10 @@ TAO_ServerRequestInfo_CORBA_Contained_id_set::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_Contained_id_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_Contained_name_get : public TAO_ServerRequestInfo @@ -1279,31 +1279,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (char * result); @@ -1321,44 +1321,44 @@ TAO_ServerRequestInfo_CORBA_Contained_name_get::TAO_ServerRequestInfo_CORBA_Cont TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Contained *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Contained_name_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_name_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Contained_name_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_name_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Contained_name_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_name_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -1370,7 +1370,7 @@ TAO_ServerRequestInfo_CORBA_Contained_name_get::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_CORBA_Contained_name_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1380,10 +1380,10 @@ TAO_ServerRequestInfo_CORBA_Contained_name_get::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_Contained_name_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -1401,31 +1401,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl , const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -1444,7 +1444,7 @@ TAO_ServerRequestInfo_CORBA_Contained_name_set::TAO_ServerRequestInfo_CORBA_Cont TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Contained *tao_impl, const char * name - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -1452,12 +1452,12 @@ TAO_ServerRequestInfo_CORBA_Contained_name_set::TAO_ServerRequestInfo_CORBA_Cont {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Contained_name_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_name_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -1473,25 +1473,25 @@ TAO_ServerRequestInfo_CORBA_Contained_name_set::arguments (TAO_ENV_SINGLE_ARG_DE } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Contained_name_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_name_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Contained_name_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_name_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -1499,7 +1499,7 @@ TAO_ServerRequestInfo_CORBA_Contained_name_set::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_CORBA_Contained_name_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1509,10 +1509,10 @@ TAO_ServerRequestInfo_CORBA_Contained_name_set::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_Contained_name_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_Contained_version_get : public TAO_ServerRequestInfo @@ -1522,31 +1522,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (char * result); @@ -1564,44 +1564,44 @@ TAO_ServerRequestInfo_CORBA_Contained_version_get::TAO_ServerRequestInfo_CORBA_C TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Contained *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Contained_version_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_version_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Contained_version_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_version_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Contained_version_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_version_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -1613,7 +1613,7 @@ TAO_ServerRequestInfo_CORBA_Contained_version_get::result (TAO_ENV_SINGLE_ARG_DE char * TAO_ServerRequestInfo_CORBA_Contained_version_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1623,10 +1623,10 @@ TAO_ServerRequestInfo_CORBA_Contained_version_get::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_Contained_version_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -1644,31 +1644,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl , const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -1687,7 +1687,7 @@ TAO_ServerRequestInfo_CORBA_Contained_version_set::TAO_ServerRequestInfo_CORBA_C TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Contained *tao_impl, const char * version - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -1695,12 +1695,12 @@ TAO_ServerRequestInfo_CORBA_Contained_version_set::TAO_ServerRequestInfo_CORBA_C {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Contained_version_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_version_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -1716,25 +1716,25 @@ TAO_ServerRequestInfo_CORBA_Contained_version_set::arguments (TAO_ENV_SINGLE_ARG } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Contained_version_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_version_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Contained_version_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_version_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -1742,7 +1742,7 @@ TAO_ServerRequestInfo_CORBA_Contained_version_set::result (TAO_ENV_SINGLE_ARG_DE char * TAO_ServerRequestInfo_CORBA_Contained_version_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1752,10 +1752,10 @@ TAO_ServerRequestInfo_CORBA_Contained_version_set::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_Contained_version_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_Contained_defined_in_get : public TAO_ServerRequestInfo @@ -1765,31 +1765,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_Container_ptr result); @@ -1807,44 +1807,44 @@ TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::TAO_ServerRequestInfo_CORB TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Contained *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -1856,7 +1856,7 @@ TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::result (TAO_ENV_SINGLE_ARG char * TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1866,10 +1866,10 @@ TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::target_most_derived_interf CORBA::Boolean TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -1886,31 +1886,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (char * result); @@ -1928,44 +1928,44 @@ TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::TAO_ServerRequestInfo_C TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Contained *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -1977,7 +1977,7 @@ TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::result (TAO_ENV_SINGLE_ char * TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1987,10 +1987,10 @@ TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::target_most_derived_int CORBA::Boolean TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -2007,31 +2007,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_Repository_ptr result); @@ -2049,44 +2049,44 @@ TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::TAO_ServerReque TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Contained *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -2098,7 +2098,7 @@ TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::result (TAO_ENV char * TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -2108,10 +2108,10 @@ TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::target_most_der CORBA::Boolean TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -2128,31 +2128,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_Contained::Description * result); @@ -2170,44 +2170,44 @@ TAO_ServerRequestInfo_CORBA_Contained_describe::TAO_ServerRequestInfo_CORBA_Cont TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Contained *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Contained_describe::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_describe::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Contained_describe::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_describe::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Contained_describe::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_describe::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -2219,7 +2219,7 @@ TAO_ServerRequestInfo_CORBA_Contained_describe::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_CORBA_Contained_describe::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -2229,10 +2229,10 @@ TAO_ServerRequestInfo_CORBA_Contained_describe::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_Contained_describe::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -2252,31 +2252,31 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -2299,7 +2299,7 @@ TAO_ServerRequestInfo_CORBA_Contained_move::TAO_ServerRequestInfo_CORBA_Containe CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -2309,12 +2309,12 @@ TAO_ServerRequestInfo_CORBA_Contained_move::TAO_ServerRequestInfo_CORBA_Containe {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Contained_move::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_move::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -2336,25 +2336,25 @@ TAO_ServerRequestInfo_CORBA_Contained_move::arguments (TAO_ENV_SINGLE_ARG_DECL) } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Contained_move::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_move::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Contained_move::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_move::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -2362,7 +2362,7 @@ TAO_ServerRequestInfo_CORBA_Contained_move::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_CORBA_Contained_move::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -2372,10 +2372,10 @@ TAO_ServerRequestInfo_CORBA_Contained_move::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_Contained_move::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -2408,17 +2408,17 @@ _TAO_CORBA_Contained_Strategized_Proxy_Broker::~_TAO_CORBA_Contained_Strategized _TAO_CORBA_Contained_Proxy_Impl& _TAO_CORBA_Contained_Strategized_Proxy_Broker::select_proxy ( ::CORBA_Contained *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -2428,7 +2428,7 @@ _TAO_CORBA_Contained_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_Contained_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -2498,7 +2498,7 @@ _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2514,7 +2514,7 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id ( _collocated_tao_target_->_object_key (), "id", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -2523,14 +2523,14 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id ( "IDL:omg.org/CORBA/Contained:1.0" ) )->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id ( CORBA_Object *_collocated_tao_target_, const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2544,7 +2544,7 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id ( _collocated_tao_target_->_object_key (), "id", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -2554,14 +2554,14 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id ( ) )->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2577,7 +2577,7 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name ( _collocated_tao_target_->_object_key (), "name", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -2586,14 +2586,14 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name ( "IDL:omg.org/CORBA/Contained:1.0" ) )->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name ( CORBA_Object *_collocated_tao_target_, const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2607,7 +2607,7 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name ( _collocated_tao_target_->_object_key (), "name", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -2617,14 +2617,14 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name ( ) )->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2640,7 +2640,7 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version ( _collocated_tao_target_->_object_key (), "version", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -2649,14 +2649,14 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version ( "IDL:omg.org/CORBA/Contained:1.0" ) )->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version ( CORBA_Object *_collocated_tao_target_, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2670,7 +2670,7 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version ( _collocated_tao_target_->_object_key (), "version", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -2680,14 +2680,14 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version ( ) )->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } CORBA_Container_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::defined_in ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2703,7 +2703,7 @@ CORBA_Container_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::defined_in ( _collocated_tao_target_->_object_key (), "defined_in", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -2712,13 +2712,13 @@ CORBA_Container_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::defined_in ( "IDL:omg.org/CORBA/Contained:1.0" ) )->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::absolute_name ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2734,7 +2734,7 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::absolute_name ( _collocated_tao_target_->_object_key (), "absolute_name", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -2743,13 +2743,13 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::absolute_name ( "IDL:omg.org/CORBA/Contained:1.0" ) )->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } CORBA_Repository_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::containing_repository ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2765,7 +2765,7 @@ CORBA_Repository_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::containing_reposit _collocated_tao_target_->_object_key (), "containing_repository", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -2774,13 +2774,13 @@ CORBA_Repository_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::containing_reposit "IDL:omg.org/CORBA/Contained:1.0" ) )->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } CORBA_Contained::Description * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::describe ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2796,7 +2796,7 @@ CORBA_Contained::Description * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::describe _collocated_tao_target_->_object_key (), "describe", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -2805,7 +2805,7 @@ CORBA_Contained::Description * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::describe "IDL:omg.org/CORBA/Contained:1.0" ) )->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -2814,7 +2814,7 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2828,7 +2828,7 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::move ( _collocated_tao_target_->_object_key (), "move", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -2840,7 +2840,7 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -2870,7 +2870,7 @@ void POA_CORBA_Contained::_get_id_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained *_tao_impl = @@ -2891,18 +2891,18 @@ void POA_CORBA_Contained::_get_id_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -2911,7 +2911,7 @@ void POA_CORBA_Contained::_get_id_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2919,12 +2919,12 @@ void POA_CORBA_Contained::_get_id_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -2952,7 +2952,7 @@ void POA_CORBA_Contained::_set_id_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -2981,25 +2981,25 @@ void POA_CORBA_Contained::_set_id_skel ( _tao_upcall, _tao_impl, id.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->id ( id.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3007,12 +3007,12 @@ void POA_CORBA_Contained::_set_id_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3033,7 +3033,7 @@ void POA_CORBA_Contained::_get_name_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained *_tao_impl = @@ -3054,18 +3054,18 @@ void POA_CORBA_Contained::_get_name_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -3074,7 +3074,7 @@ void POA_CORBA_Contained::_get_name_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3082,12 +3082,12 @@ void POA_CORBA_Contained::_get_name_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3115,7 +3115,7 @@ void POA_CORBA_Contained::_set_name_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -3144,25 +3144,25 @@ void POA_CORBA_Contained::_set_name_skel ( _tao_upcall, _tao_impl, name.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->name ( name.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3170,12 +3170,12 @@ void POA_CORBA_Contained::_set_name_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3196,7 +3196,7 @@ void POA_CORBA_Contained::_get_version_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained *_tao_impl = @@ -3217,18 +3217,18 @@ void POA_CORBA_Contained::_get_version_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -3237,7 +3237,7 @@ void POA_CORBA_Contained::_get_version_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3245,12 +3245,12 @@ void POA_CORBA_Contained::_get_version_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3278,7 +3278,7 @@ void POA_CORBA_Contained::_set_version_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -3307,25 +3307,25 @@ void POA_CORBA_Contained::_set_version_skel ( _tao_upcall, _tao_impl, version.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->version ( version.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3333,12 +3333,12 @@ void POA_CORBA_Contained::_set_version_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3359,7 +3359,7 @@ void POA_CORBA_Contained::_get_defined_in_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained *_tao_impl = @@ -3380,18 +3380,18 @@ void POA_CORBA_Contained::_get_defined_in_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -3400,7 +3400,7 @@ void POA_CORBA_Contained::_get_defined_in_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3408,12 +3408,12 @@ void POA_CORBA_Contained::_get_defined_in_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3441,7 +3441,7 @@ void POA_CORBA_Contained::_get_absolute_name_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained *_tao_impl = @@ -3462,18 +3462,18 @@ void POA_CORBA_Contained::_get_absolute_name_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -3482,7 +3482,7 @@ void POA_CORBA_Contained::_get_absolute_name_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3490,12 +3490,12 @@ void POA_CORBA_Contained::_get_absolute_name_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3523,7 +3523,7 @@ void POA_CORBA_Contained::_get_containing_repository_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained *_tao_impl = @@ -3544,18 +3544,18 @@ void POA_CORBA_Contained::_get_containing_repository_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -3564,7 +3564,7 @@ void POA_CORBA_Contained::_get_containing_repository_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3572,12 +3572,12 @@ void POA_CORBA_Contained::_get_containing_repository_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3605,7 +3605,7 @@ void POA_CORBA_Contained::describe_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained *_tao_impl = @@ -3626,18 +3626,18 @@ void POA_CORBA_Contained::describe_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -3646,7 +3646,7 @@ void POA_CORBA_Contained::describe_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3654,12 +3654,12 @@ void POA_CORBA_Contained::describe_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3687,7 +3687,7 @@ void POA_CORBA_Contained::move_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -3722,12 +3722,12 @@ void POA_CORBA_Contained::move_skel ( new_container.in (), new_name.in (), new_version.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -3736,13 +3736,13 @@ void POA_CORBA_Contained::move_skel ( new_container.in (), new_name.in (), new_version.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3750,12 +3750,12 @@ void POA_CORBA_Contained::move_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3776,7 +3776,7 @@ void POA_CORBA_Contained::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -3786,7 +3786,7 @@ void POA_CORBA_Contained::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -3799,11 +3799,11 @@ void POA_CORBA_Contained::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained *_tao_impl = (POA_CORBA_Contained *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -3816,7 +3816,7 @@ void POA_CORBA_Contained::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained *_tao_impl = (POA_CORBA_Contained *) _tao_object_reference; @@ -3835,7 +3835,7 @@ void POA_CORBA_Contained::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -3862,10 +3862,10 @@ void POA_CORBA_Contained::_interface_skel ( CORBA::Boolean POA_CORBA_Contained::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -3890,12 +3890,12 @@ void* POA_CORBA_Contained::_downcast ( return 0; } -void POA_CORBA_Contained::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_Contained::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -3905,9 +3905,9 @@ const char* POA_CORBA_Contained::_interface_repository_id (void) const } CORBA_Contained* -POA_CORBA_Contained::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_Contained::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -4080,31 +4080,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Container *tao_impl , const char * search_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_Contained_ptr result); @@ -4124,7 +4124,7 @@ TAO_ServerRequestInfo_CORBA_Container_lookup::TAO_ServerRequestInfo_CORBA_Contai TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Container *tao_impl, const char * search_name - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -4132,12 +4132,12 @@ TAO_ServerRequestInfo_CORBA_Container_lookup::TAO_ServerRequestInfo_CORBA_Contai {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_lookup::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_lookup::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -4153,25 +4153,25 @@ TAO_ServerRequestInfo_CORBA_Container_lookup::arguments (TAO_ENV_SINGLE_ARG_DECL } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_lookup::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_lookup::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Container_lookup::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_lookup::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -4183,7 +4183,7 @@ TAO_ServerRequestInfo_CORBA_Container_lookup::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_CORBA_Container_lookup::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -4193,10 +4193,10 @@ TAO_ServerRequestInfo_CORBA_Container_lookup::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_lookup::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -4215,31 +4215,31 @@ public: , CORBA::DefinitionKind & limit_type, const CORBA::Boolean & exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_ContainedSeq * result); @@ -4261,7 +4261,7 @@ TAO_ServerRequestInfo_CORBA_Container_contents::TAO_ServerRequestInfo_CORBA_Cont POA_CORBA_Container *tao_impl, CORBA::DefinitionKind & limit_type, const CORBA::Boolean & exclude_inherited - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -4270,12 +4270,12 @@ TAO_ServerRequestInfo_CORBA_Container_contents::TAO_ServerRequestInfo_CORBA_Cont {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_contents::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_contents::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -4294,25 +4294,25 @@ TAO_ServerRequestInfo_CORBA_Container_contents::arguments (TAO_ENV_SINGLE_ARG_DE } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_contents::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_contents::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Container_contents::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_contents::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -4324,7 +4324,7 @@ TAO_ServerRequestInfo_CORBA_Container_contents::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_CORBA_Container_contents::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -4334,10 +4334,10 @@ TAO_ServerRequestInfo_CORBA_Container_contents::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_contents::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -4358,31 +4358,31 @@ public: const CORBA::Long & levels_to_search, CORBA::DefinitionKind & limit_type, const CORBA::Boolean & exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_ContainedSeq * result); @@ -4408,7 +4408,7 @@ TAO_ServerRequestInfo_CORBA_Container_lookup_name::TAO_ServerRequestInfo_CORBA_C const CORBA::Long & levels_to_search, CORBA::DefinitionKind & limit_type, const CORBA::Boolean & exclude_inherited - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -4419,12 +4419,12 @@ TAO_ServerRequestInfo_CORBA_Container_lookup_name::TAO_ServerRequestInfo_CORBA_C {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_lookup_name::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_lookup_name::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -4449,25 +4449,25 @@ TAO_ServerRequestInfo_CORBA_Container_lookup_name::arguments (TAO_ENV_SINGLE_ARG } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_lookup_name::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_lookup_name::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Container_lookup_name::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_lookup_name::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -4479,7 +4479,7 @@ TAO_ServerRequestInfo_CORBA_Container_lookup_name::result (TAO_ENV_SINGLE_ARG_DE char * TAO_ServerRequestInfo_CORBA_Container_lookup_name::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -4489,10 +4489,10 @@ TAO_ServerRequestInfo_CORBA_Container_lookup_name::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_lookup_name::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -4512,31 +4512,31 @@ public: CORBA::DefinitionKind & limit_type, const CORBA::Boolean & exclude_inherited, const CORBA::Long & max_returned_objs - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_Container::DescriptionSeq * result); @@ -4560,7 +4560,7 @@ TAO_ServerRequestInfo_CORBA_Container_describe_contents::TAO_ServerRequestInfo_C CORBA::DefinitionKind & limit_type, const CORBA::Boolean & exclude_inherited, const CORBA::Long & max_returned_objs - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -4570,12 +4570,12 @@ TAO_ServerRequestInfo_CORBA_Container_describe_contents::TAO_ServerRequestInfo_C {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_describe_contents::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_describe_contents::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -4597,25 +4597,25 @@ TAO_ServerRequestInfo_CORBA_Container_describe_contents::arguments (TAO_ENV_SING } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_describe_contents::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_describe_contents::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Container_describe_contents::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_describe_contents::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -4627,7 +4627,7 @@ TAO_ServerRequestInfo_CORBA_Container_describe_contents::result (TAO_ENV_SINGLE_ char * TAO_ServerRequestInfo_CORBA_Container_describe_contents::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -4637,10 +4637,10 @@ TAO_ServerRequestInfo_CORBA_Container_describe_contents::target_most_derived_int CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_describe_contents::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -4660,31 +4660,31 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_ModuleDef_ptr result); @@ -4708,7 +4708,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_module::TAO_ServerRequestInfo_CORBA const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -4718,12 +4718,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_module::TAO_ServerRequestInfo_CORBA {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_create_module::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_module::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -4745,25 +4745,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_module::arguments (TAO_ENV_SINGLE_A } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_create_module::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_module::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Container_create_module::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_module::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -4775,7 +4775,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_module::result (TAO_ENV_SINGLE_ARG_ char * TAO_ServerRequestInfo_CORBA_Container_create_module::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -4785,10 +4785,10 @@ TAO_ServerRequestInfo_CORBA_Container_create_module::target_most_derived_interfa CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_create_module::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -4810,31 +4810,31 @@ public: const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_ConstantDef_ptr result); @@ -4862,7 +4862,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_constant::TAO_ServerRequestInfo_COR const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -4874,12 +4874,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_constant::TAO_ServerRequestInfo_COR {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_create_constant::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_constant::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -4907,25 +4907,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_constant::arguments (TAO_ENV_SINGLE } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_create_constant::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_constant::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Container_create_constant::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_constant::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -4937,7 +4937,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_constant::result (TAO_ENV_SINGLE_AR char * TAO_ServerRequestInfo_CORBA_Container_create_constant::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -4947,10 +4947,10 @@ TAO_ServerRequestInfo_CORBA_Container_create_constant::target_most_derived_inter CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_create_constant::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -4971,31 +4971,31 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_StructDef_ptr result); @@ -5021,7 +5021,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_struct::TAO_ServerRequestInfo_CORBA const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -5032,12 +5032,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_struct::TAO_ServerRequestInfo_CORBA {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_create_struct::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_struct::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -5062,25 +5062,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_struct::arguments (TAO_ENV_SINGLE_A } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_create_struct::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_struct::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Container_create_struct::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_struct::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5092,7 +5092,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_struct::result (TAO_ENV_SINGLE_ARG_ char * TAO_ServerRequestInfo_CORBA_Container_create_struct::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5102,10 +5102,10 @@ TAO_ServerRequestInfo_CORBA_Container_create_struct::target_most_derived_interfa CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_create_struct::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -5127,31 +5127,31 @@ public: const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_UnionDef_ptr result); @@ -5179,7 +5179,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_union::TAO_ServerRequestInfo_CORBA_ const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -5191,12 +5191,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_union::TAO_ServerRequestInfo_CORBA_ {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_create_union::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_union::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -5224,25 +5224,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_union::arguments (TAO_ENV_SINGLE_AR } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_create_union::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_union::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Container_create_union::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_union::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5254,7 +5254,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_union::result (TAO_ENV_SINGLE_ARG_D char * TAO_ServerRequestInfo_CORBA_Container_create_union::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5264,10 +5264,10 @@ TAO_ServerRequestInfo_CORBA_Container_create_union::target_most_derived_interfac CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_create_union::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -5288,31 +5288,31 @@ public: const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_EnumDef_ptr result); @@ -5338,7 +5338,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_enum::TAO_ServerRequestInfo_CORBA_C const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -5349,12 +5349,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_enum::TAO_ServerRequestInfo_CORBA_C {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_create_enum::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_enum::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -5379,25 +5379,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_enum::arguments (TAO_ENV_SINGLE_ARG } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_create_enum::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_enum::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Container_create_enum::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_enum::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5409,7 +5409,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_enum::result (TAO_ENV_SINGLE_ARG_DE char * TAO_ServerRequestInfo_CORBA_Container_create_enum::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5419,10 +5419,10 @@ TAO_ServerRequestInfo_CORBA_Container_create_enum::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_create_enum::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -5443,31 +5443,31 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_AliasDef_ptr result); @@ -5493,7 +5493,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_alias::TAO_ServerRequestInfo_CORBA_ const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -5504,12 +5504,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_alias::TAO_ServerRequestInfo_CORBA_ {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_create_alias::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_alias::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -5534,25 +5534,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_alias::arguments (TAO_ENV_SINGLE_AR } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_create_alias::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_alias::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Container_create_alias::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_alias::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5564,7 +5564,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_alias::result (TAO_ENV_SINGLE_ARG_D char * TAO_ServerRequestInfo_CORBA_Container_create_alias::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5574,10 +5574,10 @@ TAO_ServerRequestInfo_CORBA_Container_create_alias::target_most_derived_interfac CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_create_alias::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -5598,31 +5598,31 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_InterfaceDef_ptr result); @@ -5648,7 +5648,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_interface::TAO_ServerRequestInfo_CO const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -5659,12 +5659,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_interface::TAO_ServerRequestInfo_CO {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_create_interface::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_interface::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -5689,25 +5689,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_interface::arguments (TAO_ENV_SINGL } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_create_interface::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_interface::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Container_create_interface::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_interface::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5719,7 +5719,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_interface::result (TAO_ENV_SINGLE_A char * TAO_ServerRequestInfo_CORBA_Container_create_interface::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5729,10 +5729,10 @@ TAO_ServerRequestInfo_CORBA_Container_create_interface::target_most_derived_inte CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_create_interface::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -5759,31 +5759,31 @@ public: const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_ValueDef_ptr result); @@ -5821,7 +5821,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_value::TAO_ServerRequestInfo_CORBA_ const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -5838,12 +5838,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_value::TAO_ServerRequestInfo_CORBA_ {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_create_value::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_value::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -5886,25 +5886,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_value::arguments (TAO_ENV_SINGLE_AR } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_create_value::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_value::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Container_create_value::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_value::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5916,7 +5916,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_value::result (TAO_ENV_SINGLE_ARG_D char * TAO_ServerRequestInfo_CORBA_Container_create_value::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5926,10 +5926,10 @@ TAO_ServerRequestInfo_CORBA_Container_create_value::target_most_derived_interfac CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_create_value::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -5950,31 +5950,31 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_ValueBoxDef_ptr result); @@ -6000,7 +6000,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_value_box::TAO_ServerRequestInfo_CO const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -6011,12 +6011,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_value_box::TAO_ServerRequestInfo_CO {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_create_value_box::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_value_box::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -6041,25 +6041,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_value_box::arguments (TAO_ENV_SINGL } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_create_value_box::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_value_box::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Container_create_value_box::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_value_box::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6071,7 +6071,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_value_box::result (TAO_ENV_SINGLE_A char * TAO_ServerRequestInfo_CORBA_Container_create_value_box::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -6081,10 +6081,10 @@ TAO_ServerRequestInfo_CORBA_Container_create_value_box::target_most_derived_inte CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_create_value_box::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -6105,31 +6105,31 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_ExceptionDef_ptr result); @@ -6155,7 +6155,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_exception::TAO_ServerRequestInfo_CO const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -6166,12 +6166,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_exception::TAO_ServerRequestInfo_CO {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_create_exception::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_exception::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -6196,25 +6196,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_exception::arguments (TAO_ENV_SINGL } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_create_exception::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_exception::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Container_create_exception::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_exception::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6226,7 +6226,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_exception::result (TAO_ENV_SINGLE_A char * TAO_ServerRequestInfo_CORBA_Container_create_exception::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -6236,10 +6236,10 @@ TAO_ServerRequestInfo_CORBA_Container_create_exception::target_most_derived_inte CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_create_exception::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -6259,31 +6259,31 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_NativeDef_ptr result); @@ -6307,7 +6307,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_native::TAO_ServerRequestInfo_CORBA const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -6317,12 +6317,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_native::TAO_ServerRequestInfo_CORBA {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_create_native::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_native::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -6344,25 +6344,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_native::arguments (TAO_ENV_SINGLE_A } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_create_native::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_native::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Container_create_native::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_native::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6374,7 +6374,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_native::result (TAO_ENV_SINGLE_ARG_ char * TAO_ServerRequestInfo_CORBA_Container_create_native::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -6384,10 +6384,10 @@ TAO_ServerRequestInfo_CORBA_Container_create_native::target_most_derived_interfa CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_create_native::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -6408,31 +6408,31 @@ public: const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_AbstractInterfaceDef_ptr result); @@ -6458,7 +6458,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::TAO_ServerReque const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -6469,12 +6469,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::TAO_ServerReque {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -6499,25 +6499,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::arguments (TAO_ } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6529,7 +6529,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::result (TAO_ENV char * TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -6539,10 +6539,10 @@ TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::target_most_der CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -6563,31 +6563,31 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_LocalInterfaceDef_ptr result); @@ -6613,7 +6613,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_local_interface::TAO_ServerRequestI const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -6624,12 +6624,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_local_interface::TAO_ServerRequestI {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_create_local_interface::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_local_interface::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -6654,25 +6654,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_local_interface::arguments (TAO_ENV } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_create_local_interface::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_local_interface::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Container_create_local_interface::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_local_interface::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6684,7 +6684,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_local_interface::result (TAO_ENV_SI char * TAO_ServerRequestInfo_CORBA_Container_create_local_interface::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -6694,10 +6694,10 @@ TAO_ServerRequestInfo_CORBA_Container_create_local_interface::target_most_derive CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_create_local_interface::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -6737,17 +6737,17 @@ _TAO_CORBA_Container_Strategized_Proxy_Broker::~_TAO_CORBA_Container_Strategized _TAO_CORBA_Container_Proxy_Impl& _TAO_CORBA_Container_Strategized_Proxy_Broker::select_proxy ( ::CORBA_Container *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -6757,7 +6757,7 @@ _TAO_CORBA_Container_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_Container_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -6828,7 +6828,7 @@ _TAO_CORBA_Container_ThruPOA_Proxy_Impl::_TAO_CORBA_Container_ThruPOA_Proxy_Impl CORBA_Contained_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup ( CORBA_Object *_collocated_tao_target_, const char * search_name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6844,7 +6844,7 @@ CORBA_Contained_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup ( _collocated_tao_target_->_object_key (), "lookup", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -6854,7 +6854,7 @@ CORBA_Contained_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup ( ) )->lookup ( search_name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6862,7 +6862,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::contents ( CORBA_Object *_collocated_tao_target_, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6878,7 +6878,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::contents ( _collocated_tao_target_->_object_key (), "contents", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -6889,7 +6889,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::contents ( )->contents ( limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6899,7 +6899,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup_name ( CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6915,7 +6915,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup_name ( _collocated_tao_target_->_object_key (), "lookup_name", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -6928,7 +6928,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup_name ( levels_to_search, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6937,7 +6937,7 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::descr CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6953,7 +6953,7 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::descr _collocated_tao_target_->_object_key (), "describe_contents", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -6965,7 +6965,7 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::descr limit_type, exclude_inherited, max_returned_objs - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6974,7 +6974,7 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_module ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6990,7 +6990,7 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_module ( _collocated_tao_target_->_object_key (), "create_module", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7002,7 +7002,7 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_module ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7013,7 +7013,7 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_constant ( const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7029,7 +7029,7 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_constant ( _collocated_tao_target_->_object_key (), "create_constant", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7043,7 +7043,7 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_constant ( version, type, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7053,7 +7053,7 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_struct ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7069,7 +7069,7 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_struct ( _collocated_tao_target_->_object_key (), "create_struct", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7082,7 +7082,7 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_struct ( name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7093,7 +7093,7 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_union ( const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7109,7 +7109,7 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_union ( _collocated_tao_target_->_object_key (), "create_union", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7123,7 +7123,7 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_union ( version, discriminator_type, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7133,7 +7133,7 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_enum ( const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7149,7 +7149,7 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_enum ( _collocated_tao_target_->_object_key (), "create_enum", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7162,7 +7162,7 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_enum ( name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7172,7 +7172,7 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_alias ( const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7188,7 +7188,7 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_alias ( _collocated_tao_target_->_object_key (), "create_alias", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7201,7 +7201,7 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_alias ( name, version, original_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7211,7 +7211,7 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_interface const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7227,7 +7227,7 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_interface _collocated_tao_target_->_object_key (), "create_interface", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7240,7 +7240,7 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_interface name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7256,7 +7256,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value ( const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7272,7 +7272,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value ( _collocated_tao_target_->_object_key (), "create_value", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7291,7 +7291,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value ( abstract_base_values, supported_interfaces, initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7301,7 +7301,7 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value_box const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7317,7 +7317,7 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value_box _collocated_tao_target_->_object_key (), "create_value_box", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7330,7 +7330,7 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value_box name, version, original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7340,7 +7340,7 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_exception const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7356,7 +7356,7 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_exception _collocated_tao_target_->_object_key (), "create_exception", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7369,7 +7369,7 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_exception name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7378,7 +7378,7 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_native ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7394,7 +7394,7 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_native ( _collocated_tao_target_->_object_key (), "create_native", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7406,7 +7406,7 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_native ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7416,7 +7416,7 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_a const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7432,7 +7432,7 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_a _collocated_tao_target_->_object_key (), "create_abstract_interface", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7445,7 +7445,7 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_a name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7455,7 +7455,7 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_loca const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7471,7 +7471,7 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_loca _collocated_tao_target_->_object_key (), "create_local_interface", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7484,7 +7484,7 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_loca name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7513,7 +7513,7 @@ void POA_CORBA_Container::lookup_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -7542,19 +7542,19 @@ void POA_CORBA_Container::lookup_skel ( _tao_upcall, _tao_impl, search_name.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->lookup ( search_name.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7563,7 +7563,7 @@ void POA_CORBA_Container::lookup_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7571,12 +7571,12 @@ void POA_CORBA_Container::lookup_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7604,7 +7604,7 @@ void POA_CORBA_Container::contents_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -7636,12 +7636,12 @@ void POA_CORBA_Container::contents_skel ( _tao_impl, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -7649,7 +7649,7 @@ void POA_CORBA_Container::contents_skel ( _tao_impl->contents ( limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7658,7 +7658,7 @@ void POA_CORBA_Container::contents_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7666,12 +7666,12 @@ void POA_CORBA_Container::contents_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7699,7 +7699,7 @@ void POA_CORBA_Container::lookup_name_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -7737,12 +7737,12 @@ void POA_CORBA_Container::lookup_name_skel ( levels_to_search, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -7752,7 +7752,7 @@ void POA_CORBA_Container::lookup_name_skel ( levels_to_search, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7761,7 +7761,7 @@ void POA_CORBA_Container::lookup_name_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7769,12 +7769,12 @@ void POA_CORBA_Container::lookup_name_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7802,7 +7802,7 @@ void POA_CORBA_Container::describe_contents_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -7837,12 +7837,12 @@ void POA_CORBA_Container::describe_contents_skel ( limit_type, exclude_inherited, max_returned_objs - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -7851,7 +7851,7 @@ void POA_CORBA_Container::describe_contents_skel ( limit_type, exclude_inherited, max_returned_objs - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7860,7 +7860,7 @@ void POA_CORBA_Container::describe_contents_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7868,12 +7868,12 @@ void POA_CORBA_Container::describe_contents_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7901,7 +7901,7 @@ void POA_CORBA_Container::create_module_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -7936,12 +7936,12 @@ void POA_CORBA_Container::create_module_skel ( id.in (), name.in (), version.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -7950,7 +7950,7 @@ void POA_CORBA_Container::create_module_skel ( id.in (), name.in (), version.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7959,7 +7959,7 @@ void POA_CORBA_Container::create_module_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7967,12 +7967,12 @@ void POA_CORBA_Container::create_module_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8000,7 +8000,7 @@ void POA_CORBA_Container::create_constant_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8041,12 +8041,12 @@ void POA_CORBA_Container::create_constant_skel ( version.in (), type.in (), value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -8057,7 +8057,7 @@ void POA_CORBA_Container::create_constant_skel ( version.in (), type.in (), value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8066,7 +8066,7 @@ void POA_CORBA_Container::create_constant_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8074,12 +8074,12 @@ void POA_CORBA_Container::create_constant_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8107,7 +8107,7 @@ void POA_CORBA_Container::create_struct_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8145,12 +8145,12 @@ void POA_CORBA_Container::create_struct_skel ( name.in (), version.in (), members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -8160,7 +8160,7 @@ void POA_CORBA_Container::create_struct_skel ( name.in (), version.in (), members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8169,7 +8169,7 @@ void POA_CORBA_Container::create_struct_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8177,12 +8177,12 @@ void POA_CORBA_Container::create_struct_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8210,7 +8210,7 @@ void POA_CORBA_Container::create_union_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8251,12 +8251,12 @@ void POA_CORBA_Container::create_union_skel ( version.in (), discriminator_type.in (), members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -8267,7 +8267,7 @@ void POA_CORBA_Container::create_union_skel ( version.in (), discriminator_type.in (), members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8276,7 +8276,7 @@ void POA_CORBA_Container::create_union_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8284,12 +8284,12 @@ void POA_CORBA_Container::create_union_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8317,7 +8317,7 @@ void POA_CORBA_Container::create_enum_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8355,12 +8355,12 @@ void POA_CORBA_Container::create_enum_skel ( name.in (), version.in (), members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -8370,7 +8370,7 @@ void POA_CORBA_Container::create_enum_skel ( name.in (), version.in (), members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8379,7 +8379,7 @@ void POA_CORBA_Container::create_enum_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8387,12 +8387,12 @@ void POA_CORBA_Container::create_enum_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8420,7 +8420,7 @@ void POA_CORBA_Container::create_alias_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8458,12 +8458,12 @@ void POA_CORBA_Container::create_alias_skel ( name.in (), version.in (), original_type.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -8473,7 +8473,7 @@ void POA_CORBA_Container::create_alias_skel ( name.in (), version.in (), original_type.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8482,7 +8482,7 @@ void POA_CORBA_Container::create_alias_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8490,12 +8490,12 @@ void POA_CORBA_Container::create_alias_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8523,7 +8523,7 @@ void POA_CORBA_Container::create_interface_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8561,12 +8561,12 @@ void POA_CORBA_Container::create_interface_skel ( name.in (), version.in (), base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -8576,7 +8576,7 @@ void POA_CORBA_Container::create_interface_skel ( name.in (), version.in (), base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8585,7 +8585,7 @@ void POA_CORBA_Container::create_interface_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8593,12 +8593,12 @@ void POA_CORBA_Container::create_interface_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8626,7 +8626,7 @@ void POA_CORBA_Container::create_value_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8682,12 +8682,12 @@ void POA_CORBA_Container::create_value_skel ( abstract_base_values, supported_interfaces, initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -8703,7 +8703,7 @@ void POA_CORBA_Container::create_value_skel ( abstract_base_values, supported_interfaces, initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8712,7 +8712,7 @@ void POA_CORBA_Container::create_value_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8720,12 +8720,12 @@ void POA_CORBA_Container::create_value_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8753,7 +8753,7 @@ void POA_CORBA_Container::create_value_box_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8791,12 +8791,12 @@ void POA_CORBA_Container::create_value_box_skel ( name.in (), version.in (), original_type_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -8806,7 +8806,7 @@ void POA_CORBA_Container::create_value_box_skel ( name.in (), version.in (), original_type_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8815,7 +8815,7 @@ void POA_CORBA_Container::create_value_box_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8823,12 +8823,12 @@ void POA_CORBA_Container::create_value_box_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8856,7 +8856,7 @@ void POA_CORBA_Container::create_exception_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8894,12 +8894,12 @@ void POA_CORBA_Container::create_exception_skel ( name.in (), version.in (), members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -8909,7 +8909,7 @@ void POA_CORBA_Container::create_exception_skel ( name.in (), version.in (), members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8918,7 +8918,7 @@ void POA_CORBA_Container::create_exception_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8926,12 +8926,12 @@ void POA_CORBA_Container::create_exception_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8959,7 +8959,7 @@ void POA_CORBA_Container::create_native_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8994,12 +8994,12 @@ void POA_CORBA_Container::create_native_skel ( id.in (), name.in (), version.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -9008,7 +9008,7 @@ void POA_CORBA_Container::create_native_skel ( id.in (), name.in (), version.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -9017,7 +9017,7 @@ void POA_CORBA_Container::create_native_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -9025,12 +9025,12 @@ void POA_CORBA_Container::create_native_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -9058,7 +9058,7 @@ void POA_CORBA_Container::create_abstract_interface_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -9096,12 +9096,12 @@ void POA_CORBA_Container::create_abstract_interface_skel ( name.in (), version.in (), base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -9111,7 +9111,7 @@ void POA_CORBA_Container::create_abstract_interface_skel ( name.in (), version.in (), base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -9120,7 +9120,7 @@ void POA_CORBA_Container::create_abstract_interface_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -9128,12 +9128,12 @@ void POA_CORBA_Container::create_abstract_interface_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -9161,7 +9161,7 @@ void POA_CORBA_Container::create_local_interface_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -9199,12 +9199,12 @@ void POA_CORBA_Container::create_local_interface_skel ( name.in (), version.in (), base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -9214,7 +9214,7 @@ void POA_CORBA_Container::create_local_interface_skel ( name.in (), version.in (), base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -9223,7 +9223,7 @@ void POA_CORBA_Container::create_local_interface_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -9231,12 +9231,12 @@ void POA_CORBA_Container::create_local_interface_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -9264,7 +9264,7 @@ void POA_CORBA_Container::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -9274,7 +9274,7 @@ void POA_CORBA_Container::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -9287,11 +9287,11 @@ void POA_CORBA_Container::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container *_tao_impl = (POA_CORBA_Container *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -9304,7 +9304,7 @@ void POA_CORBA_Container::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container *_tao_impl = (POA_CORBA_Container *) _tao_object_reference; @@ -9323,7 +9323,7 @@ void POA_CORBA_Container::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -9350,10 +9350,10 @@ void POA_CORBA_Container::_interface_skel ( CORBA::Boolean POA_CORBA_Container::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -9378,12 +9378,12 @@ void* POA_CORBA_Container::_downcast ( return 0; } -void POA_CORBA_Container::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_Container::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -9393,9 +9393,9 @@ const char* POA_CORBA_Container::_interface_repository_id (void) const } CORBA_Container* -POA_CORBA_Container::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_Container::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -9531,31 +9531,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_IDLType *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::TypeCode_ptr result); @@ -9573,44 +9573,44 @@ TAO_ServerRequestInfo_CORBA_IDLType_type_get::TAO_ServerRequestInfo_CORBA_IDLTyp TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_IDLType *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_IDLType_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_IDLType_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_IDLType_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_IDLType_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_IDLType_type_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_IDLType_type_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -9622,7 +9622,7 @@ TAO_ServerRequestInfo_CORBA_IDLType_type_get::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_CORBA_IDLType_type_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -9632,10 +9632,10 @@ TAO_ServerRequestInfo_CORBA_IDLType_type_get::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_IDLType_type_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -9675,17 +9675,17 @@ _TAO_CORBA_IDLType_Strategized_Proxy_Broker::~_TAO_CORBA_IDLType_Strategized_Pro _TAO_CORBA_IDLType_Proxy_Impl& _TAO_CORBA_IDLType_Strategized_Proxy_Broker::select_proxy ( ::CORBA_IDLType *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -9695,7 +9695,7 @@ _TAO_CORBA_IDLType_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_IDLType_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -9765,7 +9765,7 @@ _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl (vo CORBA::TypeCode_ptr _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl::type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -9781,7 +9781,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl::type ( _collocated_tao_target_->_object_key (), "type", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -9790,7 +9790,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl::type ( "IDL:omg.org/CORBA/IDLType:1.0" ) )->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -9819,7 +9819,7 @@ void POA_CORBA_IDLType::_get_type_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType *_tao_impl = @@ -9840,18 +9840,18 @@ void POA_CORBA_IDLType::_get_type_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -9860,7 +9860,7 @@ void POA_CORBA_IDLType::_get_type_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -9868,12 +9868,12 @@ void POA_CORBA_IDLType::_get_type_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -9901,7 +9901,7 @@ void POA_CORBA_IDLType::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -9911,7 +9911,7 @@ void POA_CORBA_IDLType::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -9924,11 +9924,11 @@ void POA_CORBA_IDLType::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType *_tao_impl = (POA_CORBA_IDLType *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -9941,7 +9941,7 @@ void POA_CORBA_IDLType::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType *_tao_impl = (POA_CORBA_IDLType *) _tao_object_reference; @@ -9960,7 +9960,7 @@ void POA_CORBA_IDLType::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -9987,10 +9987,10 @@ void POA_CORBA_IDLType::_interface_skel ( CORBA::Boolean POA_CORBA_IDLType::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -10015,12 +10015,12 @@ void* POA_CORBA_IDLType::_downcast ( return 0; } -void POA_CORBA_IDLType::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_IDLType::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -10030,9 +10030,9 @@ const char* POA_CORBA_IDLType::_interface_repository_id (void) const } CORBA_IDLType* -POA_CORBA_IDLType::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_IDLType::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -10221,17 +10221,17 @@ _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker::~_TAO_CORBA_TypedefDef_Strategiz _TAO_CORBA_TypedefDef_Proxy_Impl& _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_TypedefDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -10241,7 +10241,7 @@ _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -10336,7 +10336,7 @@ void POA_CORBA_TypedefDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -10346,7 +10346,7 @@ void POA_CORBA_TypedefDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -10359,11 +10359,11 @@ void POA_CORBA_TypedefDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_TypedefDef *_tao_impl = (POA_CORBA_TypedefDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -10376,7 +10376,7 @@ void POA_CORBA_TypedefDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_TypedefDef *_tao_impl = (POA_CORBA_TypedefDef *) _tao_object_reference; @@ -10395,7 +10395,7 @@ void POA_CORBA_TypedefDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -10422,10 +10422,10 @@ void POA_CORBA_TypedefDef::_interface_skel ( CORBA::Boolean POA_CORBA_TypedefDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -10456,12 +10456,12 @@ void* POA_CORBA_TypedefDef::_downcast ( return 0; } -void POA_CORBA_TypedefDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_TypedefDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -10471,9 +10471,9 @@ const char* POA_CORBA_TypedefDef::_interface_repository_id (void) const } CORBA_TypedefDef* -POA_CORBA_TypedefDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_TypedefDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS.h b/TAO/orbsvcs/IFR_Service/IFR_BaseS.h index 245cba71f61..e1077f9c8d8 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_BaseS.h +++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS.h @@ -64,7 +64,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -75,37 +75,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_IRObject *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -115,11 +115,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -129,7 +129,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); @@ -149,7 +149,7 @@ public: virtual ::_TAO_CORBA_IRObject_Proxy_Impl &select_proxy ( ::CORBA_IRObject *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -158,7 +158,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -199,7 +199,7 @@ public: virtual CORBA::DefinitionKind def_kind ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -207,7 +207,7 @@ public: virtual void destroy ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -239,7 +239,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -250,37 +250,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_Contained *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -290,12 +290,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -305,11 +305,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -319,12 +319,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -334,11 +334,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -348,12 +348,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -363,11 +363,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -377,11 +377,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -391,11 +391,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -405,11 +405,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -419,14 +419,14 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -436,21 +436,21 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -470,7 +470,7 @@ public: virtual ::_TAO_CORBA_Contained_Proxy_Impl &select_proxy ( ::CORBA_Contained *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -479,7 +479,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -522,7 +522,7 @@ public: virtual char * id ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -531,7 +531,7 @@ public: virtual void id ( CORBA_Object *_collocated_tao_target_, const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -539,7 +539,7 @@ public: virtual char * name ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -548,7 +548,7 @@ public: virtual void name ( CORBA_Object *_collocated_tao_target_, const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -556,7 +556,7 @@ public: virtual char * version ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -565,7 +565,7 @@ public: virtual void version ( CORBA_Object *_collocated_tao_target_, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -573,7 +573,7 @@ public: virtual CORBA_Container_ptr defined_in ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -581,7 +581,7 @@ public: virtual char * absolute_name ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -589,7 +589,7 @@ public: virtual CORBA_Repository_ptr containing_repository ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -597,7 +597,7 @@ public: virtual CORBA_Contained::Description * describe ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -608,7 +608,7 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -640,7 +640,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -651,38 +651,38 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_Container *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA_Contained_ptr lookup ( const char * search_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -692,13 +692,13 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_ContainedSeq * contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -708,7 +708,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_ContainedSeq * lookup_name ( @@ -716,7 +716,7 @@ public: CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -726,14 +726,14 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_Container::DescriptionSeq * describe_contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -743,14 +743,14 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_ModuleDef_ptr create_module ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -760,7 +760,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_ConstantDef_ptr create_constant ( @@ -769,7 +769,7 @@ public: const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -779,7 +779,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_StructDef_ptr create_struct ( @@ -787,7 +787,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -797,7 +797,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_UnionDef_ptr create_union ( @@ -806,7 +806,7 @@ public: const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -816,7 +816,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_EnumDef_ptr create_enum ( @@ -824,7 +824,7 @@ public: const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -834,7 +834,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_AliasDef_ptr create_alias ( @@ -842,7 +842,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -852,7 +852,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_InterfaceDef_ptr create_interface ( @@ -860,7 +860,7 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -870,7 +870,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_ValueDef_ptr create_value ( @@ -884,7 +884,7 @@ public: const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -894,7 +894,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_ValueBoxDef_ptr create_value_box ( @@ -902,7 +902,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -912,7 +912,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_ExceptionDef_ptr create_exception ( @@ -920,7 +920,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -930,14 +930,14 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_NativeDef_ptr create_native ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -947,7 +947,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_AbstractInterfaceDef_ptr create_abstract_interface ( @@ -955,7 +955,7 @@ public: const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -965,7 +965,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_LocalInterfaceDef_ptr create_local_interface ( @@ -973,7 +973,7 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -983,21 +983,21 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -1017,7 +1017,7 @@ public: virtual ::_TAO_CORBA_Container_Proxy_Impl &select_proxy ( ::CORBA_Container *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1026,7 +1026,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1070,7 +1070,7 @@ public: virtual CORBA_Contained_ptr lookup ( CORBA_Object *_collocated_tao_target_, const char * search_name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1080,7 +1080,7 @@ public: CORBA_Object *_collocated_tao_target_, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1092,7 +1092,7 @@ public: CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1103,7 +1103,7 @@ public: CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1114,7 +1114,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1127,7 +1127,7 @@ public: const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1139,7 +1139,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1152,7 +1152,7 @@ public: const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1164,7 +1164,7 @@ public: const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1176,7 +1176,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1188,7 +1188,7 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1206,7 +1206,7 @@ public: const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1218,7 +1218,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1230,7 +1230,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1241,7 +1241,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1253,7 +1253,7 @@ public: const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1265,7 +1265,7 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1297,7 +1297,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -1308,37 +1308,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_IDLType *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1348,21 +1348,21 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -1382,7 +1382,7 @@ public: virtual ::_TAO_CORBA_IDLType_Proxy_Impl &select_proxy ( ::CORBA_IDLType *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1391,7 +1391,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1434,7 +1434,7 @@ public: virtual CORBA::TypeCode_ptr type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1466,7 +1466,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -1477,31 +1477,31 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_TypedefDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; @@ -1510,98 +1510,98 @@ public: TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -1621,7 +1621,7 @@ public: virtual ::_TAO_CORBA_TypedefDef_Proxy_Impl &select_proxy ( ::CORBA_TypedefDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1630,7 +1630,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS.i b/TAO/orbsvcs/IFR_Service/IFR_BaseS.i index 477a44b0871..8224fd18394 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_BaseS.i +++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS.i @@ -23,7 +23,7 @@ ACE_INLINE void POA_CORBA_Contained::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_Contained_ptr) obj; @@ -31,14 +31,14 @@ ACE_INLINE void POA_CORBA_Contained::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Contained::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_Contained_ptr) obj; @@ -46,14 +46,14 @@ ACE_INLINE void POA_CORBA_Contained::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Container::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_Container_ptr) obj; @@ -61,14 +61,14 @@ ACE_INLINE void POA_CORBA_Container::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Container::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_Container_ptr) obj; @@ -76,14 +76,14 @@ ACE_INLINE void POA_CORBA_Container::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_IDLType::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_IDLType_ptr) obj; @@ -91,14 +91,14 @@ ACE_INLINE void POA_CORBA_IDLType::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_IDLType::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_IDLType_ptr) obj; @@ -106,14 +106,14 @@ ACE_INLINE void POA_CORBA_IDLType::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_TypedefDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj; @@ -121,14 +121,14 @@ ACE_INLINE void POA_CORBA_TypedefDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_TypedefDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj; @@ -136,14 +136,14 @@ ACE_INLINE void POA_CORBA_TypedefDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_TypedefDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj; @@ -151,14 +151,14 @@ ACE_INLINE void POA_CORBA_TypedefDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_TypedefDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj; @@ -166,14 +166,14 @@ ACE_INLINE void POA_CORBA_TypedefDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_TypedefDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj; @@ -181,14 +181,14 @@ ACE_INLINE void POA_CORBA_TypedefDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_TypedefDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj; @@ -196,14 +196,14 @@ ACE_INLINE void POA_CORBA_TypedefDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_TypedefDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj; @@ -211,14 +211,14 @@ ACE_INLINE void POA_CORBA_TypedefDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_TypedefDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj; @@ -226,14 +226,14 @@ ACE_INLINE void POA_CORBA_TypedefDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_TypedefDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj; @@ -241,14 +241,14 @@ ACE_INLINE void POA_CORBA_TypedefDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_TypedefDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj; @@ -256,14 +256,14 @@ ACE_INLINE void POA_CORBA_TypedefDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_TypedefDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj; @@ -271,14 +271,14 @@ ACE_INLINE void POA_CORBA_TypedefDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_TypedefDef::_get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType_ptr impl = (POA_CORBA_TypedefDef_ptr) obj; @@ -286,14 +286,14 @@ ACE_INLINE void POA_CORBA_TypedefDef::_get_type_skel ( req, (POA_CORBA_IDLType_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_TypedefDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_TypedefDef_ptr) obj; @@ -301,14 +301,14 @@ ACE_INLINE void POA_CORBA_TypedefDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_TypedefDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_TypedefDef_ptr) obj; @@ -316,6 +316,6 @@ ACE_INLINE void POA_CORBA_TypedefDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.h b/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.h index 87fb981b893..0d9c58482b6 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.h +++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.h @@ -67,17 +67,17 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -123,10 +123,10 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -134,14 +134,14 @@ public: void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -149,14 +149,14 @@ public: void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -164,35 +164,35 @@ public: void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -202,21 +202,21 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -262,11 +262,11 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA_Contained_ptr lookup ( const char * search_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -275,7 +275,7 @@ public: CORBA_ContainedSeq * contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -286,7 +286,7 @@ public: CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -296,7 +296,7 @@ public: CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -306,7 +306,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -318,7 +318,7 @@ public: const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -329,7 +329,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -341,7 +341,7 @@ public: const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -352,7 +352,7 @@ public: const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -363,7 +363,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -374,7 +374,7 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -391,7 +391,7 @@ public: const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -402,7 +402,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -413,7 +413,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -423,7 +423,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -434,7 +434,7 @@ public: const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -445,21 +445,21 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -505,24 +505,24 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -568,10 +568,10 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -579,14 +579,14 @@ public: void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -594,14 +594,14 @@ public: void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -609,35 +609,35 @@ public: void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -647,28 +647,28 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.i b/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.i index ee67530cc11..2dd1632a3b6 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.i +++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.i @@ -90,37 +90,37 @@ POA_CORBA_IRObject_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_CORBA_IRObject_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_IRObject_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_IRObject::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_IRObject::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE CORBA::DefinitionKind POA_CORBA_IRObject_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_IRObject_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -193,31 +193,31 @@ POA_CORBA_Contained_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_CORBA_Contained_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_Contained_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_Contained::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_Contained::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE char * POA_CORBA_Contained_tie::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_Contained_tie::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -225,27 +225,27 @@ void POA_CORBA_Contained_tie::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_Contained_tie::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_Contained_tie::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -253,27 +253,27 @@ void POA_CORBA_Contained_tie::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_Contained_tie::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_Contained_tie::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -281,59 +281,59 @@ void POA_CORBA_Contained_tie::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Container_ptr POA_CORBA_Contained_tie::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_Contained_tie::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Repository_ptr POA_CORBA_Contained_tie::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained::Description * POA_CORBA_Contained_tie::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -342,7 +342,7 @@ void POA_CORBA_Contained_tie::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -352,33 +352,33 @@ void POA_CORBA_Contained_tie::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::DefinitionKind POA_CORBA_Contained_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_Contained_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -451,18 +451,18 @@ POA_CORBA_Container_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_CORBA_Container_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_Container_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_Container::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_Container::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE CORBA_Contained_ptr POA_CORBA_Container_tie::lookup ( const char * search_name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -470,7 +470,7 @@ CORBA_Contained_ptr POA_CORBA_Container_tie::lookup ( { return this->ptr_->lookup ( search_name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -478,7 +478,7 @@ template ACE_INLINE CORBA_ContainedSeq * POA_CORBA_Container_tie::contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -487,7 +487,7 @@ CORBA_ContainedSeq * POA_CORBA_Container_tie::contents ( return this->ptr_->contents ( limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -497,7 +497,7 @@ CORBA_ContainedSeq * POA_CORBA_Container_tie::lookup_name ( CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -508,7 +508,7 @@ search_name, levels_to_search, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -517,7 +517,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_Container_tie::describe_contents CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -527,7 +527,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_Container_tie::describe_contents limit_type, exclude_inherited, max_returned_objs - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -536,7 +536,7 @@ CORBA_ModuleDef_ptr POA_CORBA_Container_tie::create_module ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -546,7 +546,7 @@ CORBA_ModuleDef_ptr POA_CORBA_Container_tie::create_module ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -557,7 +557,7 @@ CORBA_ConstantDef_ptr POA_CORBA_Container_tie::create_constant ( const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -569,7 +569,7 @@ id, version, type, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -579,7 +579,7 @@ CORBA_StructDef_ptr POA_CORBA_Container_tie::create_struct ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -590,7 +590,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -601,7 +601,7 @@ CORBA_UnionDef_ptr POA_CORBA_Container_tie::create_union ( const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -613,7 +613,7 @@ id, version, discriminator_type, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -623,7 +623,7 @@ CORBA_EnumDef_ptr POA_CORBA_Container_tie::create_enum ( const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -634,7 +634,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -644,7 +644,7 @@ CORBA_AliasDef_ptr POA_CORBA_Container_tie::create_alias ( const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -655,7 +655,7 @@ id, name, version, original_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -665,7 +665,7 @@ CORBA_InterfaceDef_ptr POA_CORBA_Container_tie::create_interface ( const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -676,7 +676,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -692,7 +692,7 @@ CORBA_ValueDef_ptr POA_CORBA_Container_tie::create_value ( const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -709,7 +709,7 @@ id, abstract_base_values, supported_interfaces, initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -719,7 +719,7 @@ CORBA_ValueBoxDef_ptr POA_CORBA_Container_tie::create_value_box ( const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -730,7 +730,7 @@ id, name, version, original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -740,7 +740,7 @@ CORBA_ExceptionDef_ptr POA_CORBA_Container_tie::create_exception ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -751,7 +751,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -760,7 +760,7 @@ CORBA_NativeDef_ptr POA_CORBA_Container_tie::create_native ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -770,7 +770,7 @@ CORBA_NativeDef_ptr POA_CORBA_Container_tie::create_native ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -780,7 +780,7 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_Container_tie::create_abstract_inter const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -791,7 +791,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -801,7 +801,7 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_Container_tie::create_local_interface const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -812,33 +812,33 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::DefinitionKind POA_CORBA_Container_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_Container_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -911,50 +911,50 @@ POA_CORBA_IDLType_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_CORBA_IDLType_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_IDLType_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_IDLType::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_IDLType::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_IDLType_tie::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA::DefinitionKind POA_CORBA_IDLType_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_IDLType_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -1027,31 +1027,31 @@ POA_CORBA_TypedefDef_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_CORBA_TypedefDef_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_TypedefDef_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_TypedefDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_TypedefDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE char * POA_CORBA_TypedefDef_tie::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_TypedefDef_tie::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1059,27 +1059,27 @@ void POA_CORBA_TypedefDef_tie::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_TypedefDef_tie::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_TypedefDef_tie::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1087,27 +1087,27 @@ void POA_CORBA_TypedefDef_tie::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_TypedefDef_tie::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_TypedefDef_tie::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1115,59 +1115,59 @@ void POA_CORBA_TypedefDef_tie::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Container_ptr POA_CORBA_TypedefDef_tie::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_TypedefDef_tie::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Repository_ptr POA_CORBA_TypedefDef_tie::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained::Description * POA_CORBA_TypedefDef_tie::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -1176,7 +1176,7 @@ void POA_CORBA_TypedefDef_tie::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1186,46 +1186,46 @@ void POA_CORBA_TypedefDef_tie::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_TypedefDef_tie::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA::DefinitionKind POA_CORBA_TypedefDef_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_TypedefDef_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp b/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp index 40d924df88c..f50c0f1c3be 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp +++ b/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp @@ -210,31 +210,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Repository *tao_impl , const char * search_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_Contained_ptr result); @@ -254,7 +254,7 @@ TAO_ServerRequestInfo_CORBA_Repository_lookup_id::TAO_ServerRequestInfo_CORBA_Re TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Repository *tao_impl, const char * search_id - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -262,12 +262,12 @@ TAO_ServerRequestInfo_CORBA_Repository_lookup_id::TAO_ServerRequestInfo_CORBA_Re {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Repository_lookup_id::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_lookup_id::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -283,25 +283,25 @@ TAO_ServerRequestInfo_CORBA_Repository_lookup_id::arguments (TAO_ENV_SINGLE_ARG_ } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Repository_lookup_id::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_lookup_id::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Repository_lookup_id::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_lookup_id::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -313,7 +313,7 @@ TAO_ServerRequestInfo_CORBA_Repository_lookup_id::result (TAO_ENV_SINGLE_ARG_DEC char * TAO_ServerRequestInfo_CORBA_Repository_lookup_id::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -323,10 +323,10 @@ TAO_ServerRequestInfo_CORBA_Repository_lookup_id::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_Repository_lookup_id::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -344,31 +344,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Repository *tao_impl , CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::TypeCode_ptr result); @@ -388,7 +388,7 @@ TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::TAO_ServerRequest TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Repository *tao_impl, CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -396,12 +396,12 @@ TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::TAO_ServerRequest {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -417,25 +417,25 @@ TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::arguments (TAO_EN } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -447,7 +447,7 @@ TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::result (TAO_ENV_S char * TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -457,10 +457,10 @@ TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::target_most_deriv CORBA::Boolean TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -478,31 +478,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Repository *tao_impl , CORBA::PrimitiveKind & kind - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_PrimitiveDef_ptr result); @@ -522,7 +522,7 @@ TAO_ServerRequestInfo_CORBA_Repository_get_primitive::TAO_ServerRequestInfo_CORB TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Repository *tao_impl, CORBA::PrimitiveKind & kind - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -530,12 +530,12 @@ TAO_ServerRequestInfo_CORBA_Repository_get_primitive::TAO_ServerRequestInfo_CORB {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Repository_get_primitive::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_get_primitive::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -551,25 +551,25 @@ TAO_ServerRequestInfo_CORBA_Repository_get_primitive::arguments (TAO_ENV_SINGLE_ } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Repository_get_primitive::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_get_primitive::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Repository_get_primitive::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_get_primitive::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -581,7 +581,7 @@ TAO_ServerRequestInfo_CORBA_Repository_get_primitive::result (TAO_ENV_SINGLE_ARG char * TAO_ServerRequestInfo_CORBA_Repository_get_primitive::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -591,10 +591,10 @@ TAO_ServerRequestInfo_CORBA_Repository_get_primitive::target_most_derived_interf CORBA::Boolean TAO_ServerRequestInfo_CORBA_Repository_get_primitive::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -612,31 +612,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Repository *tao_impl , const CORBA::ULong & bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_StringDef_ptr result); @@ -656,7 +656,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_string::TAO_ServerRequestInfo_CORB TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Repository *tao_impl, const CORBA::ULong & bound - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -664,12 +664,12 @@ TAO_ServerRequestInfo_CORBA_Repository_create_string::TAO_ServerRequestInfo_CORB {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Repository_create_string::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_create_string::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -685,25 +685,25 @@ TAO_ServerRequestInfo_CORBA_Repository_create_string::arguments (TAO_ENV_SINGLE_ } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Repository_create_string::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_create_string::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Repository_create_string::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_create_string::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -715,7 +715,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_string::result (TAO_ENV_SINGLE_ARG char * TAO_ServerRequestInfo_CORBA_Repository_create_string::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -725,10 +725,10 @@ TAO_ServerRequestInfo_CORBA_Repository_create_string::target_most_derived_interf CORBA::Boolean TAO_ServerRequestInfo_CORBA_Repository_create_string::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -746,31 +746,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Repository *tao_impl , const CORBA::ULong & bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_WstringDef_ptr result); @@ -790,7 +790,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_wstring::TAO_ServerRequestInfo_COR TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Repository *tao_impl, const CORBA::ULong & bound - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -798,12 +798,12 @@ TAO_ServerRequestInfo_CORBA_Repository_create_wstring::TAO_ServerRequestInfo_COR {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Repository_create_wstring::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_create_wstring::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -819,25 +819,25 @@ TAO_ServerRequestInfo_CORBA_Repository_create_wstring::arguments (TAO_ENV_SINGLE } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Repository_create_wstring::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_create_wstring::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Repository_create_wstring::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_create_wstring::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -849,7 +849,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_wstring::result (TAO_ENV_SINGLE_AR char * TAO_ServerRequestInfo_CORBA_Repository_create_wstring::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -859,10 +859,10 @@ TAO_ServerRequestInfo_CORBA_Repository_create_wstring::target_most_derived_inter CORBA::Boolean TAO_ServerRequestInfo_CORBA_Repository_create_wstring::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -881,31 +881,31 @@ public: , const CORBA::ULong & bound, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_SequenceDef_ptr result); @@ -927,7 +927,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_sequence::TAO_ServerRequestInfo_CO POA_CORBA_Repository *tao_impl, const CORBA::ULong & bound, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -936,12 +936,12 @@ TAO_ServerRequestInfo_CORBA_Repository_create_sequence::TAO_ServerRequestInfo_CO {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Repository_create_sequence::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_create_sequence::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -960,25 +960,25 @@ TAO_ServerRequestInfo_CORBA_Repository_create_sequence::arguments (TAO_ENV_SINGL } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Repository_create_sequence::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_create_sequence::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Repository_create_sequence::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_create_sequence::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -990,7 +990,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_sequence::result (TAO_ENV_SINGLE_A char * TAO_ServerRequestInfo_CORBA_Repository_create_sequence::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1000,10 +1000,10 @@ TAO_ServerRequestInfo_CORBA_Repository_create_sequence::target_most_derived_inte CORBA::Boolean TAO_ServerRequestInfo_CORBA_Repository_create_sequence::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -1022,31 +1022,31 @@ public: , const CORBA::ULong & length, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_ArrayDef_ptr result); @@ -1068,7 +1068,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_array::TAO_ServerRequestInfo_CORBA POA_CORBA_Repository *tao_impl, const CORBA::ULong & length, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -1077,12 +1077,12 @@ TAO_ServerRequestInfo_CORBA_Repository_create_array::TAO_ServerRequestInfo_CORBA {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Repository_create_array::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_create_array::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -1101,25 +1101,25 @@ TAO_ServerRequestInfo_CORBA_Repository_create_array::arguments (TAO_ENV_SINGLE_A } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Repository_create_array::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_create_array::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Repository_create_array::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_create_array::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -1131,7 +1131,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_array::result (TAO_ENV_SINGLE_ARG_ char * TAO_ServerRequestInfo_CORBA_Repository_create_array::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1141,10 +1141,10 @@ TAO_ServerRequestInfo_CORBA_Repository_create_array::target_most_derived_interfa CORBA::Boolean TAO_ServerRequestInfo_CORBA_Repository_create_array::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -1163,31 +1163,31 @@ public: , const CORBA::UShort & digits, const CORBA::Short & scale - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_FixedDef_ptr result); @@ -1209,7 +1209,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_fixed::TAO_ServerRequestInfo_CORBA POA_CORBA_Repository *tao_impl, const CORBA::UShort & digits, const CORBA::Short & scale - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -1218,12 +1218,12 @@ TAO_ServerRequestInfo_CORBA_Repository_create_fixed::TAO_ServerRequestInfo_CORBA {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Repository_create_fixed::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_create_fixed::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -1242,25 +1242,25 @@ TAO_ServerRequestInfo_CORBA_Repository_create_fixed::arguments (TAO_ENV_SINGLE_A } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Repository_create_fixed::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_create_fixed::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Repository_create_fixed::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_create_fixed::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -1272,7 +1272,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_fixed::result (TAO_ENV_SINGLE_ARG_ char * TAO_ServerRequestInfo_CORBA_Repository_create_fixed::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1282,10 +1282,10 @@ TAO_ServerRequestInfo_CORBA_Repository_create_fixed::target_most_derived_interfa CORBA::Boolean TAO_ServerRequestInfo_CORBA_Repository_create_fixed::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -1325,17 +1325,17 @@ _TAO_CORBA_Repository_Strategized_Proxy_Broker::~_TAO_CORBA_Repository_Strategiz _TAO_CORBA_Repository_Proxy_Impl& _TAO_CORBA_Repository_Strategized_Proxy_Broker::select_proxy ( ::CORBA_Repository *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -1345,7 +1345,7 @@ _TAO_CORBA_Repository_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_Repository_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -1416,7 +1416,7 @@ _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::_TAO_CORBA_Repository_ThruPOA_Proxy_Im CORBA_Contained_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::lookup_id ( CORBA_Object *_collocated_tao_target_, const char * search_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1432,7 +1432,7 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::lookup_id ( _collocated_tao_target_->_object_key (), "lookup_id", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -1442,14 +1442,14 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::lookup_id ( ) )->lookup_id ( search_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA::TypeCode_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::get_canonical_typecode ( CORBA_Object *_collocated_tao_target_, CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1465,7 +1465,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::get_canonical_type _collocated_tao_target_->_object_key (), "get_canonical_typecode", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -1475,14 +1475,14 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::get_canonical_type ) )->get_canonical_typecode ( tc - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::get_primitive ( CORBA_Object *_collocated_tao_target_, CORBA::PrimitiveKind kind - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1498,7 +1498,7 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::get_primitive ( _collocated_tao_target_->_object_key (), "get_primitive", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -1508,14 +1508,14 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::get_primitive ( ) )->get_primitive ( kind - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_StringDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_string ( CORBA_Object *_collocated_tao_target_, CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1531,7 +1531,7 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_string ( _collocated_tao_target_->_object_key (), "create_string", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -1541,14 +1541,14 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_string ( ) )->create_string ( bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_WstringDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_wstring ( CORBA_Object *_collocated_tao_target_, CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1564,7 +1564,7 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_wstring ( _collocated_tao_target_->_object_key (), "create_wstring", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -1574,7 +1574,7 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_wstring ( ) )->create_wstring ( bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1582,7 +1582,7 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_sequence CORBA_Object *_collocated_tao_target_, CORBA::ULong bound, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1598,7 +1598,7 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_sequence _collocated_tao_target_->_object_key (), "create_sequence", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -1609,7 +1609,7 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_sequence )->create_sequence ( bound, element_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1617,7 +1617,7 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_array ( CORBA_Object *_collocated_tao_target_, CORBA::ULong length, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1633,7 +1633,7 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_array ( _collocated_tao_target_->_object_key (), "create_array", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -1644,7 +1644,7 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_array ( )->create_array ( length, element_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1652,7 +1652,7 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_fixed ( CORBA_Object *_collocated_tao_target_, CORBA::UShort digits, CORBA::Short scale - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1668,7 +1668,7 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_fixed ( _collocated_tao_target_->_object_key (), "create_fixed", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -1679,7 +1679,7 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_fixed ( )->create_fixed ( digits, scale - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1709,7 +1709,7 @@ void POA_CORBA_Repository::lookup_id_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -1738,19 +1738,19 @@ void POA_CORBA_Repository::lookup_id_skel ( _tao_upcall, _tao_impl, search_id.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->lookup_id ( search_id.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -1759,7 +1759,7 @@ void POA_CORBA_Repository::lookup_id_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -1767,12 +1767,12 @@ void POA_CORBA_Repository::lookup_id_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -1800,7 +1800,7 @@ void POA_CORBA_Repository::get_canonical_typecode_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -1829,19 +1829,19 @@ void POA_CORBA_Repository::get_canonical_typecode_skel ( _tao_upcall, _tao_impl, tc.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->get_canonical_typecode ( tc.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -1850,7 +1850,7 @@ void POA_CORBA_Repository::get_canonical_typecode_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -1858,12 +1858,12 @@ void POA_CORBA_Repository::get_canonical_typecode_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -1891,7 +1891,7 @@ void POA_CORBA_Repository::get_primitive_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -1920,19 +1920,19 @@ void POA_CORBA_Repository::get_primitive_skel ( _tao_upcall, _tao_impl, kind - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->get_primitive ( kind - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -1941,7 +1941,7 @@ void POA_CORBA_Repository::get_primitive_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -1949,12 +1949,12 @@ void POA_CORBA_Repository::get_primitive_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -1982,7 +1982,7 @@ void POA_CORBA_Repository::create_string_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -2011,19 +2011,19 @@ void POA_CORBA_Repository::create_string_skel ( _tao_upcall, _tao_impl, bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->create_string ( bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -2032,7 +2032,7 @@ void POA_CORBA_Repository::create_string_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2040,12 +2040,12 @@ void POA_CORBA_Repository::create_string_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -2073,7 +2073,7 @@ void POA_CORBA_Repository::create_wstring_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -2102,19 +2102,19 @@ void POA_CORBA_Repository::create_wstring_skel ( _tao_upcall, _tao_impl, bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->create_wstring ( bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -2123,7 +2123,7 @@ void POA_CORBA_Repository::create_wstring_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2131,12 +2131,12 @@ void POA_CORBA_Repository::create_wstring_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -2164,7 +2164,7 @@ void POA_CORBA_Repository::create_sequence_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -2196,12 +2196,12 @@ void POA_CORBA_Repository::create_sequence_skel ( _tao_impl, bound, element_type.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -2209,7 +2209,7 @@ void POA_CORBA_Repository::create_sequence_skel ( _tao_impl->create_sequence ( bound, element_type.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -2218,7 +2218,7 @@ void POA_CORBA_Repository::create_sequence_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2226,12 +2226,12 @@ void POA_CORBA_Repository::create_sequence_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -2259,7 +2259,7 @@ void POA_CORBA_Repository::create_array_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -2291,12 +2291,12 @@ void POA_CORBA_Repository::create_array_skel ( _tao_impl, length, element_type.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -2304,7 +2304,7 @@ void POA_CORBA_Repository::create_array_skel ( _tao_impl->create_array ( length, element_type.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -2313,7 +2313,7 @@ void POA_CORBA_Repository::create_array_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2321,12 +2321,12 @@ void POA_CORBA_Repository::create_array_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -2354,7 +2354,7 @@ void POA_CORBA_Repository::create_fixed_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -2386,12 +2386,12 @@ void POA_CORBA_Repository::create_fixed_skel ( _tao_impl, digits, scale - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -2399,7 +2399,7 @@ void POA_CORBA_Repository::create_fixed_skel ( _tao_impl->create_fixed ( digits, scale - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -2408,7 +2408,7 @@ void POA_CORBA_Repository::create_fixed_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2416,12 +2416,12 @@ void POA_CORBA_Repository::create_fixed_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -2449,7 +2449,7 @@ void POA_CORBA_Repository::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -2459,7 +2459,7 @@ void POA_CORBA_Repository::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -2472,11 +2472,11 @@ void POA_CORBA_Repository::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Repository *_tao_impl = (POA_CORBA_Repository *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -2489,7 +2489,7 @@ void POA_CORBA_Repository::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Repository *_tao_impl = (POA_CORBA_Repository *) _tao_object_reference; @@ -2508,7 +2508,7 @@ void POA_CORBA_Repository::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -2535,10 +2535,10 @@ void POA_CORBA_Repository::_interface_skel ( CORBA::Boolean POA_CORBA_Repository::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -2566,12 +2566,12 @@ void* POA_CORBA_Repository::_downcast ( return 0; } -void POA_CORBA_Repository::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_Repository::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -2581,9 +2581,9 @@ const char* POA_CORBA_Repository::_interface_repository_id (void) const } CORBA_Repository* -POA_CORBA_Repository::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_Repository::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -2791,17 +2791,17 @@ _TAO_CORBA_ModuleDef_Strategized_Proxy_Broker::~_TAO_CORBA_ModuleDef_Strategized _TAO_CORBA_ModuleDef_Proxy_Impl& _TAO_CORBA_ModuleDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_ModuleDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -2811,7 +2811,7 @@ _TAO_CORBA_ModuleDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_ModuleDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -2906,7 +2906,7 @@ void POA_CORBA_ModuleDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -2916,7 +2916,7 @@ void POA_CORBA_ModuleDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -2929,11 +2929,11 @@ void POA_CORBA_ModuleDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ModuleDef *_tao_impl = (POA_CORBA_ModuleDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -2946,7 +2946,7 @@ void POA_CORBA_ModuleDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ModuleDef *_tao_impl = (POA_CORBA_ModuleDef *) _tao_object_reference; @@ -2965,7 +2965,7 @@ void POA_CORBA_ModuleDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -2992,10 +2992,10 @@ void POA_CORBA_ModuleDef::_interface_skel ( CORBA::Boolean POA_CORBA_ModuleDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -3026,12 +3026,12 @@ void* POA_CORBA_ModuleDef::_downcast ( return 0; } -void POA_CORBA_ModuleDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_ModuleDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -3041,9 +3041,9 @@ const char* POA_CORBA_ModuleDef::_interface_repository_id (void) const } CORBA_ModuleDef* -POA_CORBA_ModuleDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_ModuleDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -3214,31 +3214,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ConstantDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::TypeCode_ptr result); @@ -3256,44 +3256,44 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::TAO_ServerRequestInfo_CORBA_Co TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ConstantDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -3305,7 +3305,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::result (TAO_ENV_SINGLE_ARG_DEC char * TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -3315,10 +3315,10 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -3335,31 +3335,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ConstantDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_IDLType_ptr result); @@ -3377,44 +3377,44 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::TAO_ServerRequestInfo_CORB TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ConstantDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -3426,7 +3426,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::result (TAO_ENV_SINGLE_ARG char * TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -3436,10 +3436,10 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::target_most_derived_interf CORBA::Boolean TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -3457,31 +3457,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ConstantDef *tao_impl , CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -3500,7 +3500,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::TAO_ServerRequestInfo_CORB TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ConstantDef *tao_impl, CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -3508,12 +3508,12 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::TAO_ServerRequestInfo_CORB {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -3529,25 +3529,25 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::arguments (TAO_ENV_SINGLE_ } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -3555,7 +3555,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::result (TAO_ENV_SINGLE_ARG char * TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -3565,10 +3565,10 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::target_most_derived_interf CORBA::Boolean TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_ConstantDef_value_get : public TAO_ServerRequestInfo @@ -3578,31 +3578,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ConstantDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::Any * result); @@ -3620,44 +3620,44 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::TAO_ServerRequestInfo_CORBA_C TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ConstantDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -3669,7 +3669,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::result (TAO_ENV_SINGLE_ARG_DE char * TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -3679,10 +3679,10 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -3700,31 +3700,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ConstantDef *tao_impl , const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -3743,7 +3743,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::TAO_ServerRequestInfo_CORBA_C TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ConstantDef *tao_impl, const CORBA::Any & value - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -3751,12 +3751,12 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::TAO_ServerRequestInfo_CORBA_C {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -3772,25 +3772,25 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::arguments (TAO_ENV_SINGLE_ARG } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -3798,7 +3798,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::result (TAO_ENV_SINGLE_ARG_DE char * TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -3808,10 +3808,10 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -3844,17 +3844,17 @@ _TAO_CORBA_ConstantDef_Strategized_Proxy_Broker::~_TAO_CORBA_ConstantDef_Strateg _TAO_CORBA_ConstantDef_Proxy_Impl& _TAO_CORBA_ConstantDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_ConstantDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -3864,7 +3864,7 @@ _TAO_CORBA_ConstantDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_ConstantDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -3934,7 +3934,7 @@ _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::_TAO_CORBA_ConstantDef_ThruPOA_Proxy_ CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3950,7 +3950,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type ( _collocated_tao_target_->_object_key (), "type", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -3959,13 +3959,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type ( "IDL:omg.org/CORBA/ConstantDef:1.0" ) )->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3981,7 +3981,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type_def ( _collocated_tao_target_->_object_key (), "type_def", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -3990,14 +3990,14 @@ CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type_def ( "IDL:omg.org/CORBA/ConstantDef:1.0" ) )->type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4011,7 +4011,7 @@ void _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type_def ( _collocated_tao_target_->_object_key (), "type_def", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -4021,14 +4021,14 @@ void _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type_def ( ) )->type_def ( type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } CORBA::Any * _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::value ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4044,7 +4044,7 @@ CORBA::Any * _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::value ( _collocated_tao_target_->_object_key (), "value", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -4053,14 +4053,14 @@ CORBA::Any * _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::value ( "IDL:omg.org/CORBA/ConstantDef:1.0" ) )->value ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::value ( CORBA_Object *_collocated_tao_target_, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4074,7 +4074,7 @@ void _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::value ( _collocated_tao_target_->_object_key (), "value", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -4084,7 +4084,7 @@ void _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::value ( ) )->value ( value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -4115,7 +4115,7 @@ void POA_CORBA_ConstantDef::_get_type_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ConstantDef *_tao_impl = @@ -4136,18 +4136,18 @@ void POA_CORBA_ConstantDef::_get_type_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -4156,7 +4156,7 @@ void POA_CORBA_ConstantDef::_get_type_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -4164,12 +4164,12 @@ void POA_CORBA_ConstantDef::_get_type_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -4197,7 +4197,7 @@ void POA_CORBA_ConstantDef::_get_type_def_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ConstantDef *_tao_impl = @@ -4218,18 +4218,18 @@ void POA_CORBA_ConstantDef::_get_type_def_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -4238,7 +4238,7 @@ void POA_CORBA_ConstantDef::_get_type_def_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -4246,12 +4246,12 @@ void POA_CORBA_ConstantDef::_get_type_def_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -4279,7 +4279,7 @@ void POA_CORBA_ConstantDef::_set_type_def_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -4308,25 +4308,25 @@ void POA_CORBA_ConstantDef::_set_type_def_skel ( _tao_upcall, _tao_impl, type_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->type_def ( type_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -4334,12 +4334,12 @@ void POA_CORBA_ConstantDef::_set_type_def_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -4360,7 +4360,7 @@ void POA_CORBA_ConstantDef::_get_value_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ConstantDef *_tao_impl = @@ -4381,18 +4381,18 @@ void POA_CORBA_ConstantDef::_get_value_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->value ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -4401,7 +4401,7 @@ void POA_CORBA_ConstantDef::_get_value_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -4409,12 +4409,12 @@ void POA_CORBA_ConstantDef::_get_value_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -4442,7 +4442,7 @@ void POA_CORBA_ConstantDef::_set_value_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -4471,25 +4471,25 @@ void POA_CORBA_ConstantDef::_set_value_skel ( _tao_upcall, _tao_impl, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->value ( value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -4497,12 +4497,12 @@ void POA_CORBA_ConstantDef::_set_value_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -4523,7 +4523,7 @@ void POA_CORBA_ConstantDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -4533,7 +4533,7 @@ void POA_CORBA_ConstantDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -4546,11 +4546,11 @@ void POA_CORBA_ConstantDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ConstantDef *_tao_impl = (POA_CORBA_ConstantDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -4563,7 +4563,7 @@ void POA_CORBA_ConstantDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ConstantDef *_tao_impl = (POA_CORBA_ConstantDef *) _tao_object_reference; @@ -4582,7 +4582,7 @@ void POA_CORBA_ConstantDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -4609,10 +4609,10 @@ void POA_CORBA_ConstantDef::_interface_skel ( CORBA::Boolean POA_CORBA_ConstantDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -4640,12 +4640,12 @@ void* POA_CORBA_ConstantDef::_downcast ( return 0; } -void POA_CORBA_ConstantDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_ConstantDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -4655,9 +4655,9 @@ const char* POA_CORBA_ConstantDef::_interface_repository_id (void) const } CORBA_ConstantDef* -POA_CORBA_ConstantDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_ConstantDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -4845,31 +4845,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_StructDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_StructMemberSeq * result); @@ -4887,44 +4887,44 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_get::TAO_ServerRequestInfo_CORBA_S TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_StructDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_StructDef_members_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_StructDef_members_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_StructDef_members_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_StructDef_members_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_StructDef_members_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_StructDef_members_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -4936,7 +4936,7 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_get::result (TAO_ENV_SINGLE_ARG_DE char * TAO_ServerRequestInfo_CORBA_StructDef_members_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -4946,10 +4946,10 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_get::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_StructDef_members_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -4967,31 +4967,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_StructDef *tao_impl , const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -5010,7 +5010,7 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_set::TAO_ServerRequestInfo_CORBA_S TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_StructDef *tao_impl, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -5018,12 +5018,12 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_set::TAO_ServerRequestInfo_CORBA_S {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_StructDef_members_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_StructDef_members_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -5039,25 +5039,25 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_set::arguments (TAO_ENV_SINGLE_ARG } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_StructDef_members_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_StructDef_members_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_StructDef_members_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_StructDef_members_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -5065,7 +5065,7 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_set::result (TAO_ENV_SINGLE_ARG_DE char * TAO_ServerRequestInfo_CORBA_StructDef_members_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5075,10 +5075,10 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_set::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_StructDef_members_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -5111,17 +5111,17 @@ _TAO_CORBA_StructDef_Strategized_Proxy_Broker::~_TAO_CORBA_StructDef_Strategized _TAO_CORBA_StructDef_Proxy_Impl& _TAO_CORBA_StructDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_StructDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -5131,7 +5131,7 @@ _TAO_CORBA_StructDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_StructDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -5201,7 +5201,7 @@ _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::_TAO_CORBA_StructDef_ThruPOA_Proxy_Impl CORBA_StructMemberSeq * _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::members ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5217,7 +5217,7 @@ CORBA_StructMemberSeq * _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::members ( _collocated_tao_target_->_object_key (), "members", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -5226,14 +5226,14 @@ CORBA_StructMemberSeq * _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::members ( "IDL:omg.org/CORBA/StructDef:1.0" ) )->members ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::members ( CORBA_Object *_collocated_tao_target_, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5247,7 +5247,7 @@ void _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::members ( _collocated_tao_target_->_object_key (), "members", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -5257,7 +5257,7 @@ void _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::members ( ) )->members ( members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -5291,7 +5291,7 @@ void POA_CORBA_StructDef::_get_members_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_StructDef *_tao_impl = @@ -5312,18 +5312,18 @@ void POA_CORBA_StructDef::_get_members_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->members ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -5332,7 +5332,7 @@ void POA_CORBA_StructDef::_get_members_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -5340,12 +5340,12 @@ void POA_CORBA_StructDef::_get_members_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -5373,7 +5373,7 @@ void POA_CORBA_StructDef::_set_members_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -5402,25 +5402,25 @@ void POA_CORBA_StructDef::_set_members_skel ( _tao_upcall, _tao_impl, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->members ( members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -5428,12 +5428,12 @@ void POA_CORBA_StructDef::_set_members_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -5454,7 +5454,7 @@ void POA_CORBA_StructDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -5464,7 +5464,7 @@ void POA_CORBA_StructDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -5477,11 +5477,11 @@ void POA_CORBA_StructDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_StructDef *_tao_impl = (POA_CORBA_StructDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -5494,7 +5494,7 @@ void POA_CORBA_StructDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_StructDef *_tao_impl = (POA_CORBA_StructDef *) _tao_object_reference; @@ -5513,7 +5513,7 @@ void POA_CORBA_StructDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -5540,10 +5540,10 @@ void POA_CORBA_StructDef::_interface_skel ( CORBA::Boolean POA_CORBA_StructDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -5580,12 +5580,12 @@ void* POA_CORBA_StructDef::_downcast ( return 0; } -void POA_CORBA_StructDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_StructDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -5595,9 +5595,9 @@ const char* POA_CORBA_StructDef::_interface_repository_id (void) const } CORBA_StructDef* -POA_CORBA_StructDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_StructDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -5788,31 +5788,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_UnionDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::TypeCode_ptr result); @@ -5830,44 +5830,44 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::TAO_ServerRequestIn TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_UnionDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5879,7 +5879,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::result (TAO_ENV_SIN char * TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5889,10 +5889,10 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::target_most_derived CORBA::Boolean TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -5909,31 +5909,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_UnionDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_IDLType_ptr result); @@ -5951,44 +5951,44 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::TAO_ServerReque TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_UnionDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6000,7 +6000,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::result (TAO_ENV char * TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -6010,10 +6010,10 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::target_most_der CORBA::Boolean TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -6031,31 +6031,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_UnionDef *tao_impl , CORBA_IDLType_ptr discriminator_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -6074,7 +6074,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::TAO_ServerReque TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_UnionDef *tao_impl, CORBA_IDLType_ptr discriminator_type_def - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -6082,12 +6082,12 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::TAO_ServerReque {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -6103,25 +6103,25 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::arguments (TAO_ } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -6129,7 +6129,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::result (TAO_ENV char * TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -6139,10 +6139,10 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::target_most_der CORBA::Boolean TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_UnionDef_members_get : public TAO_ServerRequestInfo @@ -6152,31 +6152,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_UnionDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_UnionMemberSeq * result); @@ -6194,44 +6194,44 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_get::TAO_ServerRequestInfo_CORBA_Un TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_UnionDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_UnionDef_members_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_UnionDef_members_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_UnionDef_members_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_UnionDef_members_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_UnionDef_members_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_UnionDef_members_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6243,7 +6243,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_get::result (TAO_ENV_SINGLE_ARG_DEC char * TAO_ServerRequestInfo_CORBA_UnionDef_members_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -6253,10 +6253,10 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_get::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_UnionDef_members_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -6274,31 +6274,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_UnionDef *tao_impl , const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -6317,7 +6317,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_set::TAO_ServerRequestInfo_CORBA_Un TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_UnionDef *tao_impl, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -6325,12 +6325,12 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_set::TAO_ServerRequestInfo_CORBA_Un {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_UnionDef_members_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_UnionDef_members_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -6346,25 +6346,25 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_set::arguments (TAO_ENV_SINGLE_ARG_ } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_UnionDef_members_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_UnionDef_members_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_UnionDef_members_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_UnionDef_members_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -6372,7 +6372,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_set::result (TAO_ENV_SINGLE_ARG_DEC char * TAO_ServerRequestInfo_CORBA_UnionDef_members_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -6382,10 +6382,10 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_set::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_UnionDef_members_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -6418,17 +6418,17 @@ _TAO_CORBA_UnionDef_Strategized_Proxy_Broker::~_TAO_CORBA_UnionDef_Strategized_P _TAO_CORBA_UnionDef_Proxy_Impl& _TAO_CORBA_UnionDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_UnionDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -6438,7 +6438,7 @@ _TAO_CORBA_UnionDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_UnionDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -6508,7 +6508,7 @@ _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::_TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl ( CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6524,7 +6524,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type ( _collocated_tao_target_->_object_key (), "discriminator_type", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -6533,13 +6533,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type ( "IDL:omg.org/CORBA/UnionDef:1.0" ) )->discriminator_type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } CORBA_IDLType_ptr _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6555,7 +6555,7 @@ CORBA_IDLType_ptr _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def _collocated_tao_target_->_object_key (), "discriminator_type_def", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -6564,14 +6564,14 @@ CORBA_IDLType_ptr _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def "IDL:omg.org/CORBA/UnionDef:1.0" ) )->discriminator_type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr discriminator_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6585,7 +6585,7 @@ void _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def ( _collocated_tao_target_->_object_key (), "discriminator_type_def", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -6595,14 +6595,14 @@ void _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def ( ) )->discriminator_type_def ( discriminator_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::members ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6618,7 +6618,7 @@ CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::members ( _collocated_tao_target_->_object_key (), "members", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -6627,14 +6627,14 @@ CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::members ( "IDL:omg.org/CORBA/UnionDef:1.0" ) )->members ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::members ( CORBA_Object *_collocated_tao_target_, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6648,7 +6648,7 @@ void _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::members ( _collocated_tao_target_->_object_key (), "members", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -6658,7 +6658,7 @@ void _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::members ( ) )->members ( members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -6692,7 +6692,7 @@ void POA_CORBA_UnionDef::_get_discriminator_type_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_UnionDef *_tao_impl = @@ -6713,18 +6713,18 @@ void POA_CORBA_UnionDef::_get_discriminator_type_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->discriminator_type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -6733,7 +6733,7 @@ void POA_CORBA_UnionDef::_get_discriminator_type_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -6741,12 +6741,12 @@ void POA_CORBA_UnionDef::_get_discriminator_type_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -6774,7 +6774,7 @@ void POA_CORBA_UnionDef::_get_discriminator_type_def_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_UnionDef *_tao_impl = @@ -6795,18 +6795,18 @@ void POA_CORBA_UnionDef::_get_discriminator_type_def_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->discriminator_type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -6815,7 +6815,7 @@ void POA_CORBA_UnionDef::_get_discriminator_type_def_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -6823,12 +6823,12 @@ void POA_CORBA_UnionDef::_get_discriminator_type_def_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -6856,7 +6856,7 @@ void POA_CORBA_UnionDef::_set_discriminator_type_def_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -6885,25 +6885,25 @@ void POA_CORBA_UnionDef::_set_discriminator_type_def_skel ( _tao_upcall, _tao_impl, discriminator_type_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->discriminator_type_def ( discriminator_type_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -6911,12 +6911,12 @@ void POA_CORBA_UnionDef::_set_discriminator_type_def_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -6937,7 +6937,7 @@ void POA_CORBA_UnionDef::_get_members_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_UnionDef *_tao_impl = @@ -6958,18 +6958,18 @@ void POA_CORBA_UnionDef::_get_members_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->members ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -6978,7 +6978,7 @@ void POA_CORBA_UnionDef::_get_members_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -6986,12 +6986,12 @@ void POA_CORBA_UnionDef::_get_members_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7019,7 +7019,7 @@ void POA_CORBA_UnionDef::_set_members_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -7048,25 +7048,25 @@ void POA_CORBA_UnionDef::_set_members_skel ( _tao_upcall, _tao_impl, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->members ( members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7074,12 +7074,12 @@ void POA_CORBA_UnionDef::_set_members_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7100,7 +7100,7 @@ void POA_CORBA_UnionDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -7110,7 +7110,7 @@ void POA_CORBA_UnionDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -7123,11 +7123,11 @@ void POA_CORBA_UnionDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_UnionDef *_tao_impl = (POA_CORBA_UnionDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -7140,7 +7140,7 @@ void POA_CORBA_UnionDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_UnionDef *_tao_impl = (POA_CORBA_UnionDef *) _tao_object_reference; @@ -7159,7 +7159,7 @@ void POA_CORBA_UnionDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -7186,10 +7186,10 @@ void POA_CORBA_UnionDef::_interface_skel ( CORBA::Boolean POA_CORBA_UnionDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -7226,12 +7226,12 @@ void* POA_CORBA_UnionDef::_downcast ( return 0; } -void POA_CORBA_UnionDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_UnionDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -7241,9 +7241,9 @@ const char* POA_CORBA_UnionDef::_interface_repository_id (void) const } CORBA_UnionDef* -POA_CORBA_UnionDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_UnionDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -7412,31 +7412,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_EnumDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_EnumMemberSeq * result); @@ -7454,44 +7454,44 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_get::TAO_ServerRequestInfo_CORBA_Enu TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_EnumDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_EnumDef_members_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_EnumDef_members_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_EnumDef_members_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_EnumDef_members_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_EnumDef_members_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_EnumDef_members_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -7503,7 +7503,7 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_get::result (TAO_ENV_SINGLE_ARG_DECL char * TAO_ServerRequestInfo_CORBA_EnumDef_members_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -7513,10 +7513,10 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_get::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_EnumDef_members_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -7534,31 +7534,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_EnumDef *tao_impl , const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -7577,7 +7577,7 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_set::TAO_ServerRequestInfo_CORBA_Enu TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_EnumDef *tao_impl, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -7585,12 +7585,12 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_set::TAO_ServerRequestInfo_CORBA_Enu {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_EnumDef_members_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_EnumDef_members_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -7606,25 +7606,25 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_set::arguments (TAO_ENV_SINGLE_ARG_D } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_EnumDef_members_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_EnumDef_members_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_EnumDef_members_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_EnumDef_members_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -7632,7 +7632,7 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_set::result (TAO_ENV_SINGLE_ARG_DECL char * TAO_ServerRequestInfo_CORBA_EnumDef_members_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -7642,10 +7642,10 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_set::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_EnumDef_members_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -7678,17 +7678,17 @@ _TAO_CORBA_EnumDef_Strategized_Proxy_Broker::~_TAO_CORBA_EnumDef_Strategized_Pro _TAO_CORBA_EnumDef_Proxy_Impl& _TAO_CORBA_EnumDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_EnumDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -7698,7 +7698,7 @@ _TAO_CORBA_EnumDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_EnumDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -7768,7 +7768,7 @@ _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::_TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl (vo CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::members ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7784,7 +7784,7 @@ CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::members ( _collocated_tao_target_->_object_key (), "members", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7793,14 +7793,14 @@ CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::members ( "IDL:omg.org/CORBA/EnumDef:1.0" ) )->members ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::members ( CORBA_Object *_collocated_tao_target_, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7814,7 +7814,7 @@ void _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::members ( _collocated_tao_target_->_object_key (), "members", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -7824,7 +7824,7 @@ void _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::members ( ) )->members ( members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -7857,7 +7857,7 @@ void POA_CORBA_EnumDef::_get_members_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_EnumDef *_tao_impl = @@ -7878,18 +7878,18 @@ void POA_CORBA_EnumDef::_get_members_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->members ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7898,7 +7898,7 @@ void POA_CORBA_EnumDef::_get_members_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7906,12 +7906,12 @@ void POA_CORBA_EnumDef::_get_members_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7939,7 +7939,7 @@ void POA_CORBA_EnumDef::_set_members_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -7968,25 +7968,25 @@ void POA_CORBA_EnumDef::_set_members_skel ( _tao_upcall, _tao_impl, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->members ( members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7994,12 +7994,12 @@ void POA_CORBA_EnumDef::_set_members_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8020,7 +8020,7 @@ void POA_CORBA_EnumDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8030,7 +8030,7 @@ void POA_CORBA_EnumDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -8043,11 +8043,11 @@ void POA_CORBA_EnumDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_EnumDef *_tao_impl = (POA_CORBA_EnumDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -8060,7 +8060,7 @@ void POA_CORBA_EnumDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_EnumDef *_tao_impl = (POA_CORBA_EnumDef *) _tao_object_reference; @@ -8079,7 +8079,7 @@ void POA_CORBA_EnumDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -8106,10 +8106,10 @@ void POA_CORBA_EnumDef::_interface_skel ( CORBA::Boolean POA_CORBA_EnumDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -8143,12 +8143,12 @@ void* POA_CORBA_EnumDef::_downcast ( return 0; } -void POA_CORBA_EnumDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_EnumDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -8158,9 +8158,9 @@ const char* POA_CORBA_EnumDef::_interface_repository_id (void) const } CORBA_EnumDef* -POA_CORBA_EnumDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_EnumDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -8329,31 +8329,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AliasDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_IDLType_ptr result); @@ -8371,44 +8371,44 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::TAO_ServerRequestInf TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_AliasDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -8420,7 +8420,7 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::result (TAO_ENV_SING char * TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -8430,10 +8430,10 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::target_most_derived_ CORBA::Boolean TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -8451,31 +8451,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AliasDef *tao_impl , CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -8494,7 +8494,7 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::TAO_ServerRequestInf TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_AliasDef *tao_impl, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -8502,12 +8502,12 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::TAO_ServerRequestInf {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -8523,25 +8523,25 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::arguments (TAO_ENV_S } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -8549,7 +8549,7 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::result (TAO_ENV_SING char * TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -8559,10 +8559,10 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::target_most_derived_ CORBA::Boolean TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -8595,17 +8595,17 @@ _TAO_CORBA_AliasDef_Strategized_Proxy_Broker::~_TAO_CORBA_AliasDef_Strategized_P _TAO_CORBA_AliasDef_Proxy_Impl& _TAO_CORBA_AliasDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_AliasDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -8615,7 +8615,7 @@ _TAO_CORBA_AliasDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_AliasDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -8685,7 +8685,7 @@ _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::_TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl ( CORBA_IDLType_ptr _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::original_type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -8701,7 +8701,7 @@ CORBA_IDLType_ptr _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::original_type_def ( _collocated_tao_target_->_object_key (), "original_type_def", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -8710,14 +8710,14 @@ CORBA_IDLType_ptr _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::original_type_def ( "IDL:omg.org/CORBA/AliasDef:1.0" ) )->original_type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::original_type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -8731,7 +8731,7 @@ void _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::original_type_def ( _collocated_tao_target_->_object_key (), "original_type_def", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -8741,7 +8741,7 @@ void _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::original_type_def ( ) )->original_type_def ( original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -8774,7 +8774,7 @@ void POA_CORBA_AliasDef::_get_original_type_def_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_AliasDef *_tao_impl = @@ -8795,18 +8795,18 @@ void POA_CORBA_AliasDef::_get_original_type_def_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->original_type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8815,7 +8815,7 @@ void POA_CORBA_AliasDef::_get_original_type_def_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8823,12 +8823,12 @@ void POA_CORBA_AliasDef::_get_original_type_def_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8856,7 +8856,7 @@ void POA_CORBA_AliasDef::_set_original_type_def_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8885,25 +8885,25 @@ void POA_CORBA_AliasDef::_set_original_type_def_skel ( _tao_upcall, _tao_impl, original_type_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->original_type_def ( original_type_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8911,12 +8911,12 @@ void POA_CORBA_AliasDef::_set_original_type_def_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8937,7 +8937,7 @@ void POA_CORBA_AliasDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8947,7 +8947,7 @@ void POA_CORBA_AliasDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -8960,11 +8960,11 @@ void POA_CORBA_AliasDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_AliasDef *_tao_impl = (POA_CORBA_AliasDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -8977,7 +8977,7 @@ void POA_CORBA_AliasDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_AliasDef *_tao_impl = (POA_CORBA_AliasDef *) _tao_object_reference; @@ -8996,7 +8996,7 @@ void POA_CORBA_AliasDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -9023,10 +9023,10 @@ void POA_CORBA_AliasDef::_interface_skel ( CORBA::Boolean POA_CORBA_AliasDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -9060,12 +9060,12 @@ void* POA_CORBA_AliasDef::_downcast ( return 0; } -void POA_CORBA_AliasDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_AliasDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -9075,9 +9075,9 @@ const char* POA_CORBA_AliasDef::_interface_repository_id (void) const } CORBA_AliasDef* -POA_CORBA_AliasDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_AliasDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -9267,17 +9267,17 @@ _TAO_CORBA_NativeDef_Strategized_Proxy_Broker::~_TAO_CORBA_NativeDef_Strategized _TAO_CORBA_NativeDef_Proxy_Impl& _TAO_CORBA_NativeDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_NativeDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -9287,7 +9287,7 @@ _TAO_CORBA_NativeDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_NativeDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -9383,7 +9383,7 @@ void POA_CORBA_NativeDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -9393,7 +9393,7 @@ void POA_CORBA_NativeDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -9406,11 +9406,11 @@ void POA_CORBA_NativeDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_NativeDef *_tao_impl = (POA_CORBA_NativeDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -9423,7 +9423,7 @@ void POA_CORBA_NativeDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_NativeDef *_tao_impl = (POA_CORBA_NativeDef *) _tao_object_reference; @@ -9442,7 +9442,7 @@ void POA_CORBA_NativeDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -9469,10 +9469,10 @@ void POA_CORBA_NativeDef::_interface_skel ( CORBA::Boolean POA_CORBA_NativeDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -9506,12 +9506,12 @@ void* POA_CORBA_NativeDef::_downcast ( return 0; } -void POA_CORBA_NativeDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_NativeDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -9521,9 +9521,9 @@ const char* POA_CORBA_NativeDef::_interface_repository_id (void) const } CORBA_NativeDef* -POA_CORBA_NativeDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_NativeDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -9660,31 +9660,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_PrimitiveDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::PrimitiveKind result); @@ -9702,44 +9702,44 @@ TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::TAO_ServerRequestInfo_CORBA_P TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_PrimitiveDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -9751,7 +9751,7 @@ TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::result (TAO_ENV_SINGLE_ARG_DE char * TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -9761,10 +9761,10 @@ TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -9804,17 +9804,17 @@ _TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker::~_TAO_CORBA_PrimitiveDef_Strat _TAO_CORBA_PrimitiveDef_Proxy_Impl& _TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_PrimitiveDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -9824,7 +9824,7 @@ _TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -9894,7 +9894,7 @@ _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl::_TAO_CORBA_PrimitiveDef_ThruPOA_Prox CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl::kind ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -9910,7 +9910,7 @@ CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl::kind ( _collocated_tao_target_->_object_key (), "kind", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -9919,7 +9919,7 @@ CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl::kind ( "IDL:omg.org/CORBA/PrimitiveDef:1.0" ) )->kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -9949,7 +9949,7 @@ void POA_CORBA_PrimitiveDef::_get_kind_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_PrimitiveDef *_tao_impl = @@ -9970,18 +9970,18 @@ void POA_CORBA_PrimitiveDef::_get_kind_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -9989,7 +9989,7 @@ void POA_CORBA_PrimitiveDef::_get_kind_skel ( CORBA::PrimitiveKind _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -9997,12 +9997,12 @@ void POA_CORBA_PrimitiveDef::_get_kind_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -10030,7 +10030,7 @@ void POA_CORBA_PrimitiveDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -10040,7 +10040,7 @@ void POA_CORBA_PrimitiveDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -10053,11 +10053,11 @@ void POA_CORBA_PrimitiveDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_PrimitiveDef *_tao_impl = (POA_CORBA_PrimitiveDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -10070,7 +10070,7 @@ void POA_CORBA_PrimitiveDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_PrimitiveDef *_tao_impl = (POA_CORBA_PrimitiveDef *) _tao_object_reference; @@ -10089,7 +10089,7 @@ void POA_CORBA_PrimitiveDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -10116,10 +10116,10 @@ void POA_CORBA_PrimitiveDef::_interface_skel ( CORBA::Boolean POA_CORBA_PrimitiveDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -10147,12 +10147,12 @@ void* POA_CORBA_PrimitiveDef::_downcast ( return 0; } -void POA_CORBA_PrimitiveDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_PrimitiveDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -10162,9 +10162,9 @@ const char* POA_CORBA_PrimitiveDef::_interface_repository_id (void) const } CORBA_PrimitiveDef* -POA_CORBA_PrimitiveDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_PrimitiveDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -10321,31 +10321,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_StringDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::ULong result); @@ -10363,44 +10363,44 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_get::TAO_ServerRequestInfo_CORBA_Str TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_StringDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_StringDef_bound_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_StringDef_bound_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_StringDef_bound_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_StringDef_bound_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_StringDef_bound_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_StringDef_bound_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -10412,7 +10412,7 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_get::result (TAO_ENV_SINGLE_ARG_DECL char * TAO_ServerRequestInfo_CORBA_StringDef_bound_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -10422,10 +10422,10 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_get::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_StringDef_bound_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -10443,31 +10443,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_StringDef *tao_impl , const CORBA::ULong & bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -10486,7 +10486,7 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_set::TAO_ServerRequestInfo_CORBA_Str TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_StringDef *tao_impl, const CORBA::ULong & bound - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -10494,12 +10494,12 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_set::TAO_ServerRequestInfo_CORBA_Str {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_StringDef_bound_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_StringDef_bound_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -10515,25 +10515,25 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_set::arguments (TAO_ENV_SINGLE_ARG_D } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_StringDef_bound_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_StringDef_bound_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_StringDef_bound_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_StringDef_bound_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -10541,7 +10541,7 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_set::result (TAO_ENV_SINGLE_ARG_DECL char * TAO_ServerRequestInfo_CORBA_StringDef_bound_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -10551,10 +10551,10 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_set::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_StringDef_bound_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -10587,17 +10587,17 @@ _TAO_CORBA_StringDef_Strategized_Proxy_Broker::~_TAO_CORBA_StringDef_Strategized _TAO_CORBA_StringDef_Proxy_Impl& _TAO_CORBA_StringDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_StringDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -10607,7 +10607,7 @@ _TAO_CORBA_StringDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_StringDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -10677,7 +10677,7 @@ _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::_TAO_CORBA_StringDef_ThruPOA_Proxy_Impl CORBA::ULong _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::bound ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -10693,7 +10693,7 @@ CORBA::ULong _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::bound ( _collocated_tao_target_->_object_key (), "bound", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -10702,14 +10702,14 @@ CORBA::ULong _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::bound ( "IDL:omg.org/CORBA/StringDef:1.0" ) )->bound ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::bound ( CORBA_Object *_collocated_tao_target_, CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -10723,7 +10723,7 @@ void _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::bound ( _collocated_tao_target_->_object_key (), "bound", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -10733,7 +10733,7 @@ void _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::bound ( ) )->bound ( bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -10764,7 +10764,7 @@ void POA_CORBA_StringDef::_get_bound_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_StringDef *_tao_impl = @@ -10785,18 +10785,18 @@ void POA_CORBA_StringDef::_get_bound_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->bound ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -10804,7 +10804,7 @@ void POA_CORBA_StringDef::_get_bound_skel ( CORBA::ULong _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -10812,12 +10812,12 @@ void POA_CORBA_StringDef::_get_bound_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -10845,7 +10845,7 @@ void POA_CORBA_StringDef::_set_bound_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -10874,25 +10874,25 @@ void POA_CORBA_StringDef::_set_bound_skel ( _tao_upcall, _tao_impl, bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->bound ( bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -10900,12 +10900,12 @@ void POA_CORBA_StringDef::_set_bound_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -10926,7 +10926,7 @@ void POA_CORBA_StringDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -10936,7 +10936,7 @@ void POA_CORBA_StringDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -10949,11 +10949,11 @@ void POA_CORBA_StringDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_StringDef *_tao_impl = (POA_CORBA_StringDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -10966,7 +10966,7 @@ void POA_CORBA_StringDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_StringDef *_tao_impl = (POA_CORBA_StringDef *) _tao_object_reference; @@ -10985,7 +10985,7 @@ void POA_CORBA_StringDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -11012,10 +11012,10 @@ void POA_CORBA_StringDef::_interface_skel ( CORBA::Boolean POA_CORBA_StringDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -11043,12 +11043,12 @@ void* POA_CORBA_StringDef::_downcast ( return 0; } -void POA_CORBA_StringDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_StringDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -11058,9 +11058,9 @@ const char* POA_CORBA_StringDef::_interface_repository_id (void) const } CORBA_StringDef* -POA_CORBA_StringDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_StringDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -11217,31 +11217,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_WstringDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::ULong result); @@ -11259,44 +11259,44 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::TAO_ServerRequestInfo_CORBA_Ws TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_WstringDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -11308,7 +11308,7 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::result (TAO_ENV_SINGLE_ARG_DEC char * TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -11318,10 +11318,10 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -11339,31 +11339,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_WstringDef *tao_impl , const CORBA::ULong & bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -11382,7 +11382,7 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::TAO_ServerRequestInfo_CORBA_Ws TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_WstringDef *tao_impl, const CORBA::ULong & bound - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -11390,12 +11390,12 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::TAO_ServerRequestInfo_CORBA_Ws {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -11411,25 +11411,25 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::arguments (TAO_ENV_SINGLE_ARG_ } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -11437,7 +11437,7 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::result (TAO_ENV_SINGLE_ARG_DEC char * TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -11447,10 +11447,10 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -11483,17 +11483,17 @@ _TAO_CORBA_WstringDef_Strategized_Proxy_Broker::~_TAO_CORBA_WstringDef_Strategiz _TAO_CORBA_WstringDef_Proxy_Impl& _TAO_CORBA_WstringDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_WstringDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -11503,7 +11503,7 @@ _TAO_CORBA_WstringDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_WstringDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -11573,7 +11573,7 @@ _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::_TAO_CORBA_WstringDef_ThruPOA_Proxy_Im CORBA::ULong _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::bound ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -11589,7 +11589,7 @@ CORBA::ULong _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::bound ( _collocated_tao_target_->_object_key (), "bound", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -11598,14 +11598,14 @@ CORBA::ULong _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::bound ( "IDL:omg.org/CORBA/WstringDef:1.0" ) )->bound ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::bound ( CORBA_Object *_collocated_tao_target_, CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -11619,7 +11619,7 @@ void _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::bound ( _collocated_tao_target_->_object_key (), "bound", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -11629,7 +11629,7 @@ void _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::bound ( ) )->bound ( bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -11660,7 +11660,7 @@ void POA_CORBA_WstringDef::_get_bound_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_WstringDef *_tao_impl = @@ -11681,18 +11681,18 @@ void POA_CORBA_WstringDef::_get_bound_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->bound ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -11700,7 +11700,7 @@ void POA_CORBA_WstringDef::_get_bound_skel ( CORBA::ULong _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -11708,12 +11708,12 @@ void POA_CORBA_WstringDef::_get_bound_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -11741,7 +11741,7 @@ void POA_CORBA_WstringDef::_set_bound_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -11770,25 +11770,25 @@ void POA_CORBA_WstringDef::_set_bound_skel ( _tao_upcall, _tao_impl, bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->bound ( bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -11796,12 +11796,12 @@ void POA_CORBA_WstringDef::_set_bound_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -11822,7 +11822,7 @@ void POA_CORBA_WstringDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -11832,7 +11832,7 @@ void POA_CORBA_WstringDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -11845,11 +11845,11 @@ void POA_CORBA_WstringDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_WstringDef *_tao_impl = (POA_CORBA_WstringDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -11862,7 +11862,7 @@ void POA_CORBA_WstringDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_WstringDef *_tao_impl = (POA_CORBA_WstringDef *) _tao_object_reference; @@ -11881,7 +11881,7 @@ void POA_CORBA_WstringDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -11908,10 +11908,10 @@ void POA_CORBA_WstringDef::_interface_skel ( CORBA::Boolean POA_CORBA_WstringDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -11939,12 +11939,12 @@ void* POA_CORBA_WstringDef::_downcast ( return 0; } -void POA_CORBA_WstringDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_WstringDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -11954,9 +11954,9 @@ const char* POA_CORBA_WstringDef::_interface_repository_id (void) const } CORBA_WstringDef* -POA_CORBA_WstringDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_WstringDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -12116,31 +12116,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_SequenceDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::ULong result); @@ -12158,44 +12158,44 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::TAO_ServerRequestInfo_CORBA_S TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_SequenceDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -12207,7 +12207,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::result (TAO_ENV_SINGLE_ARG_DE char * TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -12217,10 +12217,10 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -12238,31 +12238,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_SequenceDef *tao_impl , const CORBA::ULong & bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -12281,7 +12281,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::TAO_ServerRequestInfo_CORBA_S TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_SequenceDef *tao_impl, const CORBA::ULong & bound - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -12289,12 +12289,12 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::TAO_ServerRequestInfo_CORBA_S {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -12310,25 +12310,25 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::arguments (TAO_ENV_SINGLE_ARG } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -12336,7 +12336,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::result (TAO_ENV_SINGLE_ARG_DE char * TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -12346,10 +12346,10 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get : public TAO_ServerRequestInfo @@ -12359,31 +12359,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_SequenceDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::TypeCode_ptr result); @@ -12401,44 +12401,44 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::TAO_ServerRequestInfo_ TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_SequenceDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -12450,7 +12450,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::result (TAO_ENV_SINGLE char * TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -12460,10 +12460,10 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::target_most_derived_in CORBA::Boolean TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -12480,31 +12480,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_SequenceDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_IDLType_ptr result); @@ -12522,44 +12522,44 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::TAO_ServerRequestI TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_SequenceDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -12571,7 +12571,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::result (TAO_ENV_SI char * TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -12581,10 +12581,10 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::target_most_derive CORBA::Boolean TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -12602,31 +12602,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_SequenceDef *tao_impl , CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -12645,7 +12645,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::TAO_ServerRequestI TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_SequenceDef *tao_impl, CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -12653,12 +12653,12 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::TAO_ServerRequestI {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -12674,25 +12674,25 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::arguments (TAO_ENV } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -12700,7 +12700,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::result (TAO_ENV_SI char * TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -12710,10 +12710,10 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::target_most_derive CORBA::Boolean TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -12746,17 +12746,17 @@ _TAO_CORBA_SequenceDef_Strategized_Proxy_Broker::~_TAO_CORBA_SequenceDef_Strateg _TAO_CORBA_SequenceDef_Proxy_Impl& _TAO_CORBA_SequenceDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_SequenceDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -12766,7 +12766,7 @@ _TAO_CORBA_SequenceDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_SequenceDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -12836,7 +12836,7 @@ _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::_TAO_CORBA_SequenceDef_ThruPOA_Proxy_ CORBA::ULong _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::bound ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -12852,7 +12852,7 @@ CORBA::ULong _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::bound ( _collocated_tao_target_->_object_key (), "bound", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -12861,14 +12861,14 @@ CORBA::ULong _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::bound ( "IDL:omg.org/CORBA/SequenceDef:1.0" ) )->bound ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::bound ( CORBA_Object *_collocated_tao_target_, CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -12882,7 +12882,7 @@ void _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::bound ( _collocated_tao_target_->_object_key (), "bound", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -12892,14 +12892,14 @@ void _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::bound ( ) )->bound ( bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -12915,7 +12915,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type ( _collocated_tao_target_->_object_key (), "element_type", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -12924,13 +12924,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type ( "IDL:omg.org/CORBA/SequenceDef:1.0" ) )->element_type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -12946,7 +12946,7 @@ CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type_def ( _collocated_tao_target_->_object_key (), "element_type_def", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -12955,14 +12955,14 @@ CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type_def ( "IDL:omg.org/CORBA/SequenceDef:1.0" ) )->element_type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -12976,7 +12976,7 @@ void _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type_def ( _collocated_tao_target_->_object_key (), "element_type_def", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -12986,7 +12986,7 @@ void _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type_def ( ) )->element_type_def ( element_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -13017,7 +13017,7 @@ void POA_CORBA_SequenceDef::_get_bound_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_SequenceDef *_tao_impl = @@ -13038,18 +13038,18 @@ void POA_CORBA_SequenceDef::_get_bound_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->bound ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -13057,7 +13057,7 @@ void POA_CORBA_SequenceDef::_get_bound_skel ( CORBA::ULong _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -13065,12 +13065,12 @@ void POA_CORBA_SequenceDef::_get_bound_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -13098,7 +13098,7 @@ void POA_CORBA_SequenceDef::_set_bound_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -13127,25 +13127,25 @@ void POA_CORBA_SequenceDef::_set_bound_skel ( _tao_upcall, _tao_impl, bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->bound ( bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -13153,12 +13153,12 @@ void POA_CORBA_SequenceDef::_set_bound_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -13179,7 +13179,7 @@ void POA_CORBA_SequenceDef::_get_element_type_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_SequenceDef *_tao_impl = @@ -13200,18 +13200,18 @@ void POA_CORBA_SequenceDef::_get_element_type_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->element_type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -13220,7 +13220,7 @@ void POA_CORBA_SequenceDef::_get_element_type_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -13228,12 +13228,12 @@ void POA_CORBA_SequenceDef::_get_element_type_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -13261,7 +13261,7 @@ void POA_CORBA_SequenceDef::_get_element_type_def_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_SequenceDef *_tao_impl = @@ -13282,18 +13282,18 @@ void POA_CORBA_SequenceDef::_get_element_type_def_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->element_type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -13302,7 +13302,7 @@ void POA_CORBA_SequenceDef::_get_element_type_def_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -13310,12 +13310,12 @@ void POA_CORBA_SequenceDef::_get_element_type_def_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -13343,7 +13343,7 @@ void POA_CORBA_SequenceDef::_set_element_type_def_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -13372,25 +13372,25 @@ void POA_CORBA_SequenceDef::_set_element_type_def_skel ( _tao_upcall, _tao_impl, element_type_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->element_type_def ( element_type_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -13398,12 +13398,12 @@ void POA_CORBA_SequenceDef::_set_element_type_def_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -13424,7 +13424,7 @@ void POA_CORBA_SequenceDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -13434,7 +13434,7 @@ void POA_CORBA_SequenceDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -13447,11 +13447,11 @@ void POA_CORBA_SequenceDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_SequenceDef *_tao_impl = (POA_CORBA_SequenceDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -13464,7 +13464,7 @@ void POA_CORBA_SequenceDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_SequenceDef *_tao_impl = (POA_CORBA_SequenceDef *) _tao_object_reference; @@ -13483,7 +13483,7 @@ void POA_CORBA_SequenceDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -13510,10 +13510,10 @@ void POA_CORBA_SequenceDef::_interface_skel ( CORBA::Boolean POA_CORBA_SequenceDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -13541,12 +13541,12 @@ void* POA_CORBA_SequenceDef::_downcast ( return 0; } -void POA_CORBA_SequenceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_SequenceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -13556,9 +13556,9 @@ const char* POA_CORBA_SequenceDef::_interface_repository_id (void) const } CORBA_SequenceDef* -POA_CORBA_SequenceDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_SequenceDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -13718,31 +13718,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ArrayDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::ULong result); @@ -13760,44 +13760,44 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::TAO_ServerRequestInfo_CORBA_Arr TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ArrayDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -13809,7 +13809,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::result (TAO_ENV_SINGLE_ARG_DECL char * TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -13819,10 +13819,10 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -13840,31 +13840,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ArrayDef *tao_impl , const CORBA::ULong & length - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -13883,7 +13883,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::TAO_ServerRequestInfo_CORBA_Arr TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ArrayDef *tao_impl, const CORBA::ULong & length - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -13891,12 +13891,12 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::TAO_ServerRequestInfo_CORBA_Arr {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -13912,25 +13912,25 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::arguments (TAO_ENV_SINGLE_ARG_D } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -13938,7 +13938,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::result (TAO_ENV_SINGLE_ARG_DECL char * TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -13948,10 +13948,10 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get : public TAO_ServerRequestInfo @@ -13961,31 +13961,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ArrayDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::TypeCode_ptr result); @@ -14003,44 +14003,44 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::TAO_ServerRequestInfo_COR TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ArrayDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -14052,7 +14052,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::result (TAO_ENV_SINGLE_AR char * TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -14062,10 +14062,10 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::target_most_derived_inter CORBA::Boolean TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -14082,31 +14082,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ArrayDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_IDLType_ptr result); @@ -14124,44 +14124,44 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::TAO_ServerRequestInfo TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ArrayDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -14173,7 +14173,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::result (TAO_ENV_SINGL char * TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -14183,10 +14183,10 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::target_most_derived_i CORBA::Boolean TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -14204,31 +14204,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ArrayDef *tao_impl , CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -14247,7 +14247,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::TAO_ServerRequestInfo TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ArrayDef *tao_impl, CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -14255,12 +14255,12 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::TAO_ServerRequestInfo {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -14276,25 +14276,25 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::arguments (TAO_ENV_SI } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -14302,7 +14302,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::result (TAO_ENV_SINGL char * TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -14312,10 +14312,10 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::target_most_derived_i CORBA::Boolean TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -14348,17 +14348,17 @@ _TAO_CORBA_ArrayDef_Strategized_Proxy_Broker::~_TAO_CORBA_ArrayDef_Strategized_P _TAO_CORBA_ArrayDef_Proxy_Impl& _TAO_CORBA_ArrayDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_ArrayDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -14368,7 +14368,7 @@ _TAO_CORBA_ArrayDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_ArrayDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -14438,7 +14438,7 @@ _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::_TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl ( CORBA::ULong _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::length ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -14454,7 +14454,7 @@ CORBA::ULong _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::length ( _collocated_tao_target_->_object_key (), "length", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -14463,14 +14463,14 @@ CORBA::ULong _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::length ( "IDL:omg.org/CORBA/ArrayDef:1.0" ) )->length ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::length ( CORBA_Object *_collocated_tao_target_, CORBA::ULong length - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -14484,7 +14484,7 @@ void _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::length ( _collocated_tao_target_->_object_key (), "length", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -14494,14 +14494,14 @@ void _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::length ( ) )->length ( length - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -14517,7 +14517,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type ( _collocated_tao_target_->_object_key (), "element_type", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -14526,13 +14526,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type ( "IDL:omg.org/CORBA/ArrayDef:1.0" ) )->element_type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -14548,7 +14548,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type_def ( _collocated_tao_target_->_object_key (), "element_type_def", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -14557,14 +14557,14 @@ CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type_def ( "IDL:omg.org/CORBA/ArrayDef:1.0" ) )->element_type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -14578,7 +14578,7 @@ void _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type_def ( _collocated_tao_target_->_object_key (), "element_type_def", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -14588,7 +14588,7 @@ void _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type_def ( ) )->element_type_def ( element_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -14619,7 +14619,7 @@ void POA_CORBA_ArrayDef::_get_length_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ArrayDef *_tao_impl = @@ -14640,18 +14640,18 @@ void POA_CORBA_ArrayDef::_get_length_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->length ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -14659,7 +14659,7 @@ void POA_CORBA_ArrayDef::_get_length_skel ( CORBA::ULong _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -14667,12 +14667,12 @@ void POA_CORBA_ArrayDef::_get_length_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -14700,7 +14700,7 @@ void POA_CORBA_ArrayDef::_set_length_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -14729,25 +14729,25 @@ void POA_CORBA_ArrayDef::_set_length_skel ( _tao_upcall, _tao_impl, length - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->length ( length - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -14755,12 +14755,12 @@ void POA_CORBA_ArrayDef::_set_length_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -14781,7 +14781,7 @@ void POA_CORBA_ArrayDef::_get_element_type_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ArrayDef *_tao_impl = @@ -14802,18 +14802,18 @@ void POA_CORBA_ArrayDef::_get_element_type_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->element_type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -14822,7 +14822,7 @@ void POA_CORBA_ArrayDef::_get_element_type_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -14830,12 +14830,12 @@ void POA_CORBA_ArrayDef::_get_element_type_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -14863,7 +14863,7 @@ void POA_CORBA_ArrayDef::_get_element_type_def_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ArrayDef *_tao_impl = @@ -14884,18 +14884,18 @@ void POA_CORBA_ArrayDef::_get_element_type_def_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->element_type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -14904,7 +14904,7 @@ void POA_CORBA_ArrayDef::_get_element_type_def_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -14912,12 +14912,12 @@ void POA_CORBA_ArrayDef::_get_element_type_def_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -14945,7 +14945,7 @@ void POA_CORBA_ArrayDef::_set_element_type_def_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -14974,25 +14974,25 @@ void POA_CORBA_ArrayDef::_set_element_type_def_skel ( _tao_upcall, _tao_impl, element_type_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->element_type_def ( element_type_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -15000,12 +15000,12 @@ void POA_CORBA_ArrayDef::_set_element_type_def_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -15026,7 +15026,7 @@ void POA_CORBA_ArrayDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -15036,7 +15036,7 @@ void POA_CORBA_ArrayDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -15049,11 +15049,11 @@ void POA_CORBA_ArrayDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ArrayDef *_tao_impl = (POA_CORBA_ArrayDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -15066,7 +15066,7 @@ void POA_CORBA_ArrayDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ArrayDef *_tao_impl = (POA_CORBA_ArrayDef *) _tao_object_reference; @@ -15085,7 +15085,7 @@ void POA_CORBA_ArrayDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -15112,10 +15112,10 @@ void POA_CORBA_ArrayDef::_interface_skel ( CORBA::Boolean POA_CORBA_ArrayDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -15143,12 +15143,12 @@ void* POA_CORBA_ArrayDef::_downcast ( return 0; } -void POA_CORBA_ArrayDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_ArrayDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -15158,9 +15158,9 @@ const char* POA_CORBA_ArrayDef::_interface_repository_id (void) const } CORBA_ArrayDef* -POA_CORBA_ArrayDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_ArrayDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -15348,31 +15348,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ExceptionDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::TypeCode_ptr result); @@ -15390,44 +15390,44 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::TAO_ServerRequestInfo_CORBA_E TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ExceptionDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -15439,7 +15439,7 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::result (TAO_ENV_SINGLE_ARG_DE char * TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -15449,10 +15449,10 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -15469,31 +15469,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ExceptionDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_StructMemberSeq * result); @@ -15511,44 +15511,44 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::TAO_ServerRequestInfo_CORB TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ExceptionDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -15560,7 +15560,7 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::result (TAO_ENV_SINGLE_ARG char * TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -15570,10 +15570,10 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::target_most_derived_interf CORBA::Boolean TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -15591,31 +15591,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ExceptionDef *tao_impl , const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -15634,7 +15634,7 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::TAO_ServerRequestInfo_CORB TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ExceptionDef *tao_impl, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -15642,12 +15642,12 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::TAO_ServerRequestInfo_CORB {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -15663,25 +15663,25 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::arguments (TAO_ENV_SINGLE_ } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -15689,7 +15689,7 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::result (TAO_ENV_SINGLE_ARG char * TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -15699,10 +15699,10 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::target_most_derived_interf CORBA::Boolean TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -15735,17 +15735,17 @@ _TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker::~_TAO_CORBA_ExceptionDef_Strat _TAO_CORBA_ExceptionDef_Proxy_Impl& _TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_ExceptionDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -15755,7 +15755,7 @@ _TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -15825,7 +15825,7 @@ _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::_TAO_CORBA_ExceptionDef_ThruPOA_Prox CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -15841,7 +15841,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::type ( _collocated_tao_target_->_object_key (), "type", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -15850,13 +15850,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::type ( "IDL:omg.org/CORBA/ExceptionDef:1.0" ) )->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::members ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -15872,7 +15872,7 @@ CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::members ( _collocated_tao_target_->_object_key (), "members", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -15881,14 +15881,14 @@ CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::members ( "IDL:omg.org/CORBA/ExceptionDef:1.0" ) )->members ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::members ( CORBA_Object *_collocated_tao_target_, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -15902,7 +15902,7 @@ void _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::members ( _collocated_tao_target_->_object_key (), "members", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -15912,7 +15912,7 @@ void _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::members ( ) )->members ( members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -15944,7 +15944,7 @@ void POA_CORBA_ExceptionDef::_get_type_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ExceptionDef *_tao_impl = @@ -15965,18 +15965,18 @@ void POA_CORBA_ExceptionDef::_get_type_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -15985,7 +15985,7 @@ void POA_CORBA_ExceptionDef::_get_type_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -15993,12 +15993,12 @@ void POA_CORBA_ExceptionDef::_get_type_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -16026,7 +16026,7 @@ void POA_CORBA_ExceptionDef::_get_members_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ExceptionDef *_tao_impl = @@ -16047,18 +16047,18 @@ void POA_CORBA_ExceptionDef::_get_members_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->members ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -16067,7 +16067,7 @@ void POA_CORBA_ExceptionDef::_get_members_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -16075,12 +16075,12 @@ void POA_CORBA_ExceptionDef::_get_members_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -16108,7 +16108,7 @@ void POA_CORBA_ExceptionDef::_set_members_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -16137,25 +16137,25 @@ void POA_CORBA_ExceptionDef::_set_members_skel ( _tao_upcall, _tao_impl, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->members ( members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -16163,12 +16163,12 @@ void POA_CORBA_ExceptionDef::_set_members_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -16189,7 +16189,7 @@ void POA_CORBA_ExceptionDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -16199,7 +16199,7 @@ void POA_CORBA_ExceptionDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -16212,11 +16212,11 @@ void POA_CORBA_ExceptionDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ExceptionDef *_tao_impl = (POA_CORBA_ExceptionDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -16229,7 +16229,7 @@ void POA_CORBA_ExceptionDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ExceptionDef *_tao_impl = (POA_CORBA_ExceptionDef *) _tao_object_reference; @@ -16248,7 +16248,7 @@ void POA_CORBA_ExceptionDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -16275,10 +16275,10 @@ void POA_CORBA_ExceptionDef::_interface_skel ( CORBA::Boolean POA_CORBA_ExceptionDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -16309,12 +16309,12 @@ void* POA_CORBA_ExceptionDef::_downcast ( return 0; } -void POA_CORBA_ExceptionDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_ExceptionDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -16324,9 +16324,9 @@ const char* POA_CORBA_ExceptionDef::_interface_repository_id (void) const } CORBA_ExceptionDef* -POA_CORBA_ExceptionDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_ExceptionDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -16497,31 +16497,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AttributeDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::TypeCode_ptr result); @@ -16539,44 +16539,44 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::TAO_ServerRequestInfo_CORBA_A TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_AttributeDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -16588,7 +16588,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::result (TAO_ENV_SINGLE_ARG_DE char * TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -16598,10 +16598,10 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -16618,31 +16618,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AttributeDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_IDLType_ptr result); @@ -16660,44 +16660,44 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::TAO_ServerRequestInfo_COR TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_AttributeDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -16709,7 +16709,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::result (TAO_ENV_SINGLE_AR char * TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -16719,10 +16719,10 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::target_most_derived_inter CORBA::Boolean TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -16740,31 +16740,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AttributeDef *tao_impl , CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -16783,7 +16783,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::TAO_ServerRequestInfo_COR TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_AttributeDef *tao_impl, CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -16791,12 +16791,12 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::TAO_ServerRequestInfo_COR {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -16812,25 +16812,25 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::arguments (TAO_ENV_SINGLE } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -16838,7 +16838,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::result (TAO_ENV_SINGLE_AR char * TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -16848,10 +16848,10 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::target_most_derived_inter CORBA::Boolean TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get : public TAO_ServerRequestInfo @@ -16861,31 +16861,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AttributeDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::AttributeMode result); @@ -16903,44 +16903,44 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::TAO_ServerRequestInfo_CORBA_A TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_AttributeDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -16952,7 +16952,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::result (TAO_ENV_SINGLE_ARG_DE char * TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -16962,10 +16962,10 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -16983,31 +16983,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AttributeDef *tao_impl , CORBA::AttributeMode & mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -17026,7 +17026,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::TAO_ServerRequestInfo_CORBA_A TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_AttributeDef *tao_impl, CORBA::AttributeMode & mode - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -17034,12 +17034,12 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::TAO_ServerRequestInfo_CORBA_A {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -17055,25 +17055,25 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::arguments (TAO_ENV_SINGLE_ARG } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -17081,7 +17081,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::result (TAO_ENV_SINGLE_ARG_DE char * TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -17091,10 +17091,10 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -17127,17 +17127,17 @@ _TAO_CORBA_AttributeDef_Strategized_Proxy_Broker::~_TAO_CORBA_AttributeDef_Strat _TAO_CORBA_AttributeDef_Proxy_Impl& _TAO_CORBA_AttributeDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_AttributeDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -17147,7 +17147,7 @@ _TAO_CORBA_AttributeDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_AttributeDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -17217,7 +17217,7 @@ _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::_TAO_CORBA_AttributeDef_ThruPOA_Prox CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -17233,7 +17233,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type ( _collocated_tao_target_->_object_key (), "type", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -17242,13 +17242,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type ( "IDL:omg.org/CORBA/AttributeDef:1.0" ) )->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -17264,7 +17264,7 @@ CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type_def ( _collocated_tao_target_->_object_key (), "type_def", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -17273,14 +17273,14 @@ CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type_def ( "IDL:omg.org/CORBA/AttributeDef:1.0" ) )->type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -17294,7 +17294,7 @@ void _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type_def ( _collocated_tao_target_->_object_key (), "type_def", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -17304,14 +17304,14 @@ void _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type_def ( ) )->type_def ( type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } CORBA::AttributeMode _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::mode ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -17327,7 +17327,7 @@ CORBA::AttributeMode _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::mode ( _collocated_tao_target_->_object_key (), "mode", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -17336,14 +17336,14 @@ CORBA::AttributeMode _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::mode ( "IDL:omg.org/CORBA/AttributeDef:1.0" ) )->mode ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::mode ( CORBA_Object *_collocated_tao_target_, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -17357,7 +17357,7 @@ void _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::mode ( _collocated_tao_target_->_object_key (), "mode", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -17367,7 +17367,7 @@ void _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::mode ( ) )->mode ( mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -17398,7 +17398,7 @@ void POA_CORBA_AttributeDef::_get_type_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_AttributeDef *_tao_impl = @@ -17419,18 +17419,18 @@ void POA_CORBA_AttributeDef::_get_type_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -17439,7 +17439,7 @@ void POA_CORBA_AttributeDef::_get_type_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -17447,12 +17447,12 @@ void POA_CORBA_AttributeDef::_get_type_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -17480,7 +17480,7 @@ void POA_CORBA_AttributeDef::_get_type_def_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_AttributeDef *_tao_impl = @@ -17501,18 +17501,18 @@ void POA_CORBA_AttributeDef::_get_type_def_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -17521,7 +17521,7 @@ void POA_CORBA_AttributeDef::_get_type_def_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -17529,12 +17529,12 @@ void POA_CORBA_AttributeDef::_get_type_def_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -17562,7 +17562,7 @@ void POA_CORBA_AttributeDef::_set_type_def_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -17591,25 +17591,25 @@ void POA_CORBA_AttributeDef::_set_type_def_skel ( _tao_upcall, _tao_impl, type_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->type_def ( type_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -17617,12 +17617,12 @@ void POA_CORBA_AttributeDef::_set_type_def_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -17643,7 +17643,7 @@ void POA_CORBA_AttributeDef::_get_mode_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_AttributeDef *_tao_impl = @@ -17664,18 +17664,18 @@ void POA_CORBA_AttributeDef::_get_mode_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->mode ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -17683,7 +17683,7 @@ void POA_CORBA_AttributeDef::_get_mode_skel ( CORBA::AttributeMode _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -17691,12 +17691,12 @@ void POA_CORBA_AttributeDef::_get_mode_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -17724,7 +17724,7 @@ void POA_CORBA_AttributeDef::_set_mode_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -17753,25 +17753,25 @@ void POA_CORBA_AttributeDef::_set_mode_skel ( _tao_upcall, _tao_impl, mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->mode ( mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -17779,12 +17779,12 @@ void POA_CORBA_AttributeDef::_set_mode_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -17805,7 +17805,7 @@ void POA_CORBA_AttributeDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -17815,7 +17815,7 @@ void POA_CORBA_AttributeDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -17828,11 +17828,11 @@ void POA_CORBA_AttributeDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_AttributeDef *_tao_impl = (POA_CORBA_AttributeDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -17845,7 +17845,7 @@ void POA_CORBA_AttributeDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_AttributeDef *_tao_impl = (POA_CORBA_AttributeDef *) _tao_object_reference; @@ -17864,7 +17864,7 @@ void POA_CORBA_AttributeDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -17891,10 +17891,10 @@ void POA_CORBA_AttributeDef::_interface_skel ( CORBA::Boolean POA_CORBA_AttributeDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -17922,12 +17922,12 @@ void* POA_CORBA_AttributeDef::_downcast ( return 0; } -void POA_CORBA_AttributeDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_AttributeDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -17937,9 +17937,9 @@ const char* POA_CORBA_AttributeDef::_interface_repository_id (void) const } CORBA_AttributeDef* -POA_CORBA_AttributeDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_AttributeDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -18167,31 +18167,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::TypeCode_ptr result); @@ -18209,44 +18209,44 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_get::TAO_ServerRequestInfo_CORBA TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_OperationDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_OperationDef_result_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_result_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_OperationDef_result_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_result_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_OperationDef_result_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_result_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -18258,7 +18258,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_get::result (TAO_ENV_SINGLE_ARG_ char * TAO_ServerRequestInfo_CORBA_OperationDef_result_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -18268,10 +18268,10 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_get::target_most_derived_interfa CORBA::Boolean TAO_ServerRequestInfo_CORBA_OperationDef_result_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -18288,31 +18288,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_IDLType_ptr result); @@ -18330,44 +18330,44 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::TAO_ServerRequestInfo_C TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_OperationDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -18379,7 +18379,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::result (TAO_ENV_SINGLE_ char * TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -18389,10 +18389,10 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::target_most_derived_int CORBA::Boolean TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -18410,31 +18410,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl , CORBA_IDLType_ptr result_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -18453,7 +18453,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::TAO_ServerRequestInfo_C TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_OperationDef *tao_impl, CORBA_IDLType_ptr result_def - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -18461,12 +18461,12 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::TAO_ServerRequestInfo_C {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -18482,25 +18482,25 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::arguments (TAO_ENV_SING } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -18508,7 +18508,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::result (TAO_ENV_SINGLE_ char * TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -18518,10 +18518,10 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::target_most_derived_int CORBA::Boolean TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_OperationDef_params_get : public TAO_ServerRequestInfo @@ -18531,31 +18531,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_ParDescriptionSeq * result); @@ -18573,44 +18573,44 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_get::TAO_ServerRequestInfo_CORBA TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_OperationDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_OperationDef_params_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_params_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_OperationDef_params_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_params_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_OperationDef_params_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_params_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -18622,7 +18622,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_get::result (TAO_ENV_SINGLE_ARG_ char * TAO_ServerRequestInfo_CORBA_OperationDef_params_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -18632,10 +18632,10 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_get::target_most_derived_interfa CORBA::Boolean TAO_ServerRequestInfo_CORBA_OperationDef_params_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -18653,31 +18653,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl , const CORBA_ParDescriptionSeq & params - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -18696,7 +18696,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_set::TAO_ServerRequestInfo_CORBA TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_OperationDef *tao_impl, const CORBA_ParDescriptionSeq & params - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -18704,12 +18704,12 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_set::TAO_ServerRequestInfo_CORBA {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_OperationDef_params_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_params_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -18725,25 +18725,25 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_set::arguments (TAO_ENV_SINGLE_A } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_OperationDef_params_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_params_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_OperationDef_params_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_params_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -18751,7 +18751,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_set::result (TAO_ENV_SINGLE_ARG_ char * TAO_ServerRequestInfo_CORBA_OperationDef_params_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -18761,10 +18761,10 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_set::target_most_derived_interfa CORBA::Boolean TAO_ServerRequestInfo_CORBA_OperationDef_params_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_OperationDef_mode_get : public TAO_ServerRequestInfo @@ -18774,31 +18774,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::OperationMode result); @@ -18816,44 +18816,44 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::TAO_ServerRequestInfo_CORBA_O TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_OperationDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -18865,7 +18865,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::result (TAO_ENV_SINGLE_ARG_DE char * TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -18875,10 +18875,10 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -18896,31 +18896,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl , CORBA::OperationMode & mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -18939,7 +18939,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::TAO_ServerRequestInfo_CORBA_O TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_OperationDef *tao_impl, CORBA::OperationMode & mode - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -18947,12 +18947,12 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::TAO_ServerRequestInfo_CORBA_O {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -18968,25 +18968,25 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::arguments (TAO_ENV_SINGLE_ARG } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -18994,7 +18994,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::result (TAO_ENV_SINGLE_ARG_DE char * TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -19004,10 +19004,10 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get : public TAO_ServerRequestInfo @@ -19017,31 +19017,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_ContextIdSeq * result); @@ -19059,44 +19059,44 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::TAO_ServerRequestInfo_COR TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_OperationDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -19108,7 +19108,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::result (TAO_ENV_SINGLE_AR char * TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -19118,10 +19118,10 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::target_most_derived_inter CORBA::Boolean TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -19139,31 +19139,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl , const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -19182,7 +19182,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::TAO_ServerRequestInfo_COR TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_OperationDef *tao_impl, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -19190,12 +19190,12 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::TAO_ServerRequestInfo_COR {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -19211,25 +19211,25 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::arguments (TAO_ENV_SINGLE } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -19237,7 +19237,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::result (TAO_ENV_SINGLE_AR char * TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -19247,10 +19247,10 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::target_most_derived_inter CORBA::Boolean TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get : public TAO_ServerRequestInfo @@ -19260,31 +19260,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_ExceptionDefSeq * result); @@ -19302,44 +19302,44 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::TAO_ServerRequestInfo_C TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_OperationDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -19351,7 +19351,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::result (TAO_ENV_SINGLE_ char * TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -19361,10 +19361,10 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::target_most_derived_int CORBA::Boolean TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -19382,31 +19382,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl , const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -19425,7 +19425,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::TAO_ServerRequestInfo_C TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_OperationDef *tao_impl, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -19433,12 +19433,12 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::TAO_ServerRequestInfo_C {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -19454,25 +19454,25 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::arguments (TAO_ENV_SING } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -19480,7 +19480,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::result (TAO_ENV_SINGLE_ char * TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -19490,10 +19490,10 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::target_most_derived_int CORBA::Boolean TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -19526,17 +19526,17 @@ _TAO_CORBA_OperationDef_Strategized_Proxy_Broker::~_TAO_CORBA_OperationDef_Strat _TAO_CORBA_OperationDef_Proxy_Impl& _TAO_CORBA_OperationDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_OperationDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -19546,7 +19546,7 @@ _TAO_CORBA_OperationDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_OperationDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -19616,7 +19616,7 @@ _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::_TAO_CORBA_OperationDef_ThruPOA_Prox CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -19632,7 +19632,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result ( _collocated_tao_target_->_object_key (), "result", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -19641,13 +19641,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result ( "IDL:omg.org/CORBA/OperationDef:1.0" ) )->result ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } CORBA_IDLType_ptr _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -19663,7 +19663,7 @@ CORBA_IDLType_ptr _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result_def ( _collocated_tao_target_->_object_key (), "result_def", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -19672,14 +19672,14 @@ CORBA_IDLType_ptr _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result_def ( "IDL:omg.org/CORBA/OperationDef:1.0" ) )->result_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr result_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -19693,7 +19693,7 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result_def ( _collocated_tao_target_->_object_key (), "result_def", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -19703,14 +19703,14 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result_def ( ) )->result_def ( result_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::params ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -19726,7 +19726,7 @@ CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::params ( _collocated_tao_target_->_object_key (), "params", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -19735,14 +19735,14 @@ CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::params ( "IDL:omg.org/CORBA/OperationDef:1.0" ) )->params ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::params ( CORBA_Object *_collocated_tao_target_, const CORBA_ParDescriptionSeq & params - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -19756,7 +19756,7 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::params ( _collocated_tao_target_->_object_key (), "params", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -19766,14 +19766,14 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::params ( ) )->params ( params - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } CORBA::OperationMode _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::mode ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -19789,7 +19789,7 @@ CORBA::OperationMode _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::mode ( _collocated_tao_target_->_object_key (), "mode", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -19798,14 +19798,14 @@ CORBA::OperationMode _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::mode ( "IDL:omg.org/CORBA/OperationDef:1.0" ) )->mode ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::mode ( CORBA_Object *_collocated_tao_target_, CORBA::OperationMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -19819,7 +19819,7 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::mode ( _collocated_tao_target_->_object_key (), "mode", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -19829,14 +19829,14 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::mode ( ) )->mode ( mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::contexts ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -19852,7 +19852,7 @@ CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::contexts ( _collocated_tao_target_->_object_key (), "contexts", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -19861,14 +19861,14 @@ CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::contexts ( "IDL:omg.org/CORBA/OperationDef:1.0" ) )->contexts ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::contexts ( CORBA_Object *_collocated_tao_target_, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -19882,7 +19882,7 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::contexts ( _collocated_tao_target_->_object_key (), "contexts", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -19892,14 +19892,14 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::contexts ( ) )->contexts ( contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::exceptions ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -19915,7 +19915,7 @@ CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::exceptions ( _collocated_tao_target_->_object_key (), "exceptions", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -19924,14 +19924,14 @@ CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::exceptions ( "IDL:omg.org/CORBA/OperationDef:1.0" ) )->exceptions ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::exceptions ( CORBA_Object *_collocated_tao_target_, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -19945,7 +19945,7 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::exceptions ( _collocated_tao_target_->_object_key (), "exceptions", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -19955,7 +19955,7 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::exceptions ( ) )->exceptions ( exceptions - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -19986,7 +19986,7 @@ void POA_CORBA_OperationDef::_get_result_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef *_tao_impl = @@ -20007,18 +20007,18 @@ void POA_CORBA_OperationDef::_get_result_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->result ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -20027,7 +20027,7 @@ void POA_CORBA_OperationDef::_get_result_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -20035,12 +20035,12 @@ void POA_CORBA_OperationDef::_get_result_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -20068,7 +20068,7 @@ void POA_CORBA_OperationDef::_get_result_def_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef *_tao_impl = @@ -20089,18 +20089,18 @@ void POA_CORBA_OperationDef::_get_result_def_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->result_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -20109,7 +20109,7 @@ void POA_CORBA_OperationDef::_get_result_def_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -20117,12 +20117,12 @@ void POA_CORBA_OperationDef::_get_result_def_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -20150,7 +20150,7 @@ void POA_CORBA_OperationDef::_set_result_def_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -20179,25 +20179,25 @@ void POA_CORBA_OperationDef::_set_result_def_skel ( _tao_upcall, _tao_impl, result_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->result_def ( result_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -20205,12 +20205,12 @@ void POA_CORBA_OperationDef::_set_result_def_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -20231,7 +20231,7 @@ void POA_CORBA_OperationDef::_get_params_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef *_tao_impl = @@ -20252,18 +20252,18 @@ void POA_CORBA_OperationDef::_get_params_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->params ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -20272,7 +20272,7 @@ void POA_CORBA_OperationDef::_get_params_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -20280,12 +20280,12 @@ void POA_CORBA_OperationDef::_get_params_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -20313,7 +20313,7 @@ void POA_CORBA_OperationDef::_set_params_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -20342,25 +20342,25 @@ void POA_CORBA_OperationDef::_set_params_skel ( _tao_upcall, _tao_impl, params - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->params ( params - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -20368,12 +20368,12 @@ void POA_CORBA_OperationDef::_set_params_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -20394,7 +20394,7 @@ void POA_CORBA_OperationDef::_get_mode_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef *_tao_impl = @@ -20415,18 +20415,18 @@ void POA_CORBA_OperationDef::_get_mode_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->mode ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -20434,7 +20434,7 @@ void POA_CORBA_OperationDef::_get_mode_skel ( CORBA::OperationMode _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -20442,12 +20442,12 @@ void POA_CORBA_OperationDef::_get_mode_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -20475,7 +20475,7 @@ void POA_CORBA_OperationDef::_set_mode_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -20504,25 +20504,25 @@ void POA_CORBA_OperationDef::_set_mode_skel ( _tao_upcall, _tao_impl, mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->mode ( mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -20530,12 +20530,12 @@ void POA_CORBA_OperationDef::_set_mode_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -20556,7 +20556,7 @@ void POA_CORBA_OperationDef::_get_contexts_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef *_tao_impl = @@ -20577,18 +20577,18 @@ void POA_CORBA_OperationDef::_get_contexts_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->contexts ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -20597,7 +20597,7 @@ void POA_CORBA_OperationDef::_get_contexts_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -20605,12 +20605,12 @@ void POA_CORBA_OperationDef::_get_contexts_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -20638,7 +20638,7 @@ void POA_CORBA_OperationDef::_set_contexts_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -20667,25 +20667,25 @@ void POA_CORBA_OperationDef::_set_contexts_skel ( _tao_upcall, _tao_impl, contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->contexts ( contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -20693,12 +20693,12 @@ void POA_CORBA_OperationDef::_set_contexts_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -20719,7 +20719,7 @@ void POA_CORBA_OperationDef::_get_exceptions_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef *_tao_impl = @@ -20740,18 +20740,18 @@ void POA_CORBA_OperationDef::_get_exceptions_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->exceptions ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -20760,7 +20760,7 @@ void POA_CORBA_OperationDef::_get_exceptions_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -20768,12 +20768,12 @@ void POA_CORBA_OperationDef::_get_exceptions_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -20801,7 +20801,7 @@ void POA_CORBA_OperationDef::_set_exceptions_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -20830,25 +20830,25 @@ void POA_CORBA_OperationDef::_set_exceptions_skel ( _tao_upcall, _tao_impl, exceptions - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->exceptions ( exceptions - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -20856,12 +20856,12 @@ void POA_CORBA_OperationDef::_set_exceptions_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -20882,7 +20882,7 @@ void POA_CORBA_OperationDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -20892,7 +20892,7 @@ void POA_CORBA_OperationDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -20905,11 +20905,11 @@ void POA_CORBA_OperationDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef *_tao_impl = (POA_CORBA_OperationDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -20922,7 +20922,7 @@ void POA_CORBA_OperationDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef *_tao_impl = (POA_CORBA_OperationDef *) _tao_object_reference; @@ -20941,7 +20941,7 @@ void POA_CORBA_OperationDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -20968,10 +20968,10 @@ void POA_CORBA_OperationDef::_interface_skel ( CORBA::Boolean POA_CORBA_OperationDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -20999,12 +20999,12 @@ void* POA_CORBA_OperationDef::_downcast ( return 0; } -void POA_CORBA_OperationDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_OperationDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -21014,9 +21014,9 @@ const char* POA_CORBA_OperationDef::_interface_repository_id (void) const } CORBA_OperationDef* -POA_CORBA_OperationDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_OperationDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -21209,31 +21209,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_InterfaceDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_InterfaceDefSeq * result); @@ -21251,44 +21251,44 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::TAO_ServerRequestI TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_InterfaceDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -21300,7 +21300,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::result (TAO_ENV_SI char * TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -21310,10 +21310,10 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::target_most_derive CORBA::Boolean TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -21331,31 +21331,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_InterfaceDef *tao_impl , const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -21374,7 +21374,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::TAO_ServerRequestI TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_InterfaceDef *tao_impl, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -21382,12 +21382,12 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::TAO_ServerRequestI {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -21403,25 +21403,25 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::arguments (TAO_ENV } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -21429,7 +21429,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::result (TAO_ENV_SI char * TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -21439,10 +21439,10 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::target_most_derive CORBA::Boolean TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a : public TAO_ServerRequestInfo @@ -21453,31 +21453,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_InterfaceDef *tao_impl , const char * interface_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::Boolean result); @@ -21497,7 +21497,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::TAO_ServerRequestInfo_CORBA_Inter TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_InterfaceDef *tao_impl, const char * interface_id - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -21505,12 +21505,12 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::TAO_ServerRequestInfo_CORBA_Inter {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -21526,25 +21526,25 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DEC } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -21556,7 +21556,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -21566,10 +21566,10 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -21586,31 +21586,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_InterfaceDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_InterfaceDef::FullInterfaceDescription * result); @@ -21628,44 +21628,44 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::TAO_ServerRequestIn TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_InterfaceDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -21677,7 +21677,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::result (TAO_ENV_SIN char * TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -21687,10 +21687,10 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::target_most_derived CORBA::Boolean TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -21712,31 +21712,31 @@ public: const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode & mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_AttributeDef_ptr result); @@ -21764,7 +21764,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::TAO_ServerRequestInfo const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode & mode - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -21776,12 +21776,12 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::TAO_ServerRequestInfo {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -21809,25 +21809,25 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::arguments (TAO_ENV_SI } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -21839,7 +21839,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::result (TAO_ENV_SINGL char * TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -21849,10 +21849,10 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::target_most_derived_i CORBA::Boolean TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -21877,31 +21877,31 @@ public: const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_OperationDef_ptr result); @@ -21935,7 +21935,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::TAO_ServerRequestInfo const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -21950,12 +21950,12 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::TAO_ServerRequestInfo {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -21992,25 +21992,25 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::arguments (TAO_ENV_SI } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -22022,7 +22022,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::result (TAO_ENV_SINGL char * TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -22032,10 +22032,10 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::target_most_derived_i CORBA::Boolean TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -22075,17 +22075,17 @@ _TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker::~_TAO_CORBA_InterfaceDef_Strat _TAO_CORBA_InterfaceDef_Proxy_Impl& _TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_InterfaceDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -22095,7 +22095,7 @@ _TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -22165,7 +22165,7 @@ _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::_TAO_CORBA_InterfaceDef_ThruPOA_Prox CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -22181,7 +22181,7 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::base_interfa _collocated_tao_target_->_object_key (), "base_interfaces", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -22190,14 +22190,14 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::base_interfa "IDL:omg.org/CORBA/InterfaceDef:1.0" ) )->base_interfaces ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces ( CORBA_Object *_collocated_tao_target_, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -22211,7 +22211,7 @@ void _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces ( _collocated_tao_target_->_object_key (), "base_interfaces", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -22221,7 +22221,7 @@ void _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces ( ) )->base_interfaces ( base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -22229,7 +22229,7 @@ void _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces ( CORBA::Boolean _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::is_a ( CORBA_Object *_collocated_tao_target_, const char * interface_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -22245,7 +22245,7 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::is_a ( _collocated_tao_target_->_object_key (), "is_a", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -22255,13 +22255,13 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::is_a ( ) )->is_a ( interface_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::describe_interface ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -22277,7 +22277,7 @@ CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_ThruPOA_P _collocated_tao_target_->_object_key (), "describe_interface", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -22286,7 +22286,7 @@ CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_ThruPOA_P "IDL:omg.org/CORBA/InterfaceDef:1.0" ) )->describe_interface ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -22297,7 +22297,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::create_attrib const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -22313,7 +22313,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::create_attrib _collocated_tao_target_->_object_key (), "create_attribute", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -22327,7 +22327,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::create_attrib version, type, mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -22341,7 +22341,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::create_operat const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -22357,7 +22357,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::create_operat _collocated_tao_target_->_object_key (), "create_operation", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -22374,7 +22374,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::create_operat params, exceptions, contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -22406,7 +22406,7 @@ void POA_CORBA_InterfaceDef::_get_base_interfaces_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef *_tao_impl = @@ -22427,18 +22427,18 @@ void POA_CORBA_InterfaceDef::_get_base_interfaces_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->base_interfaces ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -22447,7 +22447,7 @@ void POA_CORBA_InterfaceDef::_get_base_interfaces_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -22455,12 +22455,12 @@ void POA_CORBA_InterfaceDef::_get_base_interfaces_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -22488,7 +22488,7 @@ void POA_CORBA_InterfaceDef::_set_base_interfaces_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -22517,25 +22517,25 @@ void POA_CORBA_InterfaceDef::_set_base_interfaces_skel ( _tao_upcall, _tao_impl, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->base_interfaces ( base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -22543,12 +22543,12 @@ void POA_CORBA_InterfaceDef::_set_base_interfaces_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -22569,7 +22569,7 @@ void POA_CORBA_InterfaceDef::is_a_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -22598,19 +22598,19 @@ void POA_CORBA_InterfaceDef::is_a_skel ( _tao_upcall, _tao_impl, interface_id.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->is_a ( interface_id.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -22618,7 +22618,7 @@ void POA_CORBA_InterfaceDef::is_a_skel ( CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -22626,12 +22626,12 @@ void POA_CORBA_InterfaceDef::is_a_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -22659,7 +22659,7 @@ void POA_CORBA_InterfaceDef::describe_interface_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef *_tao_impl = @@ -22680,18 +22680,18 @@ void POA_CORBA_InterfaceDef::describe_interface_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->describe_interface ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -22700,7 +22700,7 @@ void POA_CORBA_InterfaceDef::describe_interface_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -22708,12 +22708,12 @@ void POA_CORBA_InterfaceDef::describe_interface_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -22741,7 +22741,7 @@ void POA_CORBA_InterfaceDef::create_attribute_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -22782,12 +22782,12 @@ void POA_CORBA_InterfaceDef::create_attribute_skel ( version.in (), type.in (), mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -22798,7 +22798,7 @@ void POA_CORBA_InterfaceDef::create_attribute_skel ( version.in (), type.in (), mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -22807,7 +22807,7 @@ void POA_CORBA_InterfaceDef::create_attribute_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -22815,12 +22815,12 @@ void POA_CORBA_InterfaceDef::create_attribute_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -22848,7 +22848,7 @@ void POA_CORBA_InterfaceDef::create_operation_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -22898,12 +22898,12 @@ void POA_CORBA_InterfaceDef::create_operation_skel ( params, exceptions, contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -22917,7 +22917,7 @@ void POA_CORBA_InterfaceDef::create_operation_skel ( params, exceptions, contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -22926,7 +22926,7 @@ void POA_CORBA_InterfaceDef::create_operation_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -22934,12 +22934,12 @@ void POA_CORBA_InterfaceDef::create_operation_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -22967,7 +22967,7 @@ void POA_CORBA_InterfaceDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -22977,7 +22977,7 @@ void POA_CORBA_InterfaceDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -22990,11 +22990,11 @@ void POA_CORBA_InterfaceDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef *_tao_impl = (POA_CORBA_InterfaceDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -23007,7 +23007,7 @@ void POA_CORBA_InterfaceDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef *_tao_impl = (POA_CORBA_InterfaceDef *) _tao_object_reference; @@ -23026,7 +23026,7 @@ void POA_CORBA_InterfaceDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -23053,10 +23053,10 @@ void POA_CORBA_InterfaceDef::_interface_skel ( CORBA::Boolean POA_CORBA_InterfaceDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -23090,12 +23090,12 @@ void* POA_CORBA_InterfaceDef::_downcast ( return 0; } -void POA_CORBA_InterfaceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_InterfaceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -23105,9 +23105,9 @@ const char* POA_CORBA_InterfaceDef::_interface_repository_id (void) const } CORBA_InterfaceDef* -POA_CORBA_InterfaceDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_InterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -23323,17 +23323,17 @@ _TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker::~_TAO_CORBA_AbstractIn _TAO_CORBA_AbstractInterfaceDef_Proxy_Impl& _TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_AbstractInterfaceDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -23343,7 +23343,7 @@ _TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -23440,7 +23440,7 @@ void POA_CORBA_AbstractInterfaceDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -23450,7 +23450,7 @@ void POA_CORBA_AbstractInterfaceDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -23463,11 +23463,11 @@ void POA_CORBA_AbstractInterfaceDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_AbstractInterfaceDef *_tao_impl = (POA_CORBA_AbstractInterfaceDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -23480,7 +23480,7 @@ void POA_CORBA_AbstractInterfaceDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_AbstractInterfaceDef *_tao_impl = (POA_CORBA_AbstractInterfaceDef *) _tao_object_reference; @@ -23499,7 +23499,7 @@ void POA_CORBA_AbstractInterfaceDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -23526,10 +23526,10 @@ void POA_CORBA_AbstractInterfaceDef::_interface_skel ( CORBA::Boolean POA_CORBA_AbstractInterfaceDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -23566,12 +23566,12 @@ void* POA_CORBA_AbstractInterfaceDef::_downcast ( return 0; } -void POA_CORBA_AbstractInterfaceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_AbstractInterfaceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -23581,9 +23581,9 @@ const char* POA_CORBA_AbstractInterfaceDef::_interface_repository_id (void) cons } CORBA_AbstractInterfaceDef* -POA_CORBA_AbstractInterfaceDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_AbstractInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -23799,17 +23799,17 @@ _TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker::~_TAO_CORBA_LocalInterfac _TAO_CORBA_LocalInterfaceDef_Proxy_Impl& _TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_LocalInterfaceDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -23819,7 +23819,7 @@ _TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -23916,7 +23916,7 @@ void POA_CORBA_LocalInterfaceDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -23926,7 +23926,7 @@ void POA_CORBA_LocalInterfaceDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -23939,11 +23939,11 @@ void POA_CORBA_LocalInterfaceDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_LocalInterfaceDef *_tao_impl = (POA_CORBA_LocalInterfaceDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -23956,7 +23956,7 @@ void POA_CORBA_LocalInterfaceDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_LocalInterfaceDef *_tao_impl = (POA_CORBA_LocalInterfaceDef *) _tao_object_reference; @@ -23975,7 +23975,7 @@ void POA_CORBA_LocalInterfaceDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -24002,10 +24002,10 @@ void POA_CORBA_LocalInterfaceDef::_interface_skel ( CORBA::Boolean POA_CORBA_LocalInterfaceDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -24042,12 +24042,12 @@ void* POA_CORBA_LocalInterfaceDef::_downcast ( return 0; } -void POA_CORBA_LocalInterfaceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_LocalInterfaceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -24057,9 +24057,9 @@ const char* POA_CORBA_LocalInterfaceDef::_interface_repository_id (void) const } CORBA_LocalInterfaceDef* -POA_CORBA_LocalInterfaceDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_LocalInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS.h b/TAO/orbsvcs/IFR_Service/IFR_BasicS.h index 5b95644bc38..eefdd907bda 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_BasicS.h +++ b/TAO/orbsvcs/IFR_Service/IFR_BasicS.h @@ -65,7 +65,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -76,38 +76,38 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_Repository *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA_Contained_ptr lookup_id ( const char * search_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -117,12 +117,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA::TypeCode_ptr get_canonical_typecode ( CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -132,12 +132,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_PrimitiveDef_ptr get_primitive ( CORBA::PrimitiveKind kind - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -147,12 +147,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_StringDef_ptr create_string ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -162,12 +162,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_WstringDef_ptr create_wstring ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -177,13 +177,13 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_SequenceDef_ptr create_sequence ( CORBA::ULong bound, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -193,13 +193,13 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_ArrayDef_ptr create_array ( CORBA::ULong length, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -209,13 +209,13 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_FixedDef_ptr create_fixed ( CORBA::UShort digits, CORBA::Short scale - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -225,140 +225,140 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -378,7 +378,7 @@ public: virtual ::_TAO_CORBA_Repository_Proxy_Impl &select_proxy ( ::CORBA_Repository *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -387,7 +387,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -431,7 +431,7 @@ public: virtual CORBA_Contained_ptr lookup_id ( CORBA_Object *_collocated_tao_target_, const char * search_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -440,7 +440,7 @@ public: virtual CORBA::TypeCode_ptr get_canonical_typecode ( CORBA_Object *_collocated_tao_target_, CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -449,7 +449,7 @@ public: virtual CORBA_PrimitiveDef_ptr get_primitive ( CORBA_Object *_collocated_tao_target_, CORBA::PrimitiveKind kind - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -458,7 +458,7 @@ public: virtual CORBA_StringDef_ptr create_string ( CORBA_Object *_collocated_tao_target_, CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -467,7 +467,7 @@ public: virtual CORBA_WstringDef_ptr create_wstring ( CORBA_Object *_collocated_tao_target_, CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -477,7 +477,7 @@ public: CORBA_Object *_collocated_tao_target_, CORBA::ULong bound, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -487,7 +487,7 @@ public: CORBA_Object *_collocated_tao_target_, CORBA::ULong length, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -497,7 +497,7 @@ public: CORBA_Object *_collocated_tao_target_, CORBA::UShort digits, CORBA::Short scale - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -529,7 +529,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -540,31 +540,31 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_ModuleDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; @@ -573,210 +573,210 @@ public: TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -796,7 +796,7 @@ public: virtual ::_TAO_CORBA_ModuleDef_Proxy_Impl &select_proxy ( ::CORBA_ModuleDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -805,7 +805,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -872,7 +872,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -883,37 +883,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_ConstantDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -923,11 +923,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_IDLType_ptr type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -937,12 +937,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void type_def ( CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -952,11 +952,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA::Any * value ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -966,12 +966,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void value ( const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -981,98 +981,98 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -1092,7 +1092,7 @@ public: virtual ::_TAO_CORBA_ConstantDef_Proxy_Impl &select_proxy ( ::CORBA_ConstantDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1101,7 +1101,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1144,7 +1144,7 @@ public: virtual CORBA::TypeCode_ptr type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1152,7 +1152,7 @@ public: virtual CORBA_IDLType_ptr type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1161,7 +1161,7 @@ public: virtual void type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1169,7 +1169,7 @@ public: virtual CORBA::Any * value ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1178,7 +1178,7 @@ public: virtual void value ( CORBA_Object *_collocated_tao_target_, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1210,7 +1210,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -1221,37 +1221,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_StructDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA_StructMemberSeq * members ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1261,12 +1261,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void members ( const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1276,224 +1276,224 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -1513,7 +1513,7 @@ public: virtual ::_TAO_CORBA_StructDef_Proxy_Impl &select_proxy ( ::CORBA_StructDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1522,7 +1522,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1566,7 +1566,7 @@ public: virtual CORBA_StructMemberSeq * members ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1575,7 +1575,7 @@ public: virtual void members ( CORBA_Object *_collocated_tao_target_, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1607,7 +1607,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -1618,37 +1618,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_UnionDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA::TypeCode_ptr discriminator_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1658,11 +1658,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_IDLType_ptr discriminator_type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1672,12 +1672,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void discriminator_type_def ( CORBA_IDLType_ptr discriminator_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1687,11 +1687,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_UnionMemberSeq * members ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1701,12 +1701,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void members ( const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1716,224 +1716,224 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -1953,7 +1953,7 @@ public: virtual ::_TAO_CORBA_UnionDef_Proxy_Impl &select_proxy ( ::CORBA_UnionDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1962,7 +1962,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -2006,7 +2006,7 @@ public: virtual CORBA::TypeCode_ptr discriminator_type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2014,7 +2014,7 @@ public: virtual CORBA_IDLType_ptr discriminator_type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2023,7 +2023,7 @@ public: virtual void discriminator_type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr discriminator_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2031,7 +2031,7 @@ public: virtual CORBA_UnionMemberSeq * members ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2040,7 +2040,7 @@ public: virtual void members ( CORBA_Object *_collocated_tao_target_, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2072,7 +2072,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -2083,37 +2083,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_EnumDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA_EnumMemberSeq * members ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2123,12 +2123,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void members ( const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2138,105 +2138,105 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -2256,7 +2256,7 @@ public: virtual ::_TAO_CORBA_EnumDef_Proxy_Impl &select_proxy ( ::CORBA_EnumDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -2265,7 +2265,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -2308,7 +2308,7 @@ public: virtual CORBA_EnumMemberSeq * members ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2317,7 +2317,7 @@ public: virtual void members ( CORBA_Object *_collocated_tao_target_, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2349,7 +2349,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -2360,37 +2360,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_AliasDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA_IDLType_ptr original_type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2400,12 +2400,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void original_type_def ( CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2415,105 +2415,105 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -2533,7 +2533,7 @@ public: virtual ::_TAO_CORBA_AliasDef_Proxy_Impl &select_proxy ( ::CORBA_AliasDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -2542,7 +2542,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -2585,7 +2585,7 @@ public: virtual CORBA_IDLType_ptr original_type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2594,7 +2594,7 @@ public: virtual void original_type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2626,7 +2626,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -2637,31 +2637,31 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_NativeDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; @@ -2670,98 +2670,98 @@ public: TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -2781,7 +2781,7 @@ public: virtual ::_TAO_CORBA_NativeDef_Proxy_Impl &select_proxy ( ::CORBA_NativeDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -2790,7 +2790,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -2856,7 +2856,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -2867,37 +2867,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_PrimitiveDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA::PrimitiveKind kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2907,28 +2907,28 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -2948,7 +2948,7 @@ public: virtual ::_TAO_CORBA_PrimitiveDef_Proxy_Impl &select_proxy ( ::CORBA_PrimitiveDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -2957,7 +2957,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -3000,7 +3000,7 @@ public: virtual CORBA::PrimitiveKind kind ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3032,7 +3032,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -3043,37 +3043,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_StringDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA::ULong bound ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3083,12 +3083,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void bound ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3098,28 +3098,28 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -3139,7 +3139,7 @@ public: virtual ::_TAO_CORBA_StringDef_Proxy_Impl &select_proxy ( ::CORBA_StringDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -3148,7 +3148,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -3191,7 +3191,7 @@ public: virtual CORBA::ULong bound ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3200,7 +3200,7 @@ public: virtual void bound ( CORBA_Object *_collocated_tao_target_, CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3232,7 +3232,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -3243,37 +3243,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_WstringDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA::ULong bound ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3283,12 +3283,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void bound ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3298,28 +3298,28 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -3339,7 +3339,7 @@ public: virtual ::_TAO_CORBA_WstringDef_Proxy_Impl &select_proxy ( ::CORBA_WstringDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -3348,7 +3348,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -3391,7 +3391,7 @@ public: virtual CORBA::ULong bound ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3400,7 +3400,7 @@ public: virtual void bound ( CORBA_Object *_collocated_tao_target_, CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3432,7 +3432,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -3443,37 +3443,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_SequenceDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA::ULong bound ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3483,12 +3483,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void bound ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3498,11 +3498,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA::TypeCode_ptr element_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3512,11 +3512,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_IDLType_ptr element_type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3526,12 +3526,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void element_type_def ( CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3541,28 +3541,28 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -3582,7 +3582,7 @@ public: virtual ::_TAO_CORBA_SequenceDef_Proxy_Impl &select_proxy ( ::CORBA_SequenceDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -3591,7 +3591,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -3634,7 +3634,7 @@ public: virtual CORBA::ULong bound ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3643,7 +3643,7 @@ public: virtual void bound ( CORBA_Object *_collocated_tao_target_, CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3651,7 +3651,7 @@ public: virtual CORBA::TypeCode_ptr element_type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3659,7 +3659,7 @@ public: virtual CORBA_IDLType_ptr element_type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3668,7 +3668,7 @@ public: virtual void element_type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3700,7 +3700,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -3711,37 +3711,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_ArrayDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA::ULong length ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3751,12 +3751,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void length ( CORBA::ULong length - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3766,11 +3766,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA::TypeCode_ptr element_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3780,11 +3780,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_IDLType_ptr element_type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3794,12 +3794,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void element_type_def ( CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3809,28 +3809,28 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -3850,7 +3850,7 @@ public: virtual ::_TAO_CORBA_ArrayDef_Proxy_Impl &select_proxy ( ::CORBA_ArrayDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -3859,7 +3859,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -3902,7 +3902,7 @@ public: virtual CORBA::ULong length ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3911,7 +3911,7 @@ public: virtual void length ( CORBA_Object *_collocated_tao_target_, CORBA::ULong length - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3919,7 +3919,7 @@ public: virtual CORBA::TypeCode_ptr element_type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3927,7 +3927,7 @@ public: virtual CORBA_IDLType_ptr element_type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3936,7 +3936,7 @@ public: virtual void element_type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3968,7 +3968,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -3979,37 +3979,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_ExceptionDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4019,11 +4019,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_StructMemberSeq * members ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4033,12 +4033,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void members ( const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4048,217 +4048,217 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -4278,7 +4278,7 @@ public: virtual ::_TAO_CORBA_ExceptionDef_Proxy_Impl &select_proxy ( ::CORBA_ExceptionDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -4287,7 +4287,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -4331,7 +4331,7 @@ public: virtual CORBA::TypeCode_ptr type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4339,7 +4339,7 @@ public: virtual CORBA_StructMemberSeq * members ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4348,7 +4348,7 @@ public: virtual void members ( CORBA_Object *_collocated_tao_target_, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4380,7 +4380,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -4391,37 +4391,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_AttributeDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4431,11 +4431,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_IDLType_ptr type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4445,12 +4445,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void type_def ( CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4460,11 +4460,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA::AttributeMode mode ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4474,12 +4474,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void mode ( CORBA::AttributeMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4489,98 +4489,98 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -4600,7 +4600,7 @@ public: virtual ::_TAO_CORBA_AttributeDef_Proxy_Impl &select_proxy ( ::CORBA_AttributeDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -4609,7 +4609,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -4652,7 +4652,7 @@ public: virtual CORBA::TypeCode_ptr type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4660,7 +4660,7 @@ public: virtual CORBA_IDLType_ptr type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4669,7 +4669,7 @@ public: virtual void type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4677,7 +4677,7 @@ public: virtual CORBA::AttributeMode mode ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4686,7 +4686,7 @@ public: virtual void mode ( CORBA_Object *_collocated_tao_target_, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4718,7 +4718,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -4729,37 +4729,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_OperationDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA::TypeCode_ptr result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4769,11 +4769,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_IDLType_ptr result_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4783,12 +4783,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void result_def ( CORBA_IDLType_ptr result_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4798,11 +4798,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_ParDescriptionSeq * params ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4812,12 +4812,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void params ( const CORBA_ParDescriptionSeq & params - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4827,11 +4827,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA::OperationMode mode ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4841,12 +4841,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void mode ( CORBA::OperationMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4856,11 +4856,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_ContextIdSeq * contexts ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4870,12 +4870,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void contexts ( const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4885,11 +4885,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_ExceptionDefSeq * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4899,12 +4899,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void exceptions ( const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4914,98 +4914,98 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -5025,7 +5025,7 @@ public: virtual ::_TAO_CORBA_OperationDef_Proxy_Impl &select_proxy ( ::CORBA_OperationDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -5034,7 +5034,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -5077,7 +5077,7 @@ public: virtual CORBA::TypeCode_ptr result ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5085,7 +5085,7 @@ public: virtual CORBA_IDLType_ptr result_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5094,7 +5094,7 @@ public: virtual void result_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr result_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5102,7 +5102,7 @@ public: virtual CORBA_ParDescriptionSeq * params ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5111,7 +5111,7 @@ public: virtual void params ( CORBA_Object *_collocated_tao_target_, const CORBA_ParDescriptionSeq & params - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5119,7 +5119,7 @@ public: virtual CORBA::OperationMode mode ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5128,7 +5128,7 @@ public: virtual void mode ( CORBA_Object *_collocated_tao_target_, CORBA::OperationMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5136,7 +5136,7 @@ public: virtual CORBA_ContextIdSeq * contexts ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5145,7 +5145,7 @@ public: virtual void contexts ( CORBA_Object *_collocated_tao_target_, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5153,7 +5153,7 @@ public: virtual CORBA_ExceptionDefSeq * exceptions ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5162,7 +5162,7 @@ public: virtual void exceptions ( CORBA_Object *_collocated_tao_target_, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5194,7 +5194,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -5205,37 +5205,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_InterfaceDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA_InterfaceDefSeq * base_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -5245,12 +5245,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void base_interfaces ( const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -5260,12 +5260,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA::Boolean is_a ( const char * interface_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -5275,11 +5275,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_InterfaceDef::FullInterfaceDescription * describe_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -5289,7 +5289,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_AttributeDef_ptr create_attribute ( @@ -5298,7 +5298,7 @@ public: const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -5308,7 +5308,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_OperationDef_ptr create_operation ( @@ -5320,7 +5320,7 @@ public: const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -5330,224 +5330,224 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -5567,7 +5567,7 @@ public: virtual ::_TAO_CORBA_InterfaceDef_Proxy_Impl &select_proxy ( ::CORBA_InterfaceDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -5576,7 +5576,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -5621,7 +5621,7 @@ public: virtual CORBA_InterfaceDefSeq * base_interfaces ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5630,7 +5630,7 @@ public: virtual void base_interfaces ( CORBA_Object *_collocated_tao_target_, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5639,7 +5639,7 @@ public: virtual CORBA::Boolean is_a ( CORBA_Object *_collocated_tao_target_, const char * interface_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5647,7 +5647,7 @@ public: virtual CORBA_InterfaceDef::FullInterfaceDescription * describe_interface ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5660,7 +5660,7 @@ public: const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5676,7 +5676,7 @@ public: const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5708,7 +5708,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -5719,31 +5719,31 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_AbstractInterfaceDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; @@ -5752,259 +5752,259 @@ public: TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_base_interfaces_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void is_a_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_attribute_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_operation_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -6024,7 +6024,7 @@ public: virtual ::_TAO_CORBA_AbstractInterfaceDef_Proxy_Impl &select_proxy ( ::CORBA_AbstractInterfaceDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -6033,7 +6033,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -6099,7 +6099,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -6110,31 +6110,31 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_LocalInterfaceDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; @@ -6143,259 +6143,259 @@ public: TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_base_interfaces_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void is_a_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_attribute_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_operation_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -6415,7 +6415,7 @@ public: virtual ::_TAO_CORBA_LocalInterfaceDef_Proxy_Impl &select_proxy ( ::CORBA_LocalInterfaceDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -6424,7 +6424,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS.i b/TAO/orbsvcs/IFR_Service/IFR_BasicS.i index 452b604e36f..9b6f1854e59 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_BasicS.i +++ b/TAO/orbsvcs/IFR_Service/IFR_BasicS.i @@ -23,7 +23,7 @@ ACE_INLINE void POA_CORBA_Repository::lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj; @@ -31,14 +31,14 @@ ACE_INLINE void POA_CORBA_Repository::lookup_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Repository::contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj; @@ -46,14 +46,14 @@ ACE_INLINE void POA_CORBA_Repository::contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Repository::lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj; @@ -61,14 +61,14 @@ ACE_INLINE void POA_CORBA_Repository::lookup_name_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Repository::describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj; @@ -76,14 +76,14 @@ ACE_INLINE void POA_CORBA_Repository::describe_contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Repository::create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj; @@ -91,14 +91,14 @@ ACE_INLINE void POA_CORBA_Repository::create_module_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Repository::create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj; @@ -106,14 +106,14 @@ ACE_INLINE void POA_CORBA_Repository::create_constant_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Repository::create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj; @@ -121,14 +121,14 @@ ACE_INLINE void POA_CORBA_Repository::create_struct_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Repository::create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj; @@ -136,14 +136,14 @@ ACE_INLINE void POA_CORBA_Repository::create_union_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Repository::create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj; @@ -151,14 +151,14 @@ ACE_INLINE void POA_CORBA_Repository::create_enum_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Repository::create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj; @@ -166,14 +166,14 @@ ACE_INLINE void POA_CORBA_Repository::create_alias_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Repository::create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj; @@ -181,14 +181,14 @@ ACE_INLINE void POA_CORBA_Repository::create_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Repository::create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj; @@ -196,14 +196,14 @@ ACE_INLINE void POA_CORBA_Repository::create_value_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Repository::create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj; @@ -211,14 +211,14 @@ ACE_INLINE void POA_CORBA_Repository::create_value_box_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Repository::create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj; @@ -226,14 +226,14 @@ ACE_INLINE void POA_CORBA_Repository::create_exception_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Repository::create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj; @@ -241,14 +241,14 @@ ACE_INLINE void POA_CORBA_Repository::create_native_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Repository::create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj; @@ -256,14 +256,14 @@ ACE_INLINE void POA_CORBA_Repository::create_abstract_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Repository::create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj; @@ -271,14 +271,14 @@ ACE_INLINE void POA_CORBA_Repository::create_local_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Repository::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_Repository_ptr) obj; @@ -286,14 +286,14 @@ ACE_INLINE void POA_CORBA_Repository::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Repository::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_Repository_ptr) obj; @@ -301,14 +301,14 @@ ACE_INLINE void POA_CORBA_Repository::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -316,14 +316,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::lookup_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -331,14 +331,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -346,14 +346,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::lookup_name_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -361,14 +361,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::describe_contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -376,14 +376,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::create_module_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -391,14 +391,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::create_constant_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -406,14 +406,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::create_struct_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -421,14 +421,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::create_union_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -436,14 +436,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::create_enum_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -451,14 +451,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::create_alias_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -466,14 +466,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::create_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -481,14 +481,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::create_value_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -496,14 +496,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::create_value_box_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -511,14 +511,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::create_exception_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -526,14 +526,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::create_native_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -541,14 +541,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::create_abstract_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -556,14 +556,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::create_local_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -571,14 +571,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -586,14 +586,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -601,14 +601,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -616,14 +616,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -631,14 +631,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -646,14 +646,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -661,14 +661,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -676,14 +676,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -691,14 +691,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -706,14 +706,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -721,14 +721,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -736,14 +736,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -751,14 +751,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ConstantDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj; @@ -766,14 +766,14 @@ ACE_INLINE void POA_CORBA_ConstantDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ConstantDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj; @@ -781,14 +781,14 @@ ACE_INLINE void POA_CORBA_ConstantDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ConstantDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj; @@ -796,14 +796,14 @@ ACE_INLINE void POA_CORBA_ConstantDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ConstantDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj; @@ -811,14 +811,14 @@ ACE_INLINE void POA_CORBA_ConstantDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ConstantDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj; @@ -826,14 +826,14 @@ ACE_INLINE void POA_CORBA_ConstantDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ConstantDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj; @@ -841,14 +841,14 @@ ACE_INLINE void POA_CORBA_ConstantDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ConstantDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj; @@ -856,14 +856,14 @@ ACE_INLINE void POA_CORBA_ConstantDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ConstantDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj; @@ -871,14 +871,14 @@ ACE_INLINE void POA_CORBA_ConstantDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ConstantDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj; @@ -886,14 +886,14 @@ ACE_INLINE void POA_CORBA_ConstantDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ConstantDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj; @@ -901,14 +901,14 @@ ACE_INLINE void POA_CORBA_ConstantDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ConstantDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj; @@ -916,14 +916,14 @@ ACE_INLINE void POA_CORBA_ConstantDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ConstantDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_ConstantDef_ptr) obj; @@ -931,14 +931,14 @@ ACE_INLINE void POA_CORBA_ConstantDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ConstantDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_ConstantDef_ptr) obj; @@ -946,14 +946,14 @@ ACE_INLINE void POA_CORBA_ConstantDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -961,14 +961,14 @@ ACE_INLINE void POA_CORBA_StructDef::lookup_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -976,14 +976,14 @@ ACE_INLINE void POA_CORBA_StructDef::contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -991,14 +991,14 @@ ACE_INLINE void POA_CORBA_StructDef::lookup_name_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1006,14 +1006,14 @@ ACE_INLINE void POA_CORBA_StructDef::describe_contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1021,14 +1021,14 @@ ACE_INLINE void POA_CORBA_StructDef::create_module_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1036,14 +1036,14 @@ ACE_INLINE void POA_CORBA_StructDef::create_constant_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1051,14 +1051,14 @@ ACE_INLINE void POA_CORBA_StructDef::create_struct_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1066,14 +1066,14 @@ ACE_INLINE void POA_CORBA_StructDef::create_union_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1081,14 +1081,14 @@ ACE_INLINE void POA_CORBA_StructDef::create_enum_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1096,14 +1096,14 @@ ACE_INLINE void POA_CORBA_StructDef::create_alias_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1111,14 +1111,14 @@ ACE_INLINE void POA_CORBA_StructDef::create_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1126,14 +1126,14 @@ ACE_INLINE void POA_CORBA_StructDef::create_value_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1141,14 +1141,14 @@ ACE_INLINE void POA_CORBA_StructDef::create_value_box_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1156,14 +1156,14 @@ ACE_INLINE void POA_CORBA_StructDef::create_exception_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1171,14 +1171,14 @@ ACE_INLINE void POA_CORBA_StructDef::create_native_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1186,14 +1186,14 @@ ACE_INLINE void POA_CORBA_StructDef::create_abstract_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1201,14 +1201,14 @@ ACE_INLINE void POA_CORBA_StructDef::create_local_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1216,14 +1216,14 @@ ACE_INLINE void POA_CORBA_StructDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1231,14 +1231,14 @@ ACE_INLINE void POA_CORBA_StructDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1246,14 +1246,14 @@ ACE_INLINE void POA_CORBA_StructDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1261,14 +1261,14 @@ ACE_INLINE void POA_CORBA_StructDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1276,14 +1276,14 @@ ACE_INLINE void POA_CORBA_StructDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1291,14 +1291,14 @@ ACE_INLINE void POA_CORBA_StructDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1306,14 +1306,14 @@ ACE_INLINE void POA_CORBA_StructDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1321,14 +1321,14 @@ ACE_INLINE void POA_CORBA_StructDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1336,14 +1336,14 @@ ACE_INLINE void POA_CORBA_StructDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1351,14 +1351,14 @@ ACE_INLINE void POA_CORBA_StructDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1366,14 +1366,14 @@ ACE_INLINE void POA_CORBA_StructDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::_get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1381,14 +1381,14 @@ ACE_INLINE void POA_CORBA_StructDef::_get_type_skel ( req, (POA_CORBA_IDLType_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1396,14 +1396,14 @@ ACE_INLINE void POA_CORBA_StructDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1411,14 +1411,14 @@ ACE_INLINE void POA_CORBA_StructDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1426,14 +1426,14 @@ ACE_INLINE void POA_CORBA_UnionDef::lookup_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1441,14 +1441,14 @@ ACE_INLINE void POA_CORBA_UnionDef::contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1456,14 +1456,14 @@ ACE_INLINE void POA_CORBA_UnionDef::lookup_name_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1471,14 +1471,14 @@ ACE_INLINE void POA_CORBA_UnionDef::describe_contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1486,14 +1486,14 @@ ACE_INLINE void POA_CORBA_UnionDef::create_module_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1501,14 +1501,14 @@ ACE_INLINE void POA_CORBA_UnionDef::create_constant_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1516,14 +1516,14 @@ ACE_INLINE void POA_CORBA_UnionDef::create_struct_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1531,14 +1531,14 @@ ACE_INLINE void POA_CORBA_UnionDef::create_union_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1546,14 +1546,14 @@ ACE_INLINE void POA_CORBA_UnionDef::create_enum_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1561,14 +1561,14 @@ ACE_INLINE void POA_CORBA_UnionDef::create_alias_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1576,14 +1576,14 @@ ACE_INLINE void POA_CORBA_UnionDef::create_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1591,14 +1591,14 @@ ACE_INLINE void POA_CORBA_UnionDef::create_value_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1606,14 +1606,14 @@ ACE_INLINE void POA_CORBA_UnionDef::create_value_box_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1621,14 +1621,14 @@ ACE_INLINE void POA_CORBA_UnionDef::create_exception_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1636,14 +1636,14 @@ ACE_INLINE void POA_CORBA_UnionDef::create_native_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1651,14 +1651,14 @@ ACE_INLINE void POA_CORBA_UnionDef::create_abstract_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1666,14 +1666,14 @@ ACE_INLINE void POA_CORBA_UnionDef::create_local_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1681,14 +1681,14 @@ ACE_INLINE void POA_CORBA_UnionDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1696,14 +1696,14 @@ ACE_INLINE void POA_CORBA_UnionDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1711,14 +1711,14 @@ ACE_INLINE void POA_CORBA_UnionDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1726,14 +1726,14 @@ ACE_INLINE void POA_CORBA_UnionDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1741,14 +1741,14 @@ ACE_INLINE void POA_CORBA_UnionDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1756,14 +1756,14 @@ ACE_INLINE void POA_CORBA_UnionDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1771,14 +1771,14 @@ ACE_INLINE void POA_CORBA_UnionDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1786,14 +1786,14 @@ ACE_INLINE void POA_CORBA_UnionDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1801,14 +1801,14 @@ ACE_INLINE void POA_CORBA_UnionDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1816,14 +1816,14 @@ ACE_INLINE void POA_CORBA_UnionDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1831,14 +1831,14 @@ ACE_INLINE void POA_CORBA_UnionDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::_get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1846,14 +1846,14 @@ ACE_INLINE void POA_CORBA_UnionDef::_get_type_skel ( req, (POA_CORBA_IDLType_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1861,14 +1861,14 @@ ACE_INLINE void POA_CORBA_UnionDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1876,14 +1876,14 @@ ACE_INLINE void POA_CORBA_UnionDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_EnumDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj; @@ -1891,14 +1891,14 @@ ACE_INLINE void POA_CORBA_EnumDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_EnumDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj; @@ -1906,14 +1906,14 @@ ACE_INLINE void POA_CORBA_EnumDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_EnumDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj; @@ -1921,14 +1921,14 @@ ACE_INLINE void POA_CORBA_EnumDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_EnumDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj; @@ -1936,14 +1936,14 @@ ACE_INLINE void POA_CORBA_EnumDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_EnumDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj; @@ -1951,14 +1951,14 @@ ACE_INLINE void POA_CORBA_EnumDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_EnumDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj; @@ -1966,14 +1966,14 @@ ACE_INLINE void POA_CORBA_EnumDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_EnumDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj; @@ -1981,14 +1981,14 @@ ACE_INLINE void POA_CORBA_EnumDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_EnumDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj; @@ -1996,14 +1996,14 @@ ACE_INLINE void POA_CORBA_EnumDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_EnumDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj; @@ -2011,14 +2011,14 @@ ACE_INLINE void POA_CORBA_EnumDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_EnumDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj; @@ -2026,14 +2026,14 @@ ACE_INLINE void POA_CORBA_EnumDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_EnumDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj; @@ -2041,14 +2041,14 @@ ACE_INLINE void POA_CORBA_EnumDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_EnumDef::_get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType_ptr impl = (POA_CORBA_EnumDef_ptr) obj; @@ -2056,14 +2056,14 @@ ACE_INLINE void POA_CORBA_EnumDef::_get_type_skel ( req, (POA_CORBA_IDLType_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_EnumDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_EnumDef_ptr) obj; @@ -2071,14 +2071,14 @@ ACE_INLINE void POA_CORBA_EnumDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_EnumDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_EnumDef_ptr) obj; @@ -2086,14 +2086,14 @@ ACE_INLINE void POA_CORBA_EnumDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AliasDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj; @@ -2101,14 +2101,14 @@ ACE_INLINE void POA_CORBA_AliasDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AliasDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj; @@ -2116,14 +2116,14 @@ ACE_INLINE void POA_CORBA_AliasDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AliasDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj; @@ -2131,14 +2131,14 @@ ACE_INLINE void POA_CORBA_AliasDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AliasDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj; @@ -2146,14 +2146,14 @@ ACE_INLINE void POA_CORBA_AliasDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AliasDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj; @@ -2161,14 +2161,14 @@ ACE_INLINE void POA_CORBA_AliasDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AliasDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj; @@ -2176,14 +2176,14 @@ ACE_INLINE void POA_CORBA_AliasDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AliasDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj; @@ -2191,14 +2191,14 @@ ACE_INLINE void POA_CORBA_AliasDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AliasDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj; @@ -2206,14 +2206,14 @@ ACE_INLINE void POA_CORBA_AliasDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AliasDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj; @@ -2221,14 +2221,14 @@ ACE_INLINE void POA_CORBA_AliasDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AliasDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj; @@ -2236,14 +2236,14 @@ ACE_INLINE void POA_CORBA_AliasDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AliasDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj; @@ -2251,14 +2251,14 @@ ACE_INLINE void POA_CORBA_AliasDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AliasDef::_get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType_ptr impl = (POA_CORBA_AliasDef_ptr) obj; @@ -2266,14 +2266,14 @@ ACE_INLINE void POA_CORBA_AliasDef::_get_type_skel ( req, (POA_CORBA_IDLType_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AliasDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_AliasDef_ptr) obj; @@ -2281,14 +2281,14 @@ ACE_INLINE void POA_CORBA_AliasDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AliasDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_AliasDef_ptr) obj; @@ -2296,14 +2296,14 @@ ACE_INLINE void POA_CORBA_AliasDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_NativeDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj; @@ -2311,14 +2311,14 @@ ACE_INLINE void POA_CORBA_NativeDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_NativeDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj; @@ -2326,14 +2326,14 @@ ACE_INLINE void POA_CORBA_NativeDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_NativeDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj; @@ -2341,14 +2341,14 @@ ACE_INLINE void POA_CORBA_NativeDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_NativeDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj; @@ -2356,14 +2356,14 @@ ACE_INLINE void POA_CORBA_NativeDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_NativeDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj; @@ -2371,14 +2371,14 @@ ACE_INLINE void POA_CORBA_NativeDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_NativeDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj; @@ -2386,14 +2386,14 @@ ACE_INLINE void POA_CORBA_NativeDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_NativeDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj; @@ -2401,14 +2401,14 @@ ACE_INLINE void POA_CORBA_NativeDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_NativeDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj; @@ -2416,14 +2416,14 @@ ACE_INLINE void POA_CORBA_NativeDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_NativeDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj; @@ -2431,14 +2431,14 @@ ACE_INLINE void POA_CORBA_NativeDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_NativeDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj; @@ -2446,14 +2446,14 @@ ACE_INLINE void POA_CORBA_NativeDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_NativeDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj; @@ -2461,14 +2461,14 @@ ACE_INLINE void POA_CORBA_NativeDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_NativeDef::_get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType_ptr impl = (POA_CORBA_NativeDef_ptr) obj; @@ -2476,14 +2476,14 @@ ACE_INLINE void POA_CORBA_NativeDef::_get_type_skel ( req, (POA_CORBA_IDLType_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_NativeDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_NativeDef_ptr) obj; @@ -2491,14 +2491,14 @@ ACE_INLINE void POA_CORBA_NativeDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_NativeDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_NativeDef_ptr) obj; @@ -2506,14 +2506,14 @@ ACE_INLINE void POA_CORBA_NativeDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_PrimitiveDef::_get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType_ptr impl = (POA_CORBA_PrimitiveDef_ptr) obj; @@ -2521,14 +2521,14 @@ ACE_INLINE void POA_CORBA_PrimitiveDef::_get_type_skel ( req, (POA_CORBA_IDLType_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_PrimitiveDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_PrimitiveDef_ptr) obj; @@ -2536,14 +2536,14 @@ ACE_INLINE void POA_CORBA_PrimitiveDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_PrimitiveDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_PrimitiveDef_ptr) obj; @@ -2551,14 +2551,14 @@ ACE_INLINE void POA_CORBA_PrimitiveDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StringDef::_get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType_ptr impl = (POA_CORBA_StringDef_ptr) obj; @@ -2566,14 +2566,14 @@ ACE_INLINE void POA_CORBA_StringDef::_get_type_skel ( req, (POA_CORBA_IDLType_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StringDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_StringDef_ptr) obj; @@ -2581,14 +2581,14 @@ ACE_INLINE void POA_CORBA_StringDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StringDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_StringDef_ptr) obj; @@ -2596,14 +2596,14 @@ ACE_INLINE void POA_CORBA_StringDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_WstringDef::_get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType_ptr impl = (POA_CORBA_WstringDef_ptr) obj; @@ -2611,14 +2611,14 @@ ACE_INLINE void POA_CORBA_WstringDef::_get_type_skel ( req, (POA_CORBA_IDLType_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_WstringDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_WstringDef_ptr) obj; @@ -2626,14 +2626,14 @@ ACE_INLINE void POA_CORBA_WstringDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_WstringDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_WstringDef_ptr) obj; @@ -2641,14 +2641,14 @@ ACE_INLINE void POA_CORBA_WstringDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_SequenceDef::_get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType_ptr impl = (POA_CORBA_SequenceDef_ptr) obj; @@ -2656,14 +2656,14 @@ ACE_INLINE void POA_CORBA_SequenceDef::_get_type_skel ( req, (POA_CORBA_IDLType_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_SequenceDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_SequenceDef_ptr) obj; @@ -2671,14 +2671,14 @@ ACE_INLINE void POA_CORBA_SequenceDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_SequenceDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_SequenceDef_ptr) obj; @@ -2686,14 +2686,14 @@ ACE_INLINE void POA_CORBA_SequenceDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ArrayDef::_get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType_ptr impl = (POA_CORBA_ArrayDef_ptr) obj; @@ -2701,14 +2701,14 @@ ACE_INLINE void POA_CORBA_ArrayDef::_get_type_skel ( req, (POA_CORBA_IDLType_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ArrayDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_ArrayDef_ptr) obj; @@ -2716,14 +2716,14 @@ ACE_INLINE void POA_CORBA_ArrayDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ArrayDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_ArrayDef_ptr) obj; @@ -2731,14 +2731,14 @@ ACE_INLINE void POA_CORBA_ArrayDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -2746,14 +2746,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -2761,14 +2761,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -2776,14 +2776,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -2791,14 +2791,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -2806,14 +2806,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -2821,14 +2821,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -2836,14 +2836,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -2851,14 +2851,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -2866,14 +2866,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -2881,14 +2881,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -2896,14 +2896,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -2911,14 +2911,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::lookup_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -2926,14 +2926,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -2941,14 +2941,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::lookup_name_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -2956,14 +2956,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::describe_contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -2971,14 +2971,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::create_module_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -2986,14 +2986,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::create_constant_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -3001,14 +3001,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::create_struct_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -3016,14 +3016,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::create_union_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -3031,14 +3031,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::create_enum_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -3046,14 +3046,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::create_alias_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -3061,14 +3061,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::create_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -3076,14 +3076,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::create_value_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -3091,14 +3091,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::create_value_box_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -3106,14 +3106,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::create_exception_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -3121,14 +3121,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::create_native_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -3136,14 +3136,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::create_abstract_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -3151,14 +3151,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::create_local_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -3166,14 +3166,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -3181,14 +3181,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AttributeDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj; @@ -3196,14 +3196,14 @@ ACE_INLINE void POA_CORBA_AttributeDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AttributeDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj; @@ -3211,14 +3211,14 @@ ACE_INLINE void POA_CORBA_AttributeDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AttributeDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj; @@ -3226,14 +3226,14 @@ ACE_INLINE void POA_CORBA_AttributeDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AttributeDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj; @@ -3241,14 +3241,14 @@ ACE_INLINE void POA_CORBA_AttributeDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AttributeDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj; @@ -3256,14 +3256,14 @@ ACE_INLINE void POA_CORBA_AttributeDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AttributeDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj; @@ -3271,14 +3271,14 @@ ACE_INLINE void POA_CORBA_AttributeDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AttributeDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj; @@ -3286,14 +3286,14 @@ ACE_INLINE void POA_CORBA_AttributeDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AttributeDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj; @@ -3301,14 +3301,14 @@ ACE_INLINE void POA_CORBA_AttributeDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AttributeDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj; @@ -3316,14 +3316,14 @@ ACE_INLINE void POA_CORBA_AttributeDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AttributeDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj; @@ -3331,14 +3331,14 @@ ACE_INLINE void POA_CORBA_AttributeDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AttributeDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj; @@ -3346,14 +3346,14 @@ ACE_INLINE void POA_CORBA_AttributeDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AttributeDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_AttributeDef_ptr) obj; @@ -3361,14 +3361,14 @@ ACE_INLINE void POA_CORBA_AttributeDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AttributeDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_AttributeDef_ptr) obj; @@ -3376,14 +3376,14 @@ ACE_INLINE void POA_CORBA_AttributeDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_OperationDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj; @@ -3391,14 +3391,14 @@ ACE_INLINE void POA_CORBA_OperationDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_OperationDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj; @@ -3406,14 +3406,14 @@ ACE_INLINE void POA_CORBA_OperationDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_OperationDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj; @@ -3421,14 +3421,14 @@ ACE_INLINE void POA_CORBA_OperationDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_OperationDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj; @@ -3436,14 +3436,14 @@ ACE_INLINE void POA_CORBA_OperationDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_OperationDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj; @@ -3451,14 +3451,14 @@ ACE_INLINE void POA_CORBA_OperationDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_OperationDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj; @@ -3466,14 +3466,14 @@ ACE_INLINE void POA_CORBA_OperationDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_OperationDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj; @@ -3481,14 +3481,14 @@ ACE_INLINE void POA_CORBA_OperationDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_OperationDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj; @@ -3496,14 +3496,14 @@ ACE_INLINE void POA_CORBA_OperationDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_OperationDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj; @@ -3511,14 +3511,14 @@ ACE_INLINE void POA_CORBA_OperationDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_OperationDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj; @@ -3526,14 +3526,14 @@ ACE_INLINE void POA_CORBA_OperationDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_OperationDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj; @@ -3541,14 +3541,14 @@ ACE_INLINE void POA_CORBA_OperationDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_OperationDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_OperationDef_ptr) obj; @@ -3556,14 +3556,14 @@ ACE_INLINE void POA_CORBA_OperationDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_OperationDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_OperationDef_ptr) obj; @@ -3571,14 +3571,14 @@ ACE_INLINE void POA_CORBA_OperationDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3586,14 +3586,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::lookup_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3601,14 +3601,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3616,14 +3616,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::lookup_name_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3631,14 +3631,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::describe_contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3646,14 +3646,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::create_module_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3661,14 +3661,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::create_constant_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3676,14 +3676,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::create_struct_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3691,14 +3691,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::create_union_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3706,14 +3706,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::create_enum_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3721,14 +3721,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::create_alias_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3736,14 +3736,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::create_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3751,14 +3751,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::create_value_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3766,14 +3766,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::create_value_box_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3781,14 +3781,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::create_exception_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3796,14 +3796,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::create_native_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3811,14 +3811,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::create_abstract_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3826,14 +3826,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::create_local_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3841,14 +3841,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3856,14 +3856,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3871,14 +3871,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3886,14 +3886,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3901,14 +3901,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3916,14 +3916,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3931,14 +3931,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3946,14 +3946,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3961,14 +3961,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3976,14 +3976,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3991,14 +3991,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::_get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -4006,14 +4006,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::_get_type_skel ( req, (POA_CORBA_IDLType_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -4021,14 +4021,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -4036,14 +4036,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_base_interfaces_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4051,14 +4051,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_base_interfaces_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_set_base_interfaces_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4066,14 +4066,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_set_base_interfaces_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::is_a_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4081,14 +4081,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::is_a_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::describe_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4096,14 +4096,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::describe_interface_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_attribute_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4111,14 +4111,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_attribute_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_operation_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4126,14 +4126,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_operation_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4141,14 +4141,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::lookup_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4156,14 +4156,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4171,14 +4171,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::lookup_name_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4186,14 +4186,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::describe_contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4201,14 +4201,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_module_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4216,14 +4216,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_constant_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4231,14 +4231,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_struct_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4246,14 +4246,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_union_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4261,14 +4261,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_enum_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4276,14 +4276,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_alias_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4291,14 +4291,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4306,14 +4306,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_value_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4321,14 +4321,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_value_box_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4336,14 +4336,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_exception_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4351,14 +4351,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_native_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4366,14 +4366,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_abstract_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4381,14 +4381,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_local_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4396,14 +4396,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4411,14 +4411,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4426,14 +4426,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4441,14 +4441,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4456,14 +4456,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4471,14 +4471,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4486,14 +4486,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4501,14 +4501,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4516,14 +4516,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_containing_repository_skel req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4531,14 +4531,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4546,14 +4546,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4561,14 +4561,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_type_skel ( req, (POA_CORBA_IDLType_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4576,14 +4576,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4591,14 +4591,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_base_interfaces_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4606,14 +4606,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_base_interfaces_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::_set_base_interfaces_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4621,14 +4621,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::_set_base_interfaces_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::is_a_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4636,14 +4636,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::is_a_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::describe_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4651,14 +4651,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::describe_interface_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_attribute_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4666,14 +4666,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_attribute_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_operation_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4681,14 +4681,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_operation_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4696,14 +4696,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::lookup_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4711,14 +4711,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4726,14 +4726,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::lookup_name_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4741,14 +4741,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::describe_contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4756,14 +4756,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_module_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4771,14 +4771,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_constant_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4786,14 +4786,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_struct_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4801,14 +4801,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_union_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4816,14 +4816,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_enum_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4831,14 +4831,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_alias_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4846,14 +4846,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4861,14 +4861,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_value_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4876,14 +4876,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_value_box_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4891,14 +4891,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_exception_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4906,14 +4906,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_native_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4921,14 +4921,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_abstract_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4936,14 +4936,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_local_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4951,14 +4951,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4966,14 +4966,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4981,14 +4981,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4996,14 +4996,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -5011,14 +5011,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -5026,14 +5026,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -5041,14 +5041,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -5056,14 +5056,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -5071,14 +5071,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -5086,14 +5086,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -5101,14 +5101,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -5116,14 +5116,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_type_skel ( req, (POA_CORBA_IDLType_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -5131,14 +5131,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -5146,6 +5146,6 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.h b/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.h index 84a6f1f22d9..a9e5d0de606 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.h +++ b/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.h @@ -67,11 +67,11 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA_Contained_ptr lookup_id ( const char * search_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -79,7 +79,7 @@ public: CORBA::TypeCode_ptr get_canonical_typecode ( CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -87,7 +87,7 @@ public: CORBA_PrimitiveDef_ptr get_primitive ( CORBA::PrimitiveKind kind - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -95,7 +95,7 @@ public: CORBA_StringDef_ptr create_string ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -103,7 +103,7 @@ public: CORBA_WstringDef_ptr create_wstring ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -112,7 +112,7 @@ public: CORBA_SequenceDef_ptr create_sequence ( CORBA::ULong bound, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -121,7 +121,7 @@ public: CORBA_ArrayDef_ptr create_array ( CORBA::ULong length, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -130,7 +130,7 @@ public: CORBA_FixedDef_ptr create_fixed ( CORBA::UShort digits, CORBA::Short scale - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -138,7 +138,7 @@ public: CORBA_Contained_ptr lookup ( const char * search_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -147,7 +147,7 @@ public: CORBA_ContainedSeq * contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -158,7 +158,7 @@ public: CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -168,7 +168,7 @@ public: CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -178,7 +178,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -190,7 +190,7 @@ public: const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -201,7 +201,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -213,7 +213,7 @@ public: const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -224,7 +224,7 @@ public: const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -235,7 +235,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -246,7 +246,7 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -263,7 +263,7 @@ public: const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -274,7 +274,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -285,7 +285,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -295,7 +295,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -306,7 +306,7 @@ public: const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -317,21 +317,21 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -377,11 +377,11 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA_Contained_ptr lookup ( const char * search_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -390,7 +390,7 @@ public: CORBA_ContainedSeq * contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -401,7 +401,7 @@ public: CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -411,7 +411,7 @@ public: CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -421,7 +421,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -433,7 +433,7 @@ public: const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -444,7 +444,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -456,7 +456,7 @@ public: const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -467,7 +467,7 @@ public: const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -478,7 +478,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -489,7 +489,7 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -506,7 +506,7 @@ public: const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -517,7 +517,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -528,7 +528,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -538,7 +538,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -549,7 +549,7 @@ public: const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -560,14 +560,14 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -575,14 +575,14 @@ public: void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -590,14 +590,14 @@ public: void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -605,35 +605,35 @@ public: void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -643,21 +643,21 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -703,17 +703,17 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_IDLType_ptr type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -721,14 +721,14 @@ public: void type_def ( CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::Any * value ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -736,14 +736,14 @@ public: void value ( const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -751,14 +751,14 @@ public: void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -766,14 +766,14 @@ public: void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -781,35 +781,35 @@ public: void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -819,21 +819,21 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -879,10 +879,10 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA_StructMemberSeq * members ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -890,7 +890,7 @@ public: void members ( const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -898,7 +898,7 @@ public: CORBA_Contained_ptr lookup ( const char * search_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -907,7 +907,7 @@ public: CORBA_ContainedSeq * contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -918,7 +918,7 @@ public: CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -928,7 +928,7 @@ public: CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -938,7 +938,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -950,7 +950,7 @@ public: const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -961,7 +961,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -973,7 +973,7 @@ public: const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -984,7 +984,7 @@ public: const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -995,7 +995,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1006,7 +1006,7 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1023,7 +1023,7 @@ public: const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1034,7 +1034,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1045,7 +1045,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1055,7 +1055,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1066,7 +1066,7 @@ public: const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1077,14 +1077,14 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1092,14 +1092,14 @@ public: void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1107,14 +1107,14 @@ public: void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1122,35 +1122,35 @@ public: void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1160,28 +1160,28 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1227,17 +1227,17 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::TypeCode_ptr discriminator_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_IDLType_ptr discriminator_type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1245,14 +1245,14 @@ public: void discriminator_type_def ( CORBA_IDLType_ptr discriminator_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_UnionMemberSeq * members ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1260,7 +1260,7 @@ public: void members ( const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1268,7 +1268,7 @@ public: CORBA_Contained_ptr lookup ( const char * search_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1277,7 +1277,7 @@ public: CORBA_ContainedSeq * contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1288,7 +1288,7 @@ public: CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1298,7 +1298,7 @@ public: CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1308,7 +1308,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1320,7 +1320,7 @@ public: const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1331,7 +1331,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1343,7 +1343,7 @@ public: const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1354,7 +1354,7 @@ public: const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1365,7 +1365,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1376,7 +1376,7 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1393,7 +1393,7 @@ public: const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1404,7 +1404,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1415,7 +1415,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1425,7 +1425,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1436,7 +1436,7 @@ public: const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1447,14 +1447,14 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1462,14 +1462,14 @@ public: void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1477,14 +1477,14 @@ public: void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1492,35 +1492,35 @@ public: void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1530,28 +1530,28 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1597,10 +1597,10 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA_EnumMemberSeq * members ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1608,14 +1608,14 @@ public: void members ( const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1623,14 +1623,14 @@ public: void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1638,14 +1638,14 @@ public: void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1653,35 +1653,35 @@ public: void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1691,28 +1691,28 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1758,10 +1758,10 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA_IDLType_ptr original_type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1769,14 +1769,14 @@ public: void original_type_def ( CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1784,14 +1784,14 @@ public: void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1799,14 +1799,14 @@ public: void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1814,35 +1814,35 @@ public: void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1852,28 +1852,28 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1919,10 +1919,10 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1930,14 +1930,14 @@ public: void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1945,14 +1945,14 @@ public: void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1960,35 +1960,35 @@ public: void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1998,28 +1998,28 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2065,31 +2065,31 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::PrimitiveKind kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2135,10 +2135,10 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::ULong bound ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2146,28 +2146,28 @@ public: void bound ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2213,10 +2213,10 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::ULong bound ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2224,28 +2224,28 @@ public: void bound ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2291,10 +2291,10 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::ULong bound ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2302,21 +2302,21 @@ public: void bound ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr element_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_IDLType_ptr element_type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2324,28 +2324,28 @@ public: void element_type_def ( CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2391,10 +2391,10 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::ULong length ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2402,21 +2402,21 @@ public: void length ( CORBA::ULong length - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr element_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_IDLType_ptr element_type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2424,28 +2424,28 @@ public: void element_type_def ( CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2491,17 +2491,17 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_StructMemberSeq * members ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2509,14 +2509,14 @@ public: void members ( const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2524,14 +2524,14 @@ public: void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2539,14 +2539,14 @@ public: void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2554,35 +2554,35 @@ public: void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2592,7 +2592,7 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2600,7 +2600,7 @@ public: CORBA_Contained_ptr lookup ( const char * search_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2609,7 +2609,7 @@ public: CORBA_ContainedSeq * contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2620,7 +2620,7 @@ public: CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2630,7 +2630,7 @@ public: CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2640,7 +2640,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2652,7 +2652,7 @@ public: const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2663,7 +2663,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2675,7 +2675,7 @@ public: const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2686,7 +2686,7 @@ public: const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2697,7 +2697,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2708,7 +2708,7 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2725,7 +2725,7 @@ public: const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2736,7 +2736,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2747,7 +2747,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2757,7 +2757,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2768,7 +2768,7 @@ public: const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2779,21 +2779,21 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2839,17 +2839,17 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_IDLType_ptr type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2857,14 +2857,14 @@ public: void type_def ( CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::AttributeMode mode ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2872,14 +2872,14 @@ public: void mode ( CORBA::AttributeMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2887,14 +2887,14 @@ public: void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2902,14 +2902,14 @@ public: void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2917,35 +2917,35 @@ public: void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2955,21 +2955,21 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3015,17 +3015,17 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::TypeCode_ptr result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_IDLType_ptr result_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3033,14 +3033,14 @@ public: void result_def ( CORBA_IDLType_ptr result_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_ParDescriptionSeq * params ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3048,14 +3048,14 @@ public: void params ( const CORBA_ParDescriptionSeq & params - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::OperationMode mode ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3063,14 +3063,14 @@ public: void mode ( CORBA::OperationMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_ContextIdSeq * contexts ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3078,14 +3078,14 @@ public: void contexts ( const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_ExceptionDefSeq * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3093,14 +3093,14 @@ public: void exceptions ( const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3108,14 +3108,14 @@ public: void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3123,14 +3123,14 @@ public: void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3138,35 +3138,35 @@ public: void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3176,21 +3176,21 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3236,10 +3236,10 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA_InterfaceDefSeq * base_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3247,7 +3247,7 @@ public: void base_interfaces ( const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3255,14 +3255,14 @@ public: CORBA::Boolean is_a ( const char * interface_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_InterfaceDef::FullInterfaceDescription * describe_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3274,7 +3274,7 @@ public: const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3289,7 +3289,7 @@ public: const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3297,7 +3297,7 @@ public: CORBA_Contained_ptr lookup ( const char * search_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3306,7 +3306,7 @@ public: CORBA_ContainedSeq * contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3317,7 +3317,7 @@ public: CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3327,7 +3327,7 @@ public: CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3337,7 +3337,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3349,7 +3349,7 @@ public: const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3360,7 +3360,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3372,7 +3372,7 @@ public: const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3383,7 +3383,7 @@ public: const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3394,7 +3394,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3405,7 +3405,7 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3422,7 +3422,7 @@ public: const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3433,7 +3433,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3444,7 +3444,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3454,7 +3454,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3465,7 +3465,7 @@ public: const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3476,14 +3476,14 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3491,14 +3491,14 @@ public: void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3506,14 +3506,14 @@ public: void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3521,35 +3521,35 @@ public: void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3559,28 +3559,28 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3626,10 +3626,10 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA_InterfaceDefSeq * base_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3637,7 +3637,7 @@ public: void base_interfaces ( const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3645,14 +3645,14 @@ public: CORBA::Boolean is_a ( const char * interface_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_InterfaceDef::FullInterfaceDescription * describe_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3664,7 +3664,7 @@ public: const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3679,7 +3679,7 @@ public: const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3687,7 +3687,7 @@ public: CORBA_Contained_ptr lookup ( const char * search_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3696,7 +3696,7 @@ public: CORBA_ContainedSeq * contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3707,7 +3707,7 @@ public: CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3717,7 +3717,7 @@ public: CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3727,7 +3727,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3739,7 +3739,7 @@ public: const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3750,7 +3750,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3762,7 +3762,7 @@ public: const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3773,7 +3773,7 @@ public: const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3784,7 +3784,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3795,7 +3795,7 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3812,7 +3812,7 @@ public: const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3823,7 +3823,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3834,7 +3834,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3844,7 +3844,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3855,7 +3855,7 @@ public: const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3866,14 +3866,14 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3881,14 +3881,14 @@ public: void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3896,14 +3896,14 @@ public: void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3911,35 +3911,35 @@ public: void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3949,28 +3949,28 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4016,10 +4016,10 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA_InterfaceDefSeq * base_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4027,7 +4027,7 @@ public: void base_interfaces ( const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4035,14 +4035,14 @@ public: CORBA::Boolean is_a ( const char * interface_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_InterfaceDef::FullInterfaceDescription * describe_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4054,7 +4054,7 @@ public: const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4069,7 +4069,7 @@ public: const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4077,7 +4077,7 @@ public: CORBA_Contained_ptr lookup ( const char * search_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4086,7 +4086,7 @@ public: CORBA_ContainedSeq * contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4097,7 +4097,7 @@ public: CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4107,7 +4107,7 @@ public: CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4117,7 +4117,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4129,7 +4129,7 @@ public: const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4140,7 +4140,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4152,7 +4152,7 @@ public: const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4163,7 +4163,7 @@ public: const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4174,7 +4174,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4185,7 +4185,7 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4202,7 +4202,7 @@ public: const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4213,7 +4213,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4224,7 +4224,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4234,7 +4234,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4245,7 +4245,7 @@ public: const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4256,14 +4256,14 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4271,14 +4271,14 @@ public: void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4286,14 +4286,14 @@ public: void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4301,35 +4301,35 @@ public: void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4339,28 +4339,28 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.i b/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.i index ca9953d37d4..1c872d26eb9 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.i +++ b/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.i @@ -90,18 +90,18 @@ POA_CORBA_Repository_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_CORBA_Repository_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_Repository_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_Repository::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_Repository::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE CORBA_Contained_ptr POA_CORBA_Repository_tie::lookup_id ( const char * search_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -109,14 +109,14 @@ CORBA_Contained_ptr POA_CORBA_Repository_tie::lookup_id ( { return this->ptr_->lookup_id ( search_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_Repository_tie::get_canonical_typecode ( CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -124,14 +124,14 @@ CORBA::TypeCode_ptr POA_CORBA_Repository_tie::get_canonical_typecode ( { return this->ptr_->get_canonical_typecode ( tc - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_PrimitiveDef_ptr POA_CORBA_Repository_tie::get_primitive ( CORBA::PrimitiveKind kind - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -139,14 +139,14 @@ CORBA_PrimitiveDef_ptr POA_CORBA_Repository_tie::get_primitive ( { return this->ptr_->get_primitive ( kind - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_StringDef_ptr POA_CORBA_Repository_tie::create_string ( CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -154,14 +154,14 @@ CORBA_StringDef_ptr POA_CORBA_Repository_tie::create_string ( { return this->ptr_->create_string ( bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_WstringDef_ptr POA_CORBA_Repository_tie::create_wstring ( CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -169,7 +169,7 @@ CORBA_WstringDef_ptr POA_CORBA_Repository_tie::create_wstring ( { return this->ptr_->create_wstring ( bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -177,7 +177,7 @@ template ACE_INLINE CORBA_SequenceDef_ptr POA_CORBA_Repository_tie::create_sequence ( CORBA::ULong bound, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -186,7 +186,7 @@ CORBA_SequenceDef_ptr POA_CORBA_Repository_tie::create_sequence ( return this->ptr_->create_sequence ( bound, element_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -194,7 +194,7 @@ template ACE_INLINE CORBA_ArrayDef_ptr POA_CORBA_Repository_tie::create_array ( CORBA::ULong length, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -203,7 +203,7 @@ CORBA_ArrayDef_ptr POA_CORBA_Repository_tie::create_array ( return this->ptr_->create_array ( length, element_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -211,7 +211,7 @@ template ACE_INLINE CORBA_FixedDef_ptr POA_CORBA_Repository_tie::create_fixed ( CORBA::UShort digits, CORBA::Short scale - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -220,14 +220,14 @@ CORBA_FixedDef_ptr POA_CORBA_Repository_tie::create_fixed ( return this->ptr_->create_fixed ( digits, scale - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained_ptr POA_CORBA_Repository_tie::lookup ( const char * search_name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -235,7 +235,7 @@ CORBA_Contained_ptr POA_CORBA_Repository_tie::lookup ( { return this->ptr_->lookup ( search_name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -243,7 +243,7 @@ template ACE_INLINE CORBA_ContainedSeq * POA_CORBA_Repository_tie::contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -252,7 +252,7 @@ CORBA_ContainedSeq * POA_CORBA_Repository_tie::contents ( return this->ptr_->contents ( limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -262,7 +262,7 @@ CORBA_ContainedSeq * POA_CORBA_Repository_tie::lookup_name ( CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -273,7 +273,7 @@ search_name, levels_to_search, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -282,7 +282,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_Repository_tie::describe_contents CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -292,7 +292,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_Repository_tie::describe_contents limit_type, exclude_inherited, max_returned_objs - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -301,7 +301,7 @@ CORBA_ModuleDef_ptr POA_CORBA_Repository_tie::create_module ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -311,7 +311,7 @@ CORBA_ModuleDef_ptr POA_CORBA_Repository_tie::create_module ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -322,7 +322,7 @@ CORBA_ConstantDef_ptr POA_CORBA_Repository_tie::create_constant ( const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -334,7 +334,7 @@ id, version, type, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -344,7 +344,7 @@ CORBA_StructDef_ptr POA_CORBA_Repository_tie::create_struct ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -355,7 +355,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -366,7 +366,7 @@ CORBA_UnionDef_ptr POA_CORBA_Repository_tie::create_union ( const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -378,7 +378,7 @@ id, version, discriminator_type, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -388,7 +388,7 @@ CORBA_EnumDef_ptr POA_CORBA_Repository_tie::create_enum ( const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -399,7 +399,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -409,7 +409,7 @@ CORBA_AliasDef_ptr POA_CORBA_Repository_tie::create_alias ( const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -420,7 +420,7 @@ id, name, version, original_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -430,7 +430,7 @@ CORBA_InterfaceDef_ptr POA_CORBA_Repository_tie::create_interface ( const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -441,7 +441,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -457,7 +457,7 @@ CORBA_ValueDef_ptr POA_CORBA_Repository_tie::create_value ( const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -474,7 +474,7 @@ id, abstract_base_values, supported_interfaces, initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -484,7 +484,7 @@ CORBA_ValueBoxDef_ptr POA_CORBA_Repository_tie::create_value_box ( const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -495,7 +495,7 @@ id, name, version, original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -505,7 +505,7 @@ CORBA_ExceptionDef_ptr POA_CORBA_Repository_tie::create_exception ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -516,7 +516,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -525,7 +525,7 @@ CORBA_NativeDef_ptr POA_CORBA_Repository_tie::create_native ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -535,7 +535,7 @@ CORBA_NativeDef_ptr POA_CORBA_Repository_tie::create_native ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -545,7 +545,7 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_Repository_tie::create_abstract_inte const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -556,7 +556,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -566,7 +566,7 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_Repository_tie::create_local_interface const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -577,33 +577,33 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::DefinitionKind POA_CORBA_Repository_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_Repository_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -676,18 +676,18 @@ POA_CORBA_ModuleDef_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_CORBA_ModuleDef_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_ModuleDef_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_ModuleDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_ModuleDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE CORBA_Contained_ptr POA_CORBA_ModuleDef_tie::lookup ( const char * search_name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -695,7 +695,7 @@ CORBA_Contained_ptr POA_CORBA_ModuleDef_tie::lookup ( { return this->ptr_->lookup ( search_name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -703,7 +703,7 @@ template ACE_INLINE CORBA_ContainedSeq * POA_CORBA_ModuleDef_tie::contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -712,7 +712,7 @@ CORBA_ContainedSeq * POA_CORBA_ModuleDef_tie::contents ( return this->ptr_->contents ( limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -722,7 +722,7 @@ CORBA_ContainedSeq * POA_CORBA_ModuleDef_tie::lookup_name ( CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -733,7 +733,7 @@ search_name, levels_to_search, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -742,7 +742,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_ModuleDef_tie::describe_contents CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -752,7 +752,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_ModuleDef_tie::describe_contents limit_type, exclude_inherited, max_returned_objs - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -761,7 +761,7 @@ CORBA_ModuleDef_ptr POA_CORBA_ModuleDef_tie::create_module ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -771,7 +771,7 @@ CORBA_ModuleDef_ptr POA_CORBA_ModuleDef_tie::create_module ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -782,7 +782,7 @@ CORBA_ConstantDef_ptr POA_CORBA_ModuleDef_tie::create_constant ( const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -794,7 +794,7 @@ id, version, type, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -804,7 +804,7 @@ CORBA_StructDef_ptr POA_CORBA_ModuleDef_tie::create_struct ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -815,7 +815,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -826,7 +826,7 @@ CORBA_UnionDef_ptr POA_CORBA_ModuleDef_tie::create_union ( const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -838,7 +838,7 @@ id, version, discriminator_type, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -848,7 +848,7 @@ CORBA_EnumDef_ptr POA_CORBA_ModuleDef_tie::create_enum ( const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -859,7 +859,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -869,7 +869,7 @@ CORBA_AliasDef_ptr POA_CORBA_ModuleDef_tie::create_alias ( const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -880,7 +880,7 @@ id, name, version, original_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -890,7 +890,7 @@ CORBA_InterfaceDef_ptr POA_CORBA_ModuleDef_tie::create_interface ( const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -901,7 +901,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -917,7 +917,7 @@ CORBA_ValueDef_ptr POA_CORBA_ModuleDef_tie::create_value ( const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -934,7 +934,7 @@ id, abstract_base_values, supported_interfaces, initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -944,7 +944,7 @@ CORBA_ValueBoxDef_ptr POA_CORBA_ModuleDef_tie::create_value_box ( const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -955,7 +955,7 @@ id, name, version, original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -965,7 +965,7 @@ CORBA_ExceptionDef_ptr POA_CORBA_ModuleDef_tie::create_exception ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -976,7 +976,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -985,7 +985,7 @@ CORBA_NativeDef_ptr POA_CORBA_ModuleDef_tie::create_native ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -995,7 +995,7 @@ CORBA_NativeDef_ptr POA_CORBA_ModuleDef_tie::create_native ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1005,7 +1005,7 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_ModuleDef_tie::create_abstract_inter const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1016,7 +1016,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1026,7 +1026,7 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_ModuleDef_tie::create_local_interface const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1037,27 +1037,27 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_ModuleDef_tie::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ModuleDef_tie::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1065,27 +1065,27 @@ void POA_CORBA_ModuleDef_tie::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_ModuleDef_tie::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ModuleDef_tie::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1093,27 +1093,27 @@ void POA_CORBA_ModuleDef_tie::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_ModuleDef_tie::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ModuleDef_tie::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1121,59 +1121,59 @@ void POA_CORBA_ModuleDef_tie::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Container_ptr POA_CORBA_ModuleDef_tie::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_ModuleDef_tie::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Repository_ptr POA_CORBA_ModuleDef_tie::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained::Description * POA_CORBA_ModuleDef_tie::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -1182,7 +1182,7 @@ void POA_CORBA_ModuleDef_tie::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1192,33 +1192,33 @@ void POA_CORBA_ModuleDef_tie::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::DefinitionKind POA_CORBA_ModuleDef_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ModuleDef_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -1291,44 +1291,44 @@ POA_CORBA_ConstantDef_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_CORBA_ConstantDef_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_ConstantDef_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_ConstantDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_ConstantDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_ConstantDef_tie::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_IDLType_ptr POA_CORBA_ConstantDef_tie::type_def ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ConstantDef_tie::type_def ( CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1336,27 +1336,27 @@ void POA_CORBA_ConstantDef_tie::type_def ( { this->ptr_->type_def ( type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::Any * POA_CORBA_ConstantDef_tie::value ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->value ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ConstantDef_tie::value ( const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1364,27 +1364,27 @@ void POA_CORBA_ConstantDef_tie::value ( { this->ptr_->value ( value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_ConstantDef_tie::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ConstantDef_tie::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1392,27 +1392,27 @@ void POA_CORBA_ConstantDef_tie::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_ConstantDef_tie::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ConstantDef_tie::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1420,27 +1420,27 @@ void POA_CORBA_ConstantDef_tie::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_ConstantDef_tie::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ConstantDef_tie::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1448,59 +1448,59 @@ void POA_CORBA_ConstantDef_tie::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Container_ptr POA_CORBA_ConstantDef_tie::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_ConstantDef_tie::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Repository_ptr POA_CORBA_ConstantDef_tie::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained::Description * POA_CORBA_ConstantDef_tie::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -1509,7 +1509,7 @@ void POA_CORBA_ConstantDef_tie::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1519,33 +1519,33 @@ void POA_CORBA_ConstantDef_tie::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::DefinitionKind POA_CORBA_ConstantDef_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ConstantDef_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -1618,31 +1618,31 @@ POA_CORBA_StructDef_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_CORBA_StructDef_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_StructDef_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_StructDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_StructDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE CORBA_StructMemberSeq * POA_CORBA_StructDef_tie::members ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->members ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_StructDef_tie::members ( const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1650,14 +1650,14 @@ void POA_CORBA_StructDef_tie::members ( { this->ptr_->members ( members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained_ptr POA_CORBA_StructDef_tie::lookup ( const char * search_name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1665,7 +1665,7 @@ CORBA_Contained_ptr POA_CORBA_StructDef_tie::lookup ( { return this->ptr_->lookup ( search_name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1673,7 +1673,7 @@ template ACE_INLINE CORBA_ContainedSeq * POA_CORBA_StructDef_tie::contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1682,7 +1682,7 @@ CORBA_ContainedSeq * POA_CORBA_StructDef_tie::contents ( return this->ptr_->contents ( limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1692,7 +1692,7 @@ CORBA_ContainedSeq * POA_CORBA_StructDef_tie::lookup_name ( CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1703,7 +1703,7 @@ search_name, levels_to_search, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1712,7 +1712,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_StructDef_tie::describe_contents CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1722,7 +1722,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_StructDef_tie::describe_contents limit_type, exclude_inherited, max_returned_objs - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1731,7 +1731,7 @@ CORBA_ModuleDef_ptr POA_CORBA_StructDef_tie::create_module ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1741,7 +1741,7 @@ CORBA_ModuleDef_ptr POA_CORBA_StructDef_tie::create_module ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1752,7 +1752,7 @@ CORBA_ConstantDef_ptr POA_CORBA_StructDef_tie::create_constant ( const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1764,7 +1764,7 @@ id, version, type, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1774,7 +1774,7 @@ CORBA_StructDef_ptr POA_CORBA_StructDef_tie::create_struct ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1785,7 +1785,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1796,7 +1796,7 @@ CORBA_UnionDef_ptr POA_CORBA_StructDef_tie::create_union ( const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1808,7 +1808,7 @@ id, version, discriminator_type, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1818,7 +1818,7 @@ CORBA_EnumDef_ptr POA_CORBA_StructDef_tie::create_enum ( const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1829,7 +1829,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1839,7 +1839,7 @@ CORBA_AliasDef_ptr POA_CORBA_StructDef_tie::create_alias ( const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1850,7 +1850,7 @@ id, name, version, original_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1860,7 +1860,7 @@ CORBA_InterfaceDef_ptr POA_CORBA_StructDef_tie::create_interface ( const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1871,7 +1871,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1887,7 +1887,7 @@ CORBA_ValueDef_ptr POA_CORBA_StructDef_tie::create_value ( const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1904,7 +1904,7 @@ id, abstract_base_values, supported_interfaces, initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1914,7 +1914,7 @@ CORBA_ValueBoxDef_ptr POA_CORBA_StructDef_tie::create_value_box ( const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1925,7 +1925,7 @@ id, name, version, original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1935,7 +1935,7 @@ CORBA_ExceptionDef_ptr POA_CORBA_StructDef_tie::create_exception ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1946,7 +1946,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1955,7 +1955,7 @@ CORBA_NativeDef_ptr POA_CORBA_StructDef_tie::create_native ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1965,7 +1965,7 @@ CORBA_NativeDef_ptr POA_CORBA_StructDef_tie::create_native ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1975,7 +1975,7 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_StructDef_tie::create_abstract_inter const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1986,7 +1986,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1996,7 +1996,7 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_StructDef_tie::create_local_interface const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2007,27 +2007,27 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_StructDef_tie::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_StructDef_tie::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2035,27 +2035,27 @@ void POA_CORBA_StructDef_tie::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_StructDef_tie::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_StructDef_tie::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2063,27 +2063,27 @@ void POA_CORBA_StructDef_tie::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_StructDef_tie::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_StructDef_tie::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2091,59 +2091,59 @@ void POA_CORBA_StructDef_tie::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Container_ptr POA_CORBA_StructDef_tie::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_StructDef_tie::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Repository_ptr POA_CORBA_StructDef_tie::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained::Description * POA_CORBA_StructDef_tie::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -2152,7 +2152,7 @@ void POA_CORBA_StructDef_tie::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2162,46 +2162,46 @@ void POA_CORBA_StructDef_tie::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_StructDef_tie::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA::DefinitionKind POA_CORBA_StructDef_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_StructDef_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -2274,44 +2274,44 @@ POA_CORBA_UnionDef_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_CORBA_UnionDef_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_UnionDef_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_UnionDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_UnionDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_UnionDef_tie::discriminator_type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->discriminator_type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_IDLType_ptr POA_CORBA_UnionDef_tie::discriminator_type_def ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->discriminator_type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_UnionDef_tie::discriminator_type_def ( CORBA_IDLType_ptr discriminator_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2319,27 +2319,27 @@ void POA_CORBA_UnionDef_tie::discriminator_type_def ( { this->ptr_->discriminator_type_def ( discriminator_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_UnionMemberSeq * POA_CORBA_UnionDef_tie::members ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->members ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_UnionDef_tie::members ( const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2347,14 +2347,14 @@ void POA_CORBA_UnionDef_tie::members ( { this->ptr_->members ( members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained_ptr POA_CORBA_UnionDef_tie::lookup ( const char * search_name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2362,7 +2362,7 @@ CORBA_Contained_ptr POA_CORBA_UnionDef_tie::lookup ( { return this->ptr_->lookup ( search_name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2370,7 +2370,7 @@ template ACE_INLINE CORBA_ContainedSeq * POA_CORBA_UnionDef_tie::contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2379,7 +2379,7 @@ CORBA_ContainedSeq * POA_CORBA_UnionDef_tie::contents ( return this->ptr_->contents ( limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2389,7 +2389,7 @@ CORBA_ContainedSeq * POA_CORBA_UnionDef_tie::lookup_name ( CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2400,7 +2400,7 @@ search_name, levels_to_search, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2409,7 +2409,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_UnionDef_tie::describe_contents CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2419,7 +2419,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_UnionDef_tie::describe_contents limit_type, exclude_inherited, max_returned_objs - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2428,7 +2428,7 @@ CORBA_ModuleDef_ptr POA_CORBA_UnionDef_tie::create_module ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2438,7 +2438,7 @@ CORBA_ModuleDef_ptr POA_CORBA_UnionDef_tie::create_module ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2449,7 +2449,7 @@ CORBA_ConstantDef_ptr POA_CORBA_UnionDef_tie::create_constant ( const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2461,7 +2461,7 @@ id, version, type, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2471,7 +2471,7 @@ CORBA_StructDef_ptr POA_CORBA_UnionDef_tie::create_struct ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2482,7 +2482,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2493,7 +2493,7 @@ CORBA_UnionDef_ptr POA_CORBA_UnionDef_tie::create_union ( const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2505,7 +2505,7 @@ id, version, discriminator_type, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2515,7 +2515,7 @@ CORBA_EnumDef_ptr POA_CORBA_UnionDef_tie::create_enum ( const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2526,7 +2526,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2536,7 +2536,7 @@ CORBA_AliasDef_ptr POA_CORBA_UnionDef_tie::create_alias ( const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2547,7 +2547,7 @@ id, name, version, original_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2557,7 +2557,7 @@ CORBA_InterfaceDef_ptr POA_CORBA_UnionDef_tie::create_interface ( const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2568,7 +2568,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2584,7 +2584,7 @@ CORBA_ValueDef_ptr POA_CORBA_UnionDef_tie::create_value ( const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2601,7 +2601,7 @@ id, abstract_base_values, supported_interfaces, initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2611,7 +2611,7 @@ CORBA_ValueBoxDef_ptr POA_CORBA_UnionDef_tie::create_value_box ( const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2622,7 +2622,7 @@ id, name, version, original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2632,7 +2632,7 @@ CORBA_ExceptionDef_ptr POA_CORBA_UnionDef_tie::create_exception ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2643,7 +2643,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2652,7 +2652,7 @@ CORBA_NativeDef_ptr POA_CORBA_UnionDef_tie::create_native ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2662,7 +2662,7 @@ CORBA_NativeDef_ptr POA_CORBA_UnionDef_tie::create_native ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2672,7 +2672,7 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_UnionDef_tie::create_abstract_interf const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2683,7 +2683,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2693,7 +2693,7 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_UnionDef_tie::create_local_interface ( const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2704,27 +2704,27 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_UnionDef_tie::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_UnionDef_tie::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2732,27 +2732,27 @@ void POA_CORBA_UnionDef_tie::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_UnionDef_tie::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_UnionDef_tie::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2760,27 +2760,27 @@ void POA_CORBA_UnionDef_tie::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_UnionDef_tie::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_UnionDef_tie::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2788,59 +2788,59 @@ void POA_CORBA_UnionDef_tie::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Container_ptr POA_CORBA_UnionDef_tie::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_UnionDef_tie::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Repository_ptr POA_CORBA_UnionDef_tie::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained::Description * POA_CORBA_UnionDef_tie::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -2849,7 +2849,7 @@ void POA_CORBA_UnionDef_tie::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2859,46 +2859,46 @@ void POA_CORBA_UnionDef_tie::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_UnionDef_tie::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA::DefinitionKind POA_CORBA_UnionDef_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_UnionDef_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -2971,31 +2971,31 @@ POA_CORBA_EnumDef_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_CORBA_EnumDef_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_EnumDef_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_EnumDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_EnumDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE CORBA_EnumMemberSeq * POA_CORBA_EnumDef_tie::members ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->members ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_EnumDef_tie::members ( const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3003,27 +3003,27 @@ void POA_CORBA_EnumDef_tie::members ( { this->ptr_->members ( members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_EnumDef_tie::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_EnumDef_tie::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3031,27 +3031,27 @@ void POA_CORBA_EnumDef_tie::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_EnumDef_tie::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_EnumDef_tie::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3059,27 +3059,27 @@ void POA_CORBA_EnumDef_tie::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_EnumDef_tie::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_EnumDef_tie::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3087,59 +3087,59 @@ void POA_CORBA_EnumDef_tie::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Container_ptr POA_CORBA_EnumDef_tie::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_EnumDef_tie::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Repository_ptr POA_CORBA_EnumDef_tie::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained::Description * POA_CORBA_EnumDef_tie::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -3148,7 +3148,7 @@ void POA_CORBA_EnumDef_tie::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3158,46 +3158,46 @@ void POA_CORBA_EnumDef_tie::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_EnumDef_tie::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA::DefinitionKind POA_CORBA_EnumDef_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_EnumDef_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -3270,31 +3270,31 @@ POA_CORBA_AliasDef_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_CORBA_AliasDef_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_AliasDef_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_AliasDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_AliasDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE CORBA_IDLType_ptr POA_CORBA_AliasDef_tie::original_type_def ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->original_type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_AliasDef_tie::original_type_def ( CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3302,27 +3302,27 @@ void POA_CORBA_AliasDef_tie::original_type_def ( { this->ptr_->original_type_def ( original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_AliasDef_tie::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_AliasDef_tie::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3330,27 +3330,27 @@ void POA_CORBA_AliasDef_tie::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_AliasDef_tie::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_AliasDef_tie::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3358,27 +3358,27 @@ void POA_CORBA_AliasDef_tie::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_AliasDef_tie::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_AliasDef_tie::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3386,59 +3386,59 @@ void POA_CORBA_AliasDef_tie::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Container_ptr POA_CORBA_AliasDef_tie::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_AliasDef_tie::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Repository_ptr POA_CORBA_AliasDef_tie::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained::Description * POA_CORBA_AliasDef_tie::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -3447,7 +3447,7 @@ void POA_CORBA_AliasDef_tie::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3457,46 +3457,46 @@ void POA_CORBA_AliasDef_tie::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_AliasDef_tie::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA::DefinitionKind POA_CORBA_AliasDef_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_AliasDef_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -3569,31 +3569,31 @@ POA_CORBA_NativeDef_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_CORBA_NativeDef_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_NativeDef_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_NativeDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_NativeDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE char * POA_CORBA_NativeDef_tie::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_NativeDef_tie::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3601,27 +3601,27 @@ void POA_CORBA_NativeDef_tie::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_NativeDef_tie::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_NativeDef_tie::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3629,27 +3629,27 @@ void POA_CORBA_NativeDef_tie::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_NativeDef_tie::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_NativeDef_tie::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3657,59 +3657,59 @@ void POA_CORBA_NativeDef_tie::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Container_ptr POA_CORBA_NativeDef_tie::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_NativeDef_tie::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Repository_ptr POA_CORBA_NativeDef_tie::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained::Description * POA_CORBA_NativeDef_tie::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -3718,7 +3718,7 @@ void POA_CORBA_NativeDef_tie::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3728,46 +3728,46 @@ void POA_CORBA_NativeDef_tie::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_NativeDef_tie::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA::DefinitionKind POA_CORBA_NativeDef_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_NativeDef_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -3840,63 +3840,63 @@ POA_CORBA_PrimitiveDef_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_CORBA_PrimitiveDef_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_PrimitiveDef_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_PrimitiveDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_PrimitiveDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE CORBA::PrimitiveKind POA_CORBA_PrimitiveDef_tie::kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_PrimitiveDef_tie::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA::DefinitionKind POA_CORBA_PrimitiveDef_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_PrimitiveDef_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -3969,31 +3969,31 @@ POA_CORBA_StringDef_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_CORBA_StringDef_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_StringDef_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_StringDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_StringDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE CORBA::ULong POA_CORBA_StringDef_tie::bound ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->bound ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_StringDef_tie::bound ( CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4001,46 +4001,46 @@ void POA_CORBA_StringDef_tie::bound ( { this->ptr_->bound ( bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_StringDef_tie::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA::DefinitionKind POA_CORBA_StringDef_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_StringDef_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -4113,31 +4113,31 @@ POA_CORBA_WstringDef_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_CORBA_WstringDef_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_WstringDef_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_WstringDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_WstringDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE CORBA::ULong POA_CORBA_WstringDef_tie::bound ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->bound ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_WstringDef_tie::bound ( CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4145,46 +4145,46 @@ void POA_CORBA_WstringDef_tie::bound ( { this->ptr_->bound ( bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_WstringDef_tie::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA::DefinitionKind POA_CORBA_WstringDef_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_WstringDef_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -4257,31 +4257,31 @@ POA_CORBA_SequenceDef_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_CORBA_SequenceDef_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_SequenceDef_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_SequenceDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_SequenceDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE CORBA::ULong POA_CORBA_SequenceDef_tie::bound ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->bound ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_SequenceDef_tie::bound ( CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4289,40 +4289,40 @@ void POA_CORBA_SequenceDef_tie::bound ( { this->ptr_->bound ( bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_SequenceDef_tie::element_type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->element_type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_IDLType_ptr POA_CORBA_SequenceDef_tie::element_type_def ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->element_type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_SequenceDef_tie::element_type_def ( CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4330,46 +4330,46 @@ void POA_CORBA_SequenceDef_tie::element_type_def ( { this->ptr_->element_type_def ( element_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_SequenceDef_tie::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA::DefinitionKind POA_CORBA_SequenceDef_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_SequenceDef_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -4442,31 +4442,31 @@ POA_CORBA_ArrayDef_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_CORBA_ArrayDef_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_ArrayDef_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_ArrayDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_ArrayDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE CORBA::ULong POA_CORBA_ArrayDef_tie::length ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->length ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ArrayDef_tie::length ( CORBA::ULong length - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4474,40 +4474,40 @@ void POA_CORBA_ArrayDef_tie::length ( { this->ptr_->length ( length - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_ArrayDef_tie::element_type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->element_type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_IDLType_ptr POA_CORBA_ArrayDef_tie::element_type_def ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->element_type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ArrayDef_tie::element_type_def ( CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4515,46 +4515,46 @@ void POA_CORBA_ArrayDef_tie::element_type_def ( { this->ptr_->element_type_def ( element_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_ArrayDef_tie::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA::DefinitionKind POA_CORBA_ArrayDef_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ArrayDef_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -4627,44 +4627,44 @@ POA_CORBA_ExceptionDef_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_CORBA_ExceptionDef_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_ExceptionDef_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_ExceptionDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_ExceptionDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_ExceptionDef_tie::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_StructMemberSeq * POA_CORBA_ExceptionDef_tie::members ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->members ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ExceptionDef_tie::members ( const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4672,27 +4672,27 @@ void POA_CORBA_ExceptionDef_tie::members ( { this->ptr_->members ( members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_ExceptionDef_tie::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ExceptionDef_tie::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4700,27 +4700,27 @@ void POA_CORBA_ExceptionDef_tie::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_ExceptionDef_tie::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ExceptionDef_tie::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4728,27 +4728,27 @@ void POA_CORBA_ExceptionDef_tie::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_ExceptionDef_tie::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ExceptionDef_tie::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4756,59 +4756,59 @@ void POA_CORBA_ExceptionDef_tie::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Container_ptr POA_CORBA_ExceptionDef_tie::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_ExceptionDef_tie::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Repository_ptr POA_CORBA_ExceptionDef_tie::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained::Description * POA_CORBA_ExceptionDef_tie::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -4817,7 +4817,7 @@ void POA_CORBA_ExceptionDef_tie::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4827,14 +4827,14 @@ void POA_CORBA_ExceptionDef_tie::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained_ptr POA_CORBA_ExceptionDef_tie::lookup ( const char * search_name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4842,7 +4842,7 @@ CORBA_Contained_ptr POA_CORBA_ExceptionDef_tie::lookup ( { return this->ptr_->lookup ( search_name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4850,7 +4850,7 @@ template ACE_INLINE CORBA_ContainedSeq * POA_CORBA_ExceptionDef_tie::contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4859,7 +4859,7 @@ CORBA_ContainedSeq * POA_CORBA_ExceptionDef_tie::contents ( return this->ptr_->contents ( limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4869,7 +4869,7 @@ CORBA_ContainedSeq * POA_CORBA_ExceptionDef_tie::lookup_name ( CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4880,7 +4880,7 @@ search_name, levels_to_search, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4889,7 +4889,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_ExceptionDef_tie::describe_conten CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4899,7 +4899,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_ExceptionDef_tie::describe_conten limit_type, exclude_inherited, max_returned_objs - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4908,7 +4908,7 @@ CORBA_ModuleDef_ptr POA_CORBA_ExceptionDef_tie::create_module ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4918,7 +4918,7 @@ CORBA_ModuleDef_ptr POA_CORBA_ExceptionDef_tie::create_module ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4929,7 +4929,7 @@ CORBA_ConstantDef_ptr POA_CORBA_ExceptionDef_tie::create_constant ( const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4941,7 +4941,7 @@ id, version, type, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4951,7 +4951,7 @@ CORBA_StructDef_ptr POA_CORBA_ExceptionDef_tie::create_struct ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4962,7 +4962,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4973,7 +4973,7 @@ CORBA_UnionDef_ptr POA_CORBA_ExceptionDef_tie::create_union ( const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4985,7 +4985,7 @@ id, version, discriminator_type, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4995,7 +4995,7 @@ CORBA_EnumDef_ptr POA_CORBA_ExceptionDef_tie::create_enum ( const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5006,7 +5006,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -5016,7 +5016,7 @@ CORBA_AliasDef_ptr POA_CORBA_ExceptionDef_tie::create_alias ( const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5027,7 +5027,7 @@ id, name, version, original_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -5037,7 +5037,7 @@ CORBA_InterfaceDef_ptr POA_CORBA_ExceptionDef_tie::create_interface ( const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5048,7 +5048,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -5064,7 +5064,7 @@ CORBA_ValueDef_ptr POA_CORBA_ExceptionDef_tie::create_value ( const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5081,7 +5081,7 @@ id, abstract_base_values, supported_interfaces, initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -5091,7 +5091,7 @@ CORBA_ValueBoxDef_ptr POA_CORBA_ExceptionDef_tie::create_value_box ( const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5102,7 +5102,7 @@ id, name, version, original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -5112,7 +5112,7 @@ CORBA_ExceptionDef_ptr POA_CORBA_ExceptionDef_tie::create_exception ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5123,7 +5123,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -5132,7 +5132,7 @@ CORBA_NativeDef_ptr POA_CORBA_ExceptionDef_tie::create_native ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5142,7 +5142,7 @@ CORBA_NativeDef_ptr POA_CORBA_ExceptionDef_tie::create_native ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -5152,7 +5152,7 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_ExceptionDef_tie::create_abstract_in const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5163,7 +5163,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -5173,7 +5173,7 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_ExceptionDef_tie::create_local_interfac const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5184,33 +5184,33 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::DefinitionKind POA_CORBA_ExceptionDef_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ExceptionDef_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -5283,44 +5283,44 @@ POA_CORBA_AttributeDef_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_CORBA_AttributeDef_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_AttributeDef_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_AttributeDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_AttributeDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_AttributeDef_tie::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_IDLType_ptr POA_CORBA_AttributeDef_tie::type_def ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_AttributeDef_tie::type_def ( CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5328,27 +5328,27 @@ void POA_CORBA_AttributeDef_tie::type_def ( { this->ptr_->type_def ( type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::AttributeMode POA_CORBA_AttributeDef_tie::mode ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->mode ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_AttributeDef_tie::mode ( CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5356,27 +5356,27 @@ void POA_CORBA_AttributeDef_tie::mode ( { this->ptr_->mode ( mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_AttributeDef_tie::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_AttributeDef_tie::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5384,27 +5384,27 @@ void POA_CORBA_AttributeDef_tie::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_AttributeDef_tie::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_AttributeDef_tie::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5412,27 +5412,27 @@ void POA_CORBA_AttributeDef_tie::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_AttributeDef_tie::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_AttributeDef_tie::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5440,59 +5440,59 @@ void POA_CORBA_AttributeDef_tie::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Container_ptr POA_CORBA_AttributeDef_tie::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_AttributeDef_tie::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Repository_ptr POA_CORBA_AttributeDef_tie::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained::Description * POA_CORBA_AttributeDef_tie::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -5501,7 +5501,7 @@ void POA_CORBA_AttributeDef_tie::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5511,33 +5511,33 @@ void POA_CORBA_AttributeDef_tie::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::DefinitionKind POA_CORBA_AttributeDef_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_AttributeDef_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -5610,44 +5610,44 @@ POA_CORBA_OperationDef_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_CORBA_OperationDef_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_OperationDef_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_OperationDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_OperationDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_OperationDef_tie::result ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->result ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_IDLType_ptr POA_CORBA_OperationDef_tie::result_def ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->result_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_OperationDef_tie::result_def ( CORBA_IDLType_ptr result_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5655,27 +5655,27 @@ void POA_CORBA_OperationDef_tie::result_def ( { this->ptr_->result_def ( result_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_ParDescriptionSeq * POA_CORBA_OperationDef_tie::params ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->params ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_OperationDef_tie::params ( const CORBA_ParDescriptionSeq & params - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5683,27 +5683,27 @@ void POA_CORBA_OperationDef_tie::params ( { this->ptr_->params ( params - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::OperationMode POA_CORBA_OperationDef_tie::mode ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->mode ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_OperationDef_tie::mode ( CORBA::OperationMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5711,27 +5711,27 @@ void POA_CORBA_OperationDef_tie::mode ( { this->ptr_->mode ( mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_ContextIdSeq * POA_CORBA_OperationDef_tie::contexts ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->contexts ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_OperationDef_tie::contexts ( const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5739,27 +5739,27 @@ void POA_CORBA_OperationDef_tie::contexts ( { this->ptr_->contexts ( contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_ExceptionDefSeq * POA_CORBA_OperationDef_tie::exceptions ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->exceptions ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_OperationDef_tie::exceptions ( const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5767,27 +5767,27 @@ void POA_CORBA_OperationDef_tie::exceptions ( { this->ptr_->exceptions ( exceptions - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_OperationDef_tie::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_OperationDef_tie::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5795,27 +5795,27 @@ void POA_CORBA_OperationDef_tie::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_OperationDef_tie::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_OperationDef_tie::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5823,27 +5823,27 @@ void POA_CORBA_OperationDef_tie::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_OperationDef_tie::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_OperationDef_tie::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5851,59 +5851,59 @@ void POA_CORBA_OperationDef_tie::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Container_ptr POA_CORBA_OperationDef_tie::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_OperationDef_tie::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Repository_ptr POA_CORBA_OperationDef_tie::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained::Description * POA_CORBA_OperationDef_tie::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -5912,7 +5912,7 @@ void POA_CORBA_OperationDef_tie::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5922,33 +5922,33 @@ void POA_CORBA_OperationDef_tie::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::DefinitionKind POA_CORBA_OperationDef_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_OperationDef_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -6021,31 +6021,31 @@ POA_CORBA_InterfaceDef_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_CORBA_InterfaceDef_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_InterfaceDef_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_InterfaceDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_InterfaceDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE CORBA_InterfaceDefSeq * POA_CORBA_InterfaceDef_tie::base_interfaces ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->base_interfaces ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_InterfaceDef_tie::base_interfaces ( const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6053,14 +6053,14 @@ void POA_CORBA_InterfaceDef_tie::base_interfaces ( { this->ptr_->base_interfaces ( base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::Boolean POA_CORBA_InterfaceDef_tie::is_a ( const char * interface_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6068,20 +6068,20 @@ CORBA::Boolean POA_CORBA_InterfaceDef_tie::is_a ( { return this->ptr_->is_a ( interface_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_InterfaceDef::FullInterfaceDescription * POA_CORBA_InterfaceDef_tie::describe_interface ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe_interface ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -6092,7 +6092,7 @@ CORBA_AttributeDef_ptr POA_CORBA_InterfaceDef_tie::create_attribute ( const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6104,7 +6104,7 @@ id, version, type, mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6118,7 +6118,7 @@ CORBA_OperationDef_ptr POA_CORBA_InterfaceDef_tie::create_operation ( const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6133,14 +6133,14 @@ id, params, exceptions, contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained_ptr POA_CORBA_InterfaceDef_tie::lookup ( const char * search_name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6148,7 +6148,7 @@ CORBA_Contained_ptr POA_CORBA_InterfaceDef_tie::lookup ( { return this->ptr_->lookup ( search_name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6156,7 +6156,7 @@ template ACE_INLINE CORBA_ContainedSeq * POA_CORBA_InterfaceDef_tie::contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6165,7 +6165,7 @@ CORBA_ContainedSeq * POA_CORBA_InterfaceDef_tie::contents ( return this->ptr_->contents ( limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6175,7 +6175,7 @@ CORBA_ContainedSeq * POA_CORBA_InterfaceDef_tie::lookup_name ( CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6186,7 +6186,7 @@ search_name, levels_to_search, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6195,7 +6195,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_InterfaceDef_tie::describe_conten CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6205,7 +6205,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_InterfaceDef_tie::describe_conten limit_type, exclude_inherited, max_returned_objs - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6214,7 +6214,7 @@ CORBA_ModuleDef_ptr POA_CORBA_InterfaceDef_tie::create_module ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6224,7 +6224,7 @@ CORBA_ModuleDef_ptr POA_CORBA_InterfaceDef_tie::create_module ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6235,7 +6235,7 @@ CORBA_ConstantDef_ptr POA_CORBA_InterfaceDef_tie::create_constant ( const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6247,7 +6247,7 @@ id, version, type, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6257,7 +6257,7 @@ CORBA_StructDef_ptr POA_CORBA_InterfaceDef_tie::create_struct ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6268,7 +6268,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6279,7 +6279,7 @@ CORBA_UnionDef_ptr POA_CORBA_InterfaceDef_tie::create_union ( const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6291,7 +6291,7 @@ id, version, discriminator_type, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6301,7 +6301,7 @@ CORBA_EnumDef_ptr POA_CORBA_InterfaceDef_tie::create_enum ( const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6312,7 +6312,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6322,7 +6322,7 @@ CORBA_AliasDef_ptr POA_CORBA_InterfaceDef_tie::create_alias ( const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6333,7 +6333,7 @@ id, name, version, original_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6343,7 +6343,7 @@ CORBA_InterfaceDef_ptr POA_CORBA_InterfaceDef_tie::create_interface ( const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6354,7 +6354,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6370,7 +6370,7 @@ CORBA_ValueDef_ptr POA_CORBA_InterfaceDef_tie::create_value ( const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6387,7 +6387,7 @@ id, abstract_base_values, supported_interfaces, initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6397,7 +6397,7 @@ CORBA_ValueBoxDef_ptr POA_CORBA_InterfaceDef_tie::create_value_box ( const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6408,7 +6408,7 @@ id, name, version, original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6418,7 +6418,7 @@ CORBA_ExceptionDef_ptr POA_CORBA_InterfaceDef_tie::create_exception ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6429,7 +6429,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6438,7 +6438,7 @@ CORBA_NativeDef_ptr POA_CORBA_InterfaceDef_tie::create_native ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6448,7 +6448,7 @@ CORBA_NativeDef_ptr POA_CORBA_InterfaceDef_tie::create_native ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6458,7 +6458,7 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_InterfaceDef_tie::create_abstract_in const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6469,7 +6469,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6479,7 +6479,7 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_InterfaceDef_tie::create_local_interfac const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6490,27 +6490,27 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_InterfaceDef_tie::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_InterfaceDef_tie::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6518,27 +6518,27 @@ void POA_CORBA_InterfaceDef_tie::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_InterfaceDef_tie::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_InterfaceDef_tie::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6546,27 +6546,27 @@ void POA_CORBA_InterfaceDef_tie::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_InterfaceDef_tie::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_InterfaceDef_tie::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6574,59 +6574,59 @@ void POA_CORBA_InterfaceDef_tie::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Container_ptr POA_CORBA_InterfaceDef_tie::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_InterfaceDef_tie::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Repository_ptr POA_CORBA_InterfaceDef_tie::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained::Description * POA_CORBA_InterfaceDef_tie::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -6635,7 +6635,7 @@ void POA_CORBA_InterfaceDef_tie::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6645,46 +6645,46 @@ void POA_CORBA_InterfaceDef_tie::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_InterfaceDef_tie::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA::DefinitionKind POA_CORBA_InterfaceDef_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_InterfaceDef_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -6757,31 +6757,31 @@ POA_CORBA_AbstractInterfaceDef_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_CORBA_AbstractInterfaceDef_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_AbstractInterfaceDef_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_AbstractInterfaceDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_AbstractInterfaceDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE CORBA_InterfaceDefSeq * POA_CORBA_AbstractInterfaceDef_tie::base_interfaces ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->base_interfaces ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_AbstractInterfaceDef_tie::base_interfaces ( const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6789,14 +6789,14 @@ void POA_CORBA_AbstractInterfaceDef_tie::base_interfaces ( { this->ptr_->base_interfaces ( base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::Boolean POA_CORBA_AbstractInterfaceDef_tie::is_a ( const char * interface_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6804,20 +6804,20 @@ CORBA::Boolean POA_CORBA_AbstractInterfaceDef_tie::is_a ( { return this->ptr_->is_a ( interface_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_InterfaceDef::FullInterfaceDescription * POA_CORBA_AbstractInterfaceDef_tie::describe_interface ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe_interface ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -6828,7 +6828,7 @@ CORBA_AttributeDef_ptr POA_CORBA_AbstractInterfaceDef_tie::create_attribute const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6840,7 +6840,7 @@ id, version, type, mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6854,7 +6854,7 @@ CORBA_OperationDef_ptr POA_CORBA_AbstractInterfaceDef_tie::create_operation const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6869,14 +6869,14 @@ id, params, exceptions, contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained_ptr POA_CORBA_AbstractInterfaceDef_tie::lookup ( const char * search_name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6884,7 +6884,7 @@ CORBA_Contained_ptr POA_CORBA_AbstractInterfaceDef_tie::lookup ( { return this->ptr_->lookup ( search_name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6892,7 +6892,7 @@ template ACE_INLINE CORBA_ContainedSeq * POA_CORBA_AbstractInterfaceDef_tie::contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6901,7 +6901,7 @@ CORBA_ContainedSeq * POA_CORBA_AbstractInterfaceDef_tie::contents ( return this->ptr_->contents ( limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6911,7 +6911,7 @@ CORBA_ContainedSeq * POA_CORBA_AbstractInterfaceDef_tie::lookup_name ( CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6922,7 +6922,7 @@ search_name, levels_to_search, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6931,7 +6931,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_AbstractInterfaceDef_tie::describ CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6941,7 +6941,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_AbstractInterfaceDef_tie::describ limit_type, exclude_inherited, max_returned_objs - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6950,7 +6950,7 @@ CORBA_ModuleDef_ptr POA_CORBA_AbstractInterfaceDef_tie::create_module ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6960,7 +6960,7 @@ CORBA_ModuleDef_ptr POA_CORBA_AbstractInterfaceDef_tie::create_module ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6971,7 +6971,7 @@ CORBA_ConstantDef_ptr POA_CORBA_AbstractInterfaceDef_tie::create_constant ( const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6983,7 +6983,7 @@ id, version, type, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6993,7 +6993,7 @@ CORBA_StructDef_ptr POA_CORBA_AbstractInterfaceDef_tie::create_struct ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7004,7 +7004,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7015,7 +7015,7 @@ CORBA_UnionDef_ptr POA_CORBA_AbstractInterfaceDef_tie::create_union ( const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7027,7 +7027,7 @@ id, version, discriminator_type, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7037,7 +7037,7 @@ CORBA_EnumDef_ptr POA_CORBA_AbstractInterfaceDef_tie::create_enum ( const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7048,7 +7048,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7058,7 +7058,7 @@ CORBA_AliasDef_ptr POA_CORBA_AbstractInterfaceDef_tie::create_alias ( const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7069,7 +7069,7 @@ id, name, version, original_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7079,7 +7079,7 @@ CORBA_InterfaceDef_ptr POA_CORBA_AbstractInterfaceDef_tie::create_interface const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7090,7 +7090,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7106,7 +7106,7 @@ CORBA_ValueDef_ptr POA_CORBA_AbstractInterfaceDef_tie::create_value ( const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7123,7 +7123,7 @@ id, abstract_base_values, supported_interfaces, initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7133,7 +7133,7 @@ CORBA_ValueBoxDef_ptr POA_CORBA_AbstractInterfaceDef_tie::create_value_box ( const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7144,7 +7144,7 @@ id, name, version, original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7154,7 +7154,7 @@ CORBA_ExceptionDef_ptr POA_CORBA_AbstractInterfaceDef_tie::create_exception const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7165,7 +7165,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7174,7 +7174,7 @@ CORBA_NativeDef_ptr POA_CORBA_AbstractInterfaceDef_tie::create_native ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7184,7 +7184,7 @@ CORBA_NativeDef_ptr POA_CORBA_AbstractInterfaceDef_tie::create_native ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7194,7 +7194,7 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_AbstractInterfaceDef_tie::create_abs const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7205,7 +7205,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7215,7 +7215,7 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_AbstractInterfaceDef_tie::create_local_ const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7226,27 +7226,27 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_AbstractInterfaceDef_tie::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_AbstractInterfaceDef_tie::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7254,27 +7254,27 @@ void POA_CORBA_AbstractInterfaceDef_tie::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_AbstractInterfaceDef_tie::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_AbstractInterfaceDef_tie::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7282,27 +7282,27 @@ void POA_CORBA_AbstractInterfaceDef_tie::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_AbstractInterfaceDef_tie::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_AbstractInterfaceDef_tie::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7310,59 +7310,59 @@ void POA_CORBA_AbstractInterfaceDef_tie::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Container_ptr POA_CORBA_AbstractInterfaceDef_tie::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_AbstractInterfaceDef_tie::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Repository_ptr POA_CORBA_AbstractInterfaceDef_tie::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained::Description * POA_CORBA_AbstractInterfaceDef_tie::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -7371,7 +7371,7 @@ void POA_CORBA_AbstractInterfaceDef_tie::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7381,46 +7381,46 @@ void POA_CORBA_AbstractInterfaceDef_tie::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_AbstractInterfaceDef_tie::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA::DefinitionKind POA_CORBA_AbstractInterfaceDef_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_AbstractInterfaceDef_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -7493,31 +7493,31 @@ POA_CORBA_LocalInterfaceDef_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_CORBA_LocalInterfaceDef_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_LocalInterfaceDef_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_LocalInterfaceDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_LocalInterfaceDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE CORBA_InterfaceDefSeq * POA_CORBA_LocalInterfaceDef_tie::base_interfaces ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->base_interfaces ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_LocalInterfaceDef_tie::base_interfaces ( const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7525,14 +7525,14 @@ void POA_CORBA_LocalInterfaceDef_tie::base_interfaces ( { this->ptr_->base_interfaces ( base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::Boolean POA_CORBA_LocalInterfaceDef_tie::is_a ( const char * interface_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7540,20 +7540,20 @@ CORBA::Boolean POA_CORBA_LocalInterfaceDef_tie::is_a ( { return this->ptr_->is_a ( interface_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_InterfaceDef::FullInterfaceDescription * POA_CORBA_LocalInterfaceDef_tie::describe_interface ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe_interface ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -7564,7 +7564,7 @@ CORBA_AttributeDef_ptr POA_CORBA_LocalInterfaceDef_tie::create_attribute ( const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7576,7 +7576,7 @@ id, version, type, mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7590,7 +7590,7 @@ CORBA_OperationDef_ptr POA_CORBA_LocalInterfaceDef_tie::create_operation ( const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7605,14 +7605,14 @@ id, params, exceptions, contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained_ptr POA_CORBA_LocalInterfaceDef_tie::lookup ( const char * search_name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7620,7 +7620,7 @@ CORBA_Contained_ptr POA_CORBA_LocalInterfaceDef_tie::lookup ( { return this->ptr_->lookup ( search_name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7628,7 +7628,7 @@ template ACE_INLINE CORBA_ContainedSeq * POA_CORBA_LocalInterfaceDef_tie::contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7637,7 +7637,7 @@ CORBA_ContainedSeq * POA_CORBA_LocalInterfaceDef_tie::contents ( return this->ptr_->contents ( limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7647,7 +7647,7 @@ CORBA_ContainedSeq * POA_CORBA_LocalInterfaceDef_tie::lookup_name ( CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7658,7 +7658,7 @@ search_name, levels_to_search, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7667,7 +7667,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_LocalInterfaceDef_tie::describe_c CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7677,7 +7677,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_LocalInterfaceDef_tie::describe_c limit_type, exclude_inherited, max_returned_objs - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7686,7 +7686,7 @@ CORBA_ModuleDef_ptr POA_CORBA_LocalInterfaceDef_tie::create_module ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7696,7 +7696,7 @@ CORBA_ModuleDef_ptr POA_CORBA_LocalInterfaceDef_tie::create_module ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7707,7 +7707,7 @@ CORBA_ConstantDef_ptr POA_CORBA_LocalInterfaceDef_tie::create_constant ( const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7719,7 +7719,7 @@ id, version, type, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7729,7 +7729,7 @@ CORBA_StructDef_ptr POA_CORBA_LocalInterfaceDef_tie::create_struct ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7740,7 +7740,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7751,7 +7751,7 @@ CORBA_UnionDef_ptr POA_CORBA_LocalInterfaceDef_tie::create_union ( const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7763,7 +7763,7 @@ id, version, discriminator_type, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7773,7 +7773,7 @@ CORBA_EnumDef_ptr POA_CORBA_LocalInterfaceDef_tie::create_enum ( const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7784,7 +7784,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7794,7 +7794,7 @@ CORBA_AliasDef_ptr POA_CORBA_LocalInterfaceDef_tie::create_alias ( const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7805,7 +7805,7 @@ id, name, version, original_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7815,7 +7815,7 @@ CORBA_InterfaceDef_ptr POA_CORBA_LocalInterfaceDef_tie::create_interface ( const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7826,7 +7826,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7842,7 +7842,7 @@ CORBA_ValueDef_ptr POA_CORBA_LocalInterfaceDef_tie::create_value ( const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7859,7 +7859,7 @@ id, abstract_base_values, supported_interfaces, initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7869,7 +7869,7 @@ CORBA_ValueBoxDef_ptr POA_CORBA_LocalInterfaceDef_tie::create_value_box ( const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7880,7 +7880,7 @@ id, name, version, original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7890,7 +7890,7 @@ CORBA_ExceptionDef_ptr POA_CORBA_LocalInterfaceDef_tie::create_exception ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7901,7 +7901,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7910,7 +7910,7 @@ CORBA_NativeDef_ptr POA_CORBA_LocalInterfaceDef_tie::create_native ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7920,7 +7920,7 @@ CORBA_NativeDef_ptr POA_CORBA_LocalInterfaceDef_tie::create_native ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7930,7 +7930,7 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_LocalInterfaceDef_tie::create_abstra const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7941,7 +7941,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7951,7 +7951,7 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_LocalInterfaceDef_tie::create_local_int const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7962,27 +7962,27 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_LocalInterfaceDef_tie::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_LocalInterfaceDef_tie::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7990,27 +7990,27 @@ void POA_CORBA_LocalInterfaceDef_tie::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_LocalInterfaceDef_tie::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_LocalInterfaceDef_tie::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -8018,27 +8018,27 @@ void POA_CORBA_LocalInterfaceDef_tie::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_LocalInterfaceDef_tie::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_LocalInterfaceDef_tie::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -8046,59 +8046,59 @@ void POA_CORBA_LocalInterfaceDef_tie::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Container_ptr POA_CORBA_LocalInterfaceDef_tie::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_LocalInterfaceDef_tie::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Repository_ptr POA_CORBA_LocalInterfaceDef_tie::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained::Description * POA_CORBA_LocalInterfaceDef_tie::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -8107,7 +8107,7 @@ void POA_CORBA_LocalInterfaceDef_tie::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -8117,46 +8117,46 @@ void POA_CORBA_LocalInterfaceDef_tie::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_LocalInterfaceDef_tie::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA::DefinitionKind POA_CORBA_LocalInterfaceDef_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_LocalInterfaceDef_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp index 929682e2d11..7cea15e7880 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp +++ b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp @@ -216,31 +216,31 @@ public: const char * version, IR::ComponentDef_ptr base_component, const CORBA_InterfaceDefSeq & supports_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::ComponentDef_ptr result); @@ -268,7 +268,7 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_component::TAO_ServerRequest const char * version, IR::ComponentDef_ptr base_component, const CORBA_InterfaceDefSeq & supports_interfaces - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -280,12 +280,12 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_component::TAO_ServerRequest {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_ComponentRepository_create_component::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentRepository_create_component::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -313,25 +313,25 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_component::arguments (TAO_EN } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_ComponentRepository_create_component::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentRepository_create_component::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_ComponentRepository_create_component::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentRepository_create_component::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -343,7 +343,7 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_component::result (TAO_ENV_S char * TAO_ServerRequestInfo_IR_ComponentRepository_create_component::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -353,10 +353,10 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_component::target_most_deriv CORBA::Boolean TAO_ServerRequestInfo_IR_ComponentRepository_create_component::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -379,31 +379,31 @@ public: IR::HomeDef_ptr base_home, IR::ComponentDef_ptr managed_component, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::HomeDef_ptr result); @@ -433,7 +433,7 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_home::TAO_ServerRequestInfo_ IR::HomeDef_ptr base_home, IR::ComponentDef_ptr managed_component, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -446,12 +446,12 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_home::TAO_ServerRequestInfo_ {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_ComponentRepository_create_home::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentRepository_create_home::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -482,25 +482,25 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_home::arguments (TAO_ENV_SIN } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_ComponentRepository_create_home::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentRepository_create_home::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_ComponentRepository_create_home::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentRepository_create_home::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -512,7 +512,7 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_home::result (TAO_ENV_SINGLE char * TAO_ServerRequestInfo_IR_ComponentRepository_create_home::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -522,10 +522,10 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_home::target_most_derived_in CORBA::Boolean TAO_ServerRequestInfo_IR_ComponentRepository_create_home::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -565,17 +565,17 @@ POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::~_TAO_ComponentReposi IR::_TAO_ComponentRepository_Proxy_Impl& POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::select_proxy ( ::IR::ComponentRepository *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -585,7 +585,7 @@ POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::select_proxy ( void POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -660,7 +660,7 @@ IR::ComponentDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create const char * version, IR::ComponentDef_ptr base_component, const CORBA_InterfaceDefSeq & supports_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -676,7 +676,7 @@ IR::ComponentDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create _collocated_tao_target_->_object_key (), "create_component", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -690,7 +690,7 @@ IR::ComponentDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create version, base_component, supports_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -702,7 +702,7 @@ IR::HomeDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create_home IR::HomeDef_ptr base_home, IR::ComponentDef_ptr managed_component, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -718,7 +718,7 @@ IR::HomeDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create_home _collocated_tao_target_->_object_key (), "create_home", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -733,7 +733,7 @@ IR::HomeDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create_home base_home, managed_component, primary_key - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -764,7 +764,7 @@ void POA_IR::ComponentRepository::create_component_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -805,12 +805,12 @@ void POA_IR::ComponentRepository::create_component_skel ( version.in (), base_component.in (), supports_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -821,7 +821,7 @@ void POA_IR::ComponentRepository::create_component_skel ( version.in (), base_component.in (), supports_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -830,7 +830,7 @@ void POA_IR::ComponentRepository::create_component_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -838,12 +838,12 @@ void POA_IR::ComponentRepository::create_component_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -871,7 +871,7 @@ void POA_IR::ComponentRepository::create_home_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -915,12 +915,12 @@ void POA_IR::ComponentRepository::create_home_skel ( base_home.in (), managed_component.in (), primary_key.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -932,7 +932,7 @@ void POA_IR::ComponentRepository::create_home_skel ( base_home.in (), managed_component.in (), primary_key.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -941,7 +941,7 @@ void POA_IR::ComponentRepository::create_home_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -949,12 +949,12 @@ void POA_IR::ComponentRepository::create_home_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -982,7 +982,7 @@ void POA_IR::ComponentRepository::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -992,7 +992,7 @@ void POA_IR::ComponentRepository::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -1005,11 +1005,11 @@ void POA_IR::ComponentRepository::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::ComponentRepository *_tao_impl = (POA_IR::ComponentRepository *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -1022,7 +1022,7 @@ void POA_IR::ComponentRepository::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::ComponentRepository *_tao_impl = (POA_IR::ComponentRepository *) _tao_object_reference; @@ -1041,7 +1041,7 @@ void POA_IR::ComponentRepository::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -1068,10 +1068,10 @@ void POA_IR::ComponentRepository::_interface_skel ( CORBA::Boolean POA_IR::ComponentRepository::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -1102,12 +1102,12 @@ void* POA_IR::ComponentRepository::_downcast ( return 0; } -void POA_IR::ComponentRepository::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_IR::ComponentRepository::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -1117,9 +1117,9 @@ const char* POA_IR::ComponentRepository::_interface_repository_id (void) const } IR::ComponentRepository* -POA_IR::ComponentRepository::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::ComponentRepository::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -1286,31 +1286,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ProvidesDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_InterfaceDef_ptr result); @@ -1328,44 +1328,44 @@ TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::TAO_ServerRequestInfo_I TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::ProvidesDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -1377,7 +1377,7 @@ TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::result (TAO_ENV_SINGLE_ char * TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1387,10 +1387,10 @@ TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::target_most_derived_int CORBA::Boolean TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -1430,17 +1430,17 @@ POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::~_TAO_ProvidesDef_Strategized IR::_TAO_ProvidesDef_Proxy_Impl& POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::select_proxy ( ::IR::ProvidesDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -1450,7 +1450,7 @@ POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::select_proxy ( void POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -1520,7 +1520,7 @@ POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::_TAO_ProvidesDef_ThruPOA_Proxy_Impl CORBA_InterfaceDef_ptr POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::interface_type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1536,7 +1536,7 @@ CORBA_InterfaceDef_ptr POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::interface_ty _collocated_tao_target_->_object_key (), "interface_type", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -1545,7 +1545,7 @@ CORBA_InterfaceDef_ptr POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::interface_ty "IDL:omg.org/IR/ProvidesDef:1.0" ) )->interface_type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -1575,7 +1575,7 @@ void POA_IR::ProvidesDef::_get_interface_type_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::ProvidesDef *_tao_impl = @@ -1596,18 +1596,18 @@ void POA_IR::ProvidesDef::_get_interface_type_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->interface_type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -1616,7 +1616,7 @@ void POA_IR::ProvidesDef::_get_interface_type_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -1624,12 +1624,12 @@ void POA_IR::ProvidesDef::_get_interface_type_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -1657,7 +1657,7 @@ void POA_IR::ProvidesDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -1667,7 +1667,7 @@ void POA_IR::ProvidesDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -1680,11 +1680,11 @@ void POA_IR::ProvidesDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::ProvidesDef *_tao_impl = (POA_IR::ProvidesDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -1697,7 +1697,7 @@ void POA_IR::ProvidesDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::ProvidesDef *_tao_impl = (POA_IR::ProvidesDef *) _tao_object_reference; @@ -1716,7 +1716,7 @@ void POA_IR::ProvidesDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -1743,10 +1743,10 @@ void POA_IR::ProvidesDef::_interface_skel ( CORBA::Boolean POA_IR::ProvidesDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -1774,12 +1774,12 @@ void* POA_IR::ProvidesDef::_downcast ( return 0; } -void POA_IR::ProvidesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_IR::ProvidesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -1789,9 +1789,9 @@ const char* POA_IR::ProvidesDef::_interface_repository_id (void) const } IR::ProvidesDef* -POA_IR::ProvidesDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::ProvidesDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -1959,31 +1959,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::UsesDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_InterfaceDef_ptr result); @@ -2001,44 +2001,44 @@ TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::TAO_ServerRequestInfo_IR_Us TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::UsesDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -2050,7 +2050,7 @@ TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::result (TAO_ENV_SINGLE_ARG_ char * TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -2060,10 +2060,10 @@ TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::target_most_derived_interfa CORBA::Boolean TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -2080,31 +2080,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::UsesDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::Boolean result); @@ -2122,44 +2122,44 @@ TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::TAO_ServerRequestInfo_IR_UsesD TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::UsesDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -2171,7 +2171,7 @@ TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::result (TAO_ENV_SINGLE_ARG_DEC char * TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -2181,10 +2181,10 @@ TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -2224,17 +2224,17 @@ POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::~_TAO_UsesDef_Strategized_Proxy_B IR::_TAO_UsesDef_Proxy_Impl& POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::select_proxy ( ::IR::UsesDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -2244,7 +2244,7 @@ POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::select_proxy ( void POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -2314,7 +2314,7 @@ POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::_TAO_UsesDef_ThruPOA_Proxy_Impl (void) CORBA_InterfaceDef_ptr POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::interface_type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2330,7 +2330,7 @@ CORBA_InterfaceDef_ptr POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::interface_type ( _collocated_tao_target_->_object_key (), "interface_type", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -2339,13 +2339,13 @@ CORBA_InterfaceDef_ptr POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::interface_type ( "IDL:omg.org/IR/UsesDef:1.0" ) )->interface_type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } CORBA::Boolean POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::is_multiple ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2361,7 +2361,7 @@ CORBA::Boolean POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::is_multiple ( _collocated_tao_target_->_object_key (), "is_multiple", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -2370,7 +2370,7 @@ CORBA::Boolean POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::is_multiple ( "IDL:omg.org/IR/UsesDef:1.0" ) )->is_multiple ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -2400,7 +2400,7 @@ void POA_IR::UsesDef::_get_interface_type_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::UsesDef *_tao_impl = @@ -2421,18 +2421,18 @@ void POA_IR::UsesDef::_get_interface_type_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->interface_type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -2441,7 +2441,7 @@ void POA_IR::UsesDef::_get_interface_type_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2449,12 +2449,12 @@ void POA_IR::UsesDef::_get_interface_type_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -2482,7 +2482,7 @@ void POA_IR::UsesDef::_get_is_multiple_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::UsesDef *_tao_impl = @@ -2503,18 +2503,18 @@ void POA_IR::UsesDef::_get_is_multiple_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->is_multiple ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -2522,7 +2522,7 @@ void POA_IR::UsesDef::_get_is_multiple_skel ( CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2530,12 +2530,12 @@ void POA_IR::UsesDef::_get_is_multiple_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -2563,7 +2563,7 @@ void POA_IR::UsesDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -2573,7 +2573,7 @@ void POA_IR::UsesDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -2586,11 +2586,11 @@ void POA_IR::UsesDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::UsesDef *_tao_impl = (POA_IR::UsesDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -2603,7 +2603,7 @@ void POA_IR::UsesDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::UsesDef *_tao_impl = (POA_IR::UsesDef *) _tao_object_reference; @@ -2622,7 +2622,7 @@ void POA_IR::UsesDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -2649,10 +2649,10 @@ void POA_IR::UsesDef::_interface_skel ( CORBA::Boolean POA_IR::UsesDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -2680,12 +2680,12 @@ void* POA_IR::UsesDef::_downcast ( return 0; } -void POA_IR::UsesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_IR::UsesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -2695,9 +2695,9 @@ const char* POA_IR::UsesDef::_interface_repository_id (void) const } IR::UsesDef* -POA_IR::UsesDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::UsesDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -2866,31 +2866,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::EventDef *tao_impl , const char * event_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::Boolean result); @@ -2910,7 +2910,7 @@ TAO_ServerRequestInfo_IR_EventDef_is_a::TAO_ServerRequestInfo_IR_EventDef_is_a ( TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::EventDef *tao_impl, const char * event_id - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -2918,12 +2918,12 @@ TAO_ServerRequestInfo_IR_EventDef_is_a::TAO_ServerRequestInfo_IR_EventDef_is_a ( {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_EventDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_EventDef_is_a::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -2939,25 +2939,25 @@ TAO_ServerRequestInfo_IR_EventDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL) } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_EventDef_is_a::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_EventDef_is_a::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_EventDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_EventDef_is_a::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -2969,7 +2969,7 @@ TAO_ServerRequestInfo_IR_EventDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_IR_EventDef_is_a::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -2979,10 +2979,10 @@ TAO_ServerRequestInfo_IR_EventDef_is_a::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_IR_EventDef_is_a::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -2999,31 +2999,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::EventDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_ValueDef_ptr result); @@ -3041,44 +3041,44 @@ TAO_ServerRequestInfo_IR_EventDef_event_get::TAO_ServerRequestInfo_IR_EventDef_e TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::EventDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_EventDef_event_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_EventDef_event_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_EventDef_event_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_EventDef_event_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_EventDef_event_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_EventDef_event_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -3090,7 +3090,7 @@ TAO_ServerRequestInfo_IR_EventDef_event_get::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_IR_EventDef_event_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -3100,10 +3100,10 @@ TAO_ServerRequestInfo_IR_EventDef_event_get::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_IR_EventDef_event_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -3143,17 +3143,17 @@ POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::~_TAO_EventDef_Strategized_Proxy IR::_TAO_EventDef_Proxy_Impl& POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::select_proxy ( ::IR::EventDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -3163,7 +3163,7 @@ POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::select_proxy ( void POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -3234,7 +3234,7 @@ POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::_TAO_EventDef_ThruPOA_Proxy_Impl (void CORBA::Boolean POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::is_a ( CORBA_Object *_collocated_tao_target_, const char * event_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3250,7 +3250,7 @@ CORBA::Boolean POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::is_a ( _collocated_tao_target_->_object_key (), "is_a", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -3260,13 +3260,13 @@ CORBA::Boolean POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::is_a ( ) )->is_a ( event_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_ValueDef_ptr POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::event ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3282,7 +3282,7 @@ CORBA_ValueDef_ptr POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::event ( _collocated_tao_target_->_object_key (), "event", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -3291,7 +3291,7 @@ CORBA_ValueDef_ptr POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::event ( "IDL:omg.org/IR/EventDef:1.0" ) )->event ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -3321,7 +3321,7 @@ void POA_IR::EventDef::is_a_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -3350,19 +3350,19 @@ void POA_IR::EventDef::is_a_skel ( _tao_upcall, _tao_impl, event_id.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->is_a ( event_id.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -3370,7 +3370,7 @@ void POA_IR::EventDef::is_a_skel ( CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3378,12 +3378,12 @@ void POA_IR::EventDef::is_a_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3411,7 +3411,7 @@ void POA_IR::EventDef::_get_event_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::EventDef *_tao_impl = @@ -3432,18 +3432,18 @@ void POA_IR::EventDef::_get_event_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->event ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -3452,7 +3452,7 @@ void POA_IR::EventDef::_get_event_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3460,12 +3460,12 @@ void POA_IR::EventDef::_get_event_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3493,7 +3493,7 @@ void POA_IR::EventDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -3503,7 +3503,7 @@ void POA_IR::EventDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -3516,11 +3516,11 @@ void POA_IR::EventDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::EventDef *_tao_impl = (POA_IR::EventDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -3533,7 +3533,7 @@ void POA_IR::EventDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::EventDef *_tao_impl = (POA_IR::EventDef *) _tao_object_reference; @@ -3552,7 +3552,7 @@ void POA_IR::EventDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -3579,10 +3579,10 @@ void POA_IR::EventDef::_interface_skel ( CORBA::Boolean POA_IR::EventDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -3610,12 +3610,12 @@ void* POA_IR::EventDef::_downcast ( return 0; } -void POA_IR::EventDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_IR::EventDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -3625,9 +3625,9 @@ const char* POA_IR::EventDef::_interface_repository_id (void) const } IR::EventDef* -POA_IR::EventDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::EventDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -3818,17 +3818,17 @@ POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::~_TAO_EmitsDef_Strategized_Proxy IR::_TAO_EmitsDef_Proxy_Impl& POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::select_proxy ( ::IR::EmitsDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -3838,7 +3838,7 @@ POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::select_proxy ( void POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -3933,7 +3933,7 @@ void POA_IR::EmitsDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -3943,7 +3943,7 @@ void POA_IR::EmitsDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -3956,11 +3956,11 @@ void POA_IR::EmitsDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::EmitsDef *_tao_impl = (POA_IR::EmitsDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -3973,7 +3973,7 @@ void POA_IR::EmitsDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::EmitsDef *_tao_impl = (POA_IR::EmitsDef *) _tao_object_reference; @@ -3992,7 +3992,7 @@ void POA_IR::EmitsDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -4019,10 +4019,10 @@ void POA_IR::EmitsDef::_interface_skel ( CORBA::Boolean POA_IR::EmitsDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -4053,12 +4053,12 @@ void* POA_IR::EmitsDef::_downcast ( return 0; } -void POA_IR::EmitsDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_IR::EmitsDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -4068,9 +4068,9 @@ const char* POA_IR::EmitsDef::_interface_repository_id (void) const } IR::EmitsDef* -POA_IR::EmitsDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::EmitsDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -4261,17 +4261,17 @@ POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::~_TAO_PublishesDef_Strategiz IR::_TAO_PublishesDef_Proxy_Impl& POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::select_proxy ( ::IR::PublishesDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -4281,7 +4281,7 @@ POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::select_proxy ( void POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -4376,7 +4376,7 @@ void POA_IR::PublishesDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -4386,7 +4386,7 @@ void POA_IR::PublishesDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -4399,11 +4399,11 @@ void POA_IR::PublishesDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::PublishesDef *_tao_impl = (POA_IR::PublishesDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -4416,7 +4416,7 @@ void POA_IR::PublishesDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::PublishesDef *_tao_impl = (POA_IR::PublishesDef *) _tao_object_reference; @@ -4435,7 +4435,7 @@ void POA_IR::PublishesDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -4462,10 +4462,10 @@ void POA_IR::PublishesDef::_interface_skel ( CORBA::Boolean POA_IR::PublishesDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -4496,12 +4496,12 @@ void* POA_IR::PublishesDef::_downcast ( return 0; } -void POA_IR::PublishesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_IR::PublishesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -4511,9 +4511,9 @@ const char* POA_IR::PublishesDef::_interface_repository_id (void) const } IR::PublishesDef* -POA_IR::PublishesDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::PublishesDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -4704,17 +4704,17 @@ POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::~_TAO_ConsumesDef_Strategized IR::_TAO_ConsumesDef_Proxy_Impl& POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::select_proxy ( ::IR::ConsumesDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -4724,7 +4724,7 @@ POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::select_proxy ( void POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -4819,7 +4819,7 @@ void POA_IR::ConsumesDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -4829,7 +4829,7 @@ void POA_IR::ConsumesDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -4842,11 +4842,11 @@ void POA_IR::ConsumesDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::ConsumesDef *_tao_impl = (POA_IR::ConsumesDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -4859,7 +4859,7 @@ void POA_IR::ConsumesDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::ConsumesDef *_tao_impl = (POA_IR::ConsumesDef *) _tao_object_reference; @@ -4878,7 +4878,7 @@ void POA_IR::ConsumesDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -4905,10 +4905,10 @@ void POA_IR::ConsumesDef::_interface_skel ( CORBA::Boolean POA_IR::ConsumesDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -4939,12 +4939,12 @@ void* POA_IR::ConsumesDef::_downcast ( return 0; } -void POA_IR::ConsumesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_IR::ConsumesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -4954,9 +4954,9 @@ const char* POA_IR::ConsumesDef::_interface_repository_id (void) const } IR::ConsumesDef* -POA_IR::ConsumesDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::ConsumesDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -5165,31 +5165,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_InterfaceDefSeq * result); @@ -5207,44 +5207,44 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::TAO_ServerReques TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::ComponentDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5256,7 +5256,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::result (TAO_ENV_ char * TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5266,10 +5266,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::target_most_deri CORBA::Boolean TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -5287,31 +5287,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl , const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -5330,7 +5330,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::TAO_ServerReques TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::ComponentDef *tao_impl, const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -5338,12 +5338,12 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::TAO_ServerReques {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -5359,25 +5359,25 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::arguments (TAO_E } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -5385,7 +5385,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::result (TAO_ENV_ char * TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5395,10 +5395,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::target_most_deri CORBA::Boolean TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_IR_ComponentDef_base_component_get : public TAO_ServerRequestInfo @@ -5408,31 +5408,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::ComponentDef_ptr result); @@ -5450,44 +5450,44 @@ TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::TAO_ServerRequestInfo_ TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::ComponentDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5499,7 +5499,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::result (TAO_ENV_SINGLE char * TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5509,10 +5509,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::target_most_derived_in CORBA::Boolean TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -5529,31 +5529,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::ProvidesDefSeq * result); @@ -5571,44 +5571,44 @@ TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::TAO_ServerRequest TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::ComponentDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5620,7 +5620,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::result (TAO_ENV_S char * TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5630,10 +5630,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::target_most_deriv CORBA::Boolean TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -5650,31 +5650,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::UsesDefSeq * result); @@ -5692,44 +5692,44 @@ TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::TAO_ServerRequestInfo TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::ComponentDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5741,7 +5741,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::result (TAO_ENV_SINGL char * TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5751,10 +5751,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::target_most_derived_i CORBA::Boolean TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -5771,31 +5771,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::EmitsDefSeq * result); @@ -5813,44 +5813,44 @@ TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::TAO_ServerRequestInfo_IR TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::ComponentDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5862,7 +5862,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::result (TAO_ENV_SINGLE_A char * TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5872,10 +5872,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::target_most_derived_inte CORBA::Boolean TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -5892,31 +5892,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::PublishesDefSeq * result); @@ -5934,44 +5934,44 @@ TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::TAO_ServerRequestInf TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::ComponentDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5983,7 +5983,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::result (TAO_ENV_SING char * TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5993,10 +5993,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::target_most_derived_ CORBA::Boolean TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -6013,31 +6013,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::ConsumesDefSeq * result); @@ -6055,44 +6055,44 @@ TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::TAO_ServerRequestInfo TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::ComponentDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6104,7 +6104,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::result (TAO_ENV_SINGL char * TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -6114,10 +6114,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::target_most_derived_i CORBA::Boolean TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -6134,31 +6134,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::Boolean result); @@ -6176,44 +6176,44 @@ TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::TAO_ServerRequestInfo_IR_Com TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::ComponentDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6225,7 +6225,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::result (TAO_ENV_SINGLE_ARG_D char * TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -6235,10 +6235,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::target_most_derived_interfac CORBA::Boolean TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -6259,31 +6259,31 @@ public: const char * name, const char * version, CORBA_InterfaceDef_ptr interface_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::ProvidesDef_ptr result); @@ -6309,7 +6309,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_provides::TAO_ServerRequestInfo_IR_ const char * name, const char * version, CORBA_InterfaceDef_ptr interface_type - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -6320,12 +6320,12 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_provides::TAO_ServerRequestInfo_IR_ {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_ComponentDef_create_provides::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_create_provides::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -6350,25 +6350,25 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_provides::arguments (TAO_ENV_SINGLE } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_ComponentDef_create_provides::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_create_provides::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_ComponentDef_create_provides::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_create_provides::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6380,7 +6380,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_provides::result (TAO_ENV_SINGLE_AR char * TAO_ServerRequestInfo_IR_ComponentDef_create_provides::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -6390,10 +6390,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_provides::target_most_derived_inter CORBA::Boolean TAO_ServerRequestInfo_IR_ComponentDef_create_provides::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -6415,31 +6415,31 @@ public: const char * version, CORBA_InterfaceDef_ptr interface_type, const CORBA::Boolean & is_multiple - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::UsesDef_ptr result); @@ -6467,7 +6467,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_uses::TAO_ServerRequestInfo_IR_Comp const char * version, CORBA_InterfaceDef_ptr interface_type, const CORBA::Boolean & is_multiple - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -6479,12 +6479,12 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_uses::TAO_ServerRequestInfo_IR_Comp {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_ComponentDef_create_uses::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_create_uses::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -6512,25 +6512,25 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_uses::arguments (TAO_ENV_SINGLE_ARG } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_ComponentDef_create_uses::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_create_uses::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_ComponentDef_create_uses::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_create_uses::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6542,7 +6542,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_uses::result (TAO_ENV_SINGLE_ARG_DE char * TAO_ServerRequestInfo_IR_ComponentDef_create_uses::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -6552,10 +6552,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_uses::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_IR_ComponentDef_create_uses::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -6576,31 +6576,31 @@ public: const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::EmitsDef_ptr result); @@ -6626,7 +6626,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_emits::TAO_ServerRequestInfo_IR_Com const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -6637,12 +6637,12 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_emits::TAO_ServerRequestInfo_IR_Com {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_ComponentDef_create_emits::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_create_emits::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -6667,25 +6667,25 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_emits::arguments (TAO_ENV_SINGLE_AR } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_ComponentDef_create_emits::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_create_emits::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_ComponentDef_create_emits::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_create_emits::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6697,7 +6697,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_emits::result (TAO_ENV_SINGLE_ARG_D char * TAO_ServerRequestInfo_IR_ComponentDef_create_emits::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -6707,10 +6707,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_emits::target_most_derived_interfac CORBA::Boolean TAO_ServerRequestInfo_IR_ComponentDef_create_emits::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -6731,31 +6731,31 @@ public: const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::PublishesDef_ptr result); @@ -6781,7 +6781,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::TAO_ServerRequestInfo_IR const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -6792,12 +6792,12 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::TAO_ServerRequestInfo_IR {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -6822,25 +6822,25 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::arguments (TAO_ENV_SINGL } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6852,7 +6852,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::result (TAO_ENV_SINGLE_A char * TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -6862,10 +6862,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::target_most_derived_inte CORBA::Boolean TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -6886,31 +6886,31 @@ public: const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::ConsumesDef_ptr result); @@ -6936,7 +6936,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::TAO_ServerRequestInfo_IR_ const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -6947,12 +6947,12 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::TAO_ServerRequestInfo_IR_ {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -6977,25 +6977,25 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::arguments (TAO_ENV_SINGLE } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -7007,7 +7007,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::result (TAO_ENV_SINGLE_AR char * TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -7017,10 +7017,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::target_most_derived_inter CORBA::Boolean TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -7060,17 +7060,17 @@ POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::~_TAO_ComponentDef_Strategiz IR::_TAO_ComponentDef_Proxy_Impl& POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::select_proxy ( ::IR::ComponentDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -7080,7 +7080,7 @@ POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::select_proxy ( void POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -7150,7 +7150,7 @@ POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::_TAO_ComponentDef_ThruPOA_Proxy_Im CORBA_InterfaceDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_interfaces ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7166,7 +7166,7 @@ CORBA_InterfaceDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_ _collocated_tao_target_->_object_key (), "supported_interfaces", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7175,14 +7175,14 @@ CORBA_InterfaceDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_ "IDL:omg.org/IR/ComponentDef:1.0" ) )->supported_interfaces ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_interfaces ( CORBA_Object *_collocated_tao_target_, const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7196,7 +7196,7 @@ void POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_interfaces ( _collocated_tao_target_->_object_key (), "supported_interfaces", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -7206,14 +7206,14 @@ void POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_interfaces ( ) )->supported_interfaces ( supported_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } IR::ComponentDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::base_component ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7229,7 +7229,7 @@ IR::ComponentDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::base_componen _collocated_tao_target_->_object_key (), "base_component", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7238,13 +7238,13 @@ IR::ComponentDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::base_componen "IDL:omg.org/IR/ComponentDef:1.0" ) )->base_component ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } IR::ProvidesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::provides_interfaces ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7260,7 +7260,7 @@ IR::ProvidesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::provides_inte _collocated_tao_target_->_object_key (), "provides_interfaces", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7269,13 +7269,13 @@ IR::ProvidesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::provides_inte "IDL:omg.org/IR/ComponentDef:1.0" ) )->provides_interfaces ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } IR::UsesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::uses_interfaces ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7291,7 +7291,7 @@ IR::UsesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::uses_interfaces ( _collocated_tao_target_->_object_key (), "uses_interfaces", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7300,13 +7300,13 @@ IR::UsesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::uses_interfaces ( "IDL:omg.org/IR/ComponentDef:1.0" ) )->uses_interfaces ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } IR::EmitsDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::emits_events ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7322,7 +7322,7 @@ IR::EmitsDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::emits_events ( _collocated_tao_target_->_object_key (), "emits_events", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7331,13 +7331,13 @@ IR::EmitsDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::emits_events ( "IDL:omg.org/IR/ComponentDef:1.0" ) )->emits_events ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } IR::PublishesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::publishes_events ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7353,7 +7353,7 @@ IR::PublishesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::publishes_ev _collocated_tao_target_->_object_key (), "publishes_events", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7362,13 +7362,13 @@ IR::PublishesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::publishes_ev "IDL:omg.org/IR/ComponentDef:1.0" ) )->publishes_events ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } IR::ConsumesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::consumes_events ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7384,7 +7384,7 @@ IR::ConsumesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::consumes_even _collocated_tao_target_->_object_key (), "consumes_events", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7393,13 +7393,13 @@ IR::ConsumesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::consumes_even "IDL:omg.org/IR/ComponentDef:1.0" ) )->consumes_events ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } CORBA::Boolean POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::is_basic ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7415,7 +7415,7 @@ CORBA::Boolean POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::is_basic ( _collocated_tao_target_->_object_key (), "is_basic", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -7424,7 +7424,7 @@ CORBA::Boolean POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::is_basic ( "IDL:omg.org/IR/ComponentDef:1.0" ) )->is_basic ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -7434,7 +7434,7 @@ IR::ProvidesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_provide const char * name, const char * version, CORBA_InterfaceDef_ptr interface_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7450,7 +7450,7 @@ IR::ProvidesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_provide _collocated_tao_target_->_object_key (), "create_provides", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7463,7 +7463,7 @@ IR::ProvidesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_provide name, version, interface_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7474,7 +7474,7 @@ IR::UsesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_uses ( const char * version, CORBA_InterfaceDef_ptr interface_type, CORBA::Boolean is_multiple - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7490,7 +7490,7 @@ IR::UsesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_uses ( _collocated_tao_target_->_object_key (), "create_uses", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7504,7 +7504,7 @@ IR::UsesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_uses ( version, interface_type, is_multiple - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7514,7 +7514,7 @@ IR::EmitsDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_emits ( const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7530,7 +7530,7 @@ IR::EmitsDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_emits ( _collocated_tao_target_->_object_key (), "create_emits", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7543,7 +7543,7 @@ IR::EmitsDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_emits ( name, version, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7553,7 +7553,7 @@ IR::PublishesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_publis const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7569,7 +7569,7 @@ IR::PublishesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_publis _collocated_tao_target_->_object_key (), "create_publishes", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7582,7 +7582,7 @@ IR::PublishesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_publis name, version, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7592,7 +7592,7 @@ IR::ConsumesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_consume const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7608,7 +7608,7 @@ IR::ConsumesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_consume _collocated_tao_target_->_object_key (), "create_consumes", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7621,7 +7621,7 @@ IR::ConsumesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_consume name, version, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7654,7 +7654,7 @@ void POA_IR::ComponentDef::_get_supported_interfaces_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::ComponentDef *_tao_impl = @@ -7675,18 +7675,18 @@ void POA_IR::ComponentDef::_get_supported_interfaces_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->supported_interfaces ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7695,7 +7695,7 @@ void POA_IR::ComponentDef::_get_supported_interfaces_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7703,12 +7703,12 @@ void POA_IR::ComponentDef::_get_supported_interfaces_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7736,7 +7736,7 @@ void POA_IR::ComponentDef::_set_supported_interfaces_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -7765,25 +7765,25 @@ void POA_IR::ComponentDef::_set_supported_interfaces_skel ( _tao_upcall, _tao_impl, supported_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->supported_interfaces ( supported_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7791,12 +7791,12 @@ void POA_IR::ComponentDef::_set_supported_interfaces_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7817,7 +7817,7 @@ void POA_IR::ComponentDef::_get_base_component_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::ComponentDef *_tao_impl = @@ -7838,18 +7838,18 @@ void POA_IR::ComponentDef::_get_base_component_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->base_component ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7858,7 +7858,7 @@ void POA_IR::ComponentDef::_get_base_component_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7866,12 +7866,12 @@ void POA_IR::ComponentDef::_get_base_component_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7899,7 +7899,7 @@ void POA_IR::ComponentDef::_get_provides_interfaces_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::ComponentDef *_tao_impl = @@ -7920,18 +7920,18 @@ void POA_IR::ComponentDef::_get_provides_interfaces_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->provides_interfaces ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7940,7 +7940,7 @@ void POA_IR::ComponentDef::_get_provides_interfaces_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7948,12 +7948,12 @@ void POA_IR::ComponentDef::_get_provides_interfaces_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7981,7 +7981,7 @@ void POA_IR::ComponentDef::_get_uses_interfaces_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::ComponentDef *_tao_impl = @@ -8002,18 +8002,18 @@ void POA_IR::ComponentDef::_get_uses_interfaces_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->uses_interfaces ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8022,7 +8022,7 @@ void POA_IR::ComponentDef::_get_uses_interfaces_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8030,12 +8030,12 @@ void POA_IR::ComponentDef::_get_uses_interfaces_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8063,7 +8063,7 @@ void POA_IR::ComponentDef::_get_emits_events_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::ComponentDef *_tao_impl = @@ -8084,18 +8084,18 @@ void POA_IR::ComponentDef::_get_emits_events_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->emits_events ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8104,7 +8104,7 @@ void POA_IR::ComponentDef::_get_emits_events_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8112,12 +8112,12 @@ void POA_IR::ComponentDef::_get_emits_events_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8145,7 +8145,7 @@ void POA_IR::ComponentDef::_get_publishes_events_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::ComponentDef *_tao_impl = @@ -8166,18 +8166,18 @@ void POA_IR::ComponentDef::_get_publishes_events_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->publishes_events ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8186,7 +8186,7 @@ void POA_IR::ComponentDef::_get_publishes_events_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8194,12 +8194,12 @@ void POA_IR::ComponentDef::_get_publishes_events_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8227,7 +8227,7 @@ void POA_IR::ComponentDef::_get_consumes_events_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::ComponentDef *_tao_impl = @@ -8248,18 +8248,18 @@ void POA_IR::ComponentDef::_get_consumes_events_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->consumes_events ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8268,7 +8268,7 @@ void POA_IR::ComponentDef::_get_consumes_events_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8276,12 +8276,12 @@ void POA_IR::ComponentDef::_get_consumes_events_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8309,7 +8309,7 @@ void POA_IR::ComponentDef::_get_is_basic_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::ComponentDef *_tao_impl = @@ -8330,18 +8330,18 @@ void POA_IR::ComponentDef::_get_is_basic_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->is_basic ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8349,7 +8349,7 @@ void POA_IR::ComponentDef::_get_is_basic_skel ( CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8357,12 +8357,12 @@ void POA_IR::ComponentDef::_get_is_basic_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8390,7 +8390,7 @@ void POA_IR::ComponentDef::create_provides_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8428,12 +8428,12 @@ void POA_IR::ComponentDef::create_provides_skel ( name.in (), version.in (), interface_type.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -8443,7 +8443,7 @@ void POA_IR::ComponentDef::create_provides_skel ( name.in (), version.in (), interface_type.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8452,7 +8452,7 @@ void POA_IR::ComponentDef::create_provides_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8460,12 +8460,12 @@ void POA_IR::ComponentDef::create_provides_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8493,7 +8493,7 @@ void POA_IR::ComponentDef::create_uses_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8534,12 +8534,12 @@ void POA_IR::ComponentDef::create_uses_skel ( version.in (), interface_type.in (), is_multiple - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -8550,7 +8550,7 @@ void POA_IR::ComponentDef::create_uses_skel ( version.in (), interface_type.in (), is_multiple - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8559,7 +8559,7 @@ void POA_IR::ComponentDef::create_uses_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8567,12 +8567,12 @@ void POA_IR::ComponentDef::create_uses_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8600,7 +8600,7 @@ void POA_IR::ComponentDef::create_emits_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8638,12 +8638,12 @@ void POA_IR::ComponentDef::create_emits_skel ( name.in (), version.in (), value.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -8653,7 +8653,7 @@ void POA_IR::ComponentDef::create_emits_skel ( name.in (), version.in (), value.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8662,7 +8662,7 @@ void POA_IR::ComponentDef::create_emits_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8670,12 +8670,12 @@ void POA_IR::ComponentDef::create_emits_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8703,7 +8703,7 @@ void POA_IR::ComponentDef::create_publishes_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8741,12 +8741,12 @@ void POA_IR::ComponentDef::create_publishes_skel ( name.in (), version.in (), value.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -8756,7 +8756,7 @@ void POA_IR::ComponentDef::create_publishes_skel ( name.in (), version.in (), value.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8765,7 +8765,7 @@ void POA_IR::ComponentDef::create_publishes_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8773,12 +8773,12 @@ void POA_IR::ComponentDef::create_publishes_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8806,7 +8806,7 @@ void POA_IR::ComponentDef::create_consumes_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8844,12 +8844,12 @@ void POA_IR::ComponentDef::create_consumes_skel ( name.in (), version.in (), value.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -8859,7 +8859,7 @@ void POA_IR::ComponentDef::create_consumes_skel ( name.in (), version.in (), value.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8868,7 +8868,7 @@ void POA_IR::ComponentDef::create_consumes_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8876,12 +8876,12 @@ void POA_IR::ComponentDef::create_consumes_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8909,7 +8909,7 @@ void POA_IR::ComponentDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8919,7 +8919,7 @@ void POA_IR::ComponentDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -8932,11 +8932,11 @@ void POA_IR::ComponentDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -8949,7 +8949,7 @@ void POA_IR::ComponentDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *) _tao_object_reference; @@ -8968,7 +8968,7 @@ void POA_IR::ComponentDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -8995,10 +8995,10 @@ void POA_IR::ComponentDef::_interface_skel ( CORBA::Boolean POA_IR::ComponentDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -9035,12 +9035,12 @@ void* POA_IR::ComponentDef::_downcast ( return 0; } -void POA_IR::ComponentDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_IR::ComponentDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -9050,9 +9050,9 @@ const char* POA_IR::ComponentDef::_interface_repository_id (void) const } IR::ComponentDef* -POA_IR::ComponentDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::ComponentDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -9221,31 +9221,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::PrimaryKeyDef *tao_impl , const char * primary_key_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::Boolean result); @@ -9265,7 +9265,7 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::TAO_ServerRequestInfo_IR_PrimaryKey TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::PrimaryKeyDef *tao_impl, const char * primary_key_id - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -9273,12 +9273,12 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::TAO_ServerRequestInfo_IR_PrimaryKey {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -9294,25 +9294,25 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL) } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -9324,7 +9324,7 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -9334,10 +9334,10 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -9354,31 +9354,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::PrimaryKeyDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_ValueDef_ptr result); @@ -9396,44 +9396,44 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::TAO_ServerRequestInfo_IR TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::PrimaryKeyDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -9445,7 +9445,7 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (TAO_ENV_SINGLE_A char * TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -9455,10 +9455,10 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::target_most_derived_inte CORBA::Boolean TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -9498,17 +9498,17 @@ POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::~_TAO_PrimaryKeyDef_Strateg IR::_TAO_PrimaryKeyDef_Proxy_Impl& POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::select_proxy ( ::IR::PrimaryKeyDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -9518,7 +9518,7 @@ POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::select_proxy ( void POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -9589,7 +9589,7 @@ POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::_TAO_PrimaryKeyDef_ThruPOA_Proxy_ CORBA::Boolean POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::is_a ( CORBA_Object *_collocated_tao_target_, const char * primary_key_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -9605,7 +9605,7 @@ CORBA::Boolean POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::is_a ( _collocated_tao_target_->_object_key (), "is_a", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -9615,13 +9615,13 @@ CORBA::Boolean POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::is_a ( ) )->is_a ( primary_key_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_ValueDef_ptr POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::primary_key ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -9637,7 +9637,7 @@ CORBA_ValueDef_ptr POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::primary_key ( _collocated_tao_target_->_object_key (), "primary_key", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -9646,7 +9646,7 @@ CORBA_ValueDef_ptr POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::primary_key ( "IDL:omg.org/IR/PrimaryKeyDef:1.0" ) )->primary_key ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -9676,7 +9676,7 @@ void POA_IR::PrimaryKeyDef::is_a_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -9705,19 +9705,19 @@ void POA_IR::PrimaryKeyDef::is_a_skel ( _tao_upcall, _tao_impl, primary_key_id.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->is_a ( primary_key_id.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -9725,7 +9725,7 @@ void POA_IR::PrimaryKeyDef::is_a_skel ( CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -9733,12 +9733,12 @@ void POA_IR::PrimaryKeyDef::is_a_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -9766,7 +9766,7 @@ void POA_IR::PrimaryKeyDef::_get_primary_key_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::PrimaryKeyDef *_tao_impl = @@ -9787,18 +9787,18 @@ void POA_IR::PrimaryKeyDef::_get_primary_key_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->primary_key ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -9807,7 +9807,7 @@ void POA_IR::PrimaryKeyDef::_get_primary_key_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -9815,12 +9815,12 @@ void POA_IR::PrimaryKeyDef::_get_primary_key_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -9848,7 +9848,7 @@ void POA_IR::PrimaryKeyDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -9858,7 +9858,7 @@ void POA_IR::PrimaryKeyDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -9871,11 +9871,11 @@ void POA_IR::PrimaryKeyDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::PrimaryKeyDef *_tao_impl = (POA_IR::PrimaryKeyDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -9888,7 +9888,7 @@ void POA_IR::PrimaryKeyDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::PrimaryKeyDef *_tao_impl = (POA_IR::PrimaryKeyDef *) _tao_object_reference; @@ -9907,7 +9907,7 @@ void POA_IR::PrimaryKeyDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -9934,10 +9934,10 @@ void POA_IR::PrimaryKeyDef::_interface_skel ( CORBA::Boolean POA_IR::PrimaryKeyDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -9965,12 +9965,12 @@ void* POA_IR::PrimaryKeyDef::_downcast ( return 0; } -void POA_IR::PrimaryKeyDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_IR::PrimaryKeyDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -9980,9 +9980,9 @@ const char* POA_IR::PrimaryKeyDef::_interface_repository_id (void) const } IR::PrimaryKeyDef* -POA_IR::PrimaryKeyDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::PrimaryKeyDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -10233,17 +10233,17 @@ POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::~_TAO_FactoryDef_Strategized_P IR::_TAO_FactoryDef_Proxy_Impl& POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::select_proxy ( ::IR::FactoryDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -10253,7 +10253,7 @@ POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::select_proxy ( void POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -10348,7 +10348,7 @@ void POA_IR::FactoryDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -10358,7 +10358,7 @@ void POA_IR::FactoryDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -10371,11 +10371,11 @@ void POA_IR::FactoryDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::FactoryDef *_tao_impl = (POA_IR::FactoryDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -10388,7 +10388,7 @@ void POA_IR::FactoryDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::FactoryDef *_tao_impl = (POA_IR::FactoryDef *) _tao_object_reference; @@ -10407,7 +10407,7 @@ void POA_IR::FactoryDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -10434,10 +10434,10 @@ void POA_IR::FactoryDef::_interface_skel ( CORBA::Boolean POA_IR::FactoryDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -10468,12 +10468,12 @@ void* POA_IR::FactoryDef::_downcast ( return 0; } -void POA_IR::FactoryDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_IR::FactoryDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -10483,9 +10483,9 @@ const char* POA_IR::FactoryDef::_interface_repository_id (void) const } IR::FactoryDef* -POA_IR::FactoryDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::FactoryDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -10736,17 +10736,17 @@ POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::~_TAO_FinderDef_Strategized_Pro IR::_TAO_FinderDef_Proxy_Impl& POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::select_proxy ( ::IR::FinderDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -10756,7 +10756,7 @@ POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::select_proxy ( void POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -10851,7 +10851,7 @@ void POA_IR::FinderDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -10861,7 +10861,7 @@ void POA_IR::FinderDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -10874,11 +10874,11 @@ void POA_IR::FinderDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::FinderDef *_tao_impl = (POA_IR::FinderDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -10891,7 +10891,7 @@ void POA_IR::FinderDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::FinderDef *_tao_impl = (POA_IR::FinderDef *) _tao_object_reference; @@ -10910,7 +10910,7 @@ void POA_IR::FinderDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -10937,10 +10937,10 @@ void POA_IR::FinderDef::_interface_skel ( CORBA::Boolean POA_IR::FinderDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -10971,12 +10971,12 @@ void* POA_IR::FinderDef::_downcast ( return 0; } -void POA_IR::FinderDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_IR::FinderDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -10986,9 +10986,9 @@ const char* POA_IR::FinderDef::_interface_repository_id (void) const } IR::FinderDef* -POA_IR::FinderDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::FinderDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -11191,31 +11191,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::HomeDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::HomeDef_ptr result); @@ -11233,44 +11233,44 @@ TAO_ServerRequestInfo_IR_HomeDef_base_home_get::TAO_ServerRequestInfo_IR_HomeDef TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::HomeDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_HomeDef_base_home_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_base_home_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_HomeDef_base_home_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_base_home_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_HomeDef_base_home_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_base_home_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -11282,7 +11282,7 @@ TAO_ServerRequestInfo_IR_HomeDef_base_home_get::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_IR_HomeDef_base_home_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -11292,10 +11292,10 @@ TAO_ServerRequestInfo_IR_HomeDef_base_home_get::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_IR_HomeDef_base_home_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -11312,31 +11312,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::HomeDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::ComponentDef_ptr result); @@ -11354,44 +11354,44 @@ TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::TAO_ServerRequestInfo_IR TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::HomeDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -11403,7 +11403,7 @@ TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::result (TAO_ENV_SINGLE_A char * TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -11413,10 +11413,10 @@ TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::target_most_derived_inte CORBA::Boolean TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -11433,31 +11433,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::HomeDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::PrimaryKeyDef_ptr result); @@ -11475,44 +11475,44 @@ TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::TAO_ServerRequestInfo_IR_HomeD TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::HomeDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -11524,7 +11524,7 @@ TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::result (TAO_ENV_SINGLE_ARG_DEC char * TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -11534,10 +11534,10 @@ TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -11554,31 +11554,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::HomeDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::FactoryDefSeq * result); @@ -11596,44 +11596,44 @@ TAO_ServerRequestInfo_IR_HomeDef_factories_get::TAO_ServerRequestInfo_IR_HomeDef TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::HomeDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_HomeDef_factories_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_factories_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_HomeDef_factories_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_factories_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_HomeDef_factories_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_factories_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -11645,7 +11645,7 @@ TAO_ServerRequestInfo_IR_HomeDef_factories_get::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_IR_HomeDef_factories_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -11655,10 +11655,10 @@ TAO_ServerRequestInfo_IR_HomeDef_factories_get::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_IR_HomeDef_factories_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -11675,31 +11675,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::HomeDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::FinderDefSeq * result); @@ -11717,44 +11717,44 @@ TAO_ServerRequestInfo_IR_HomeDef_finders_get::TAO_ServerRequestInfo_IR_HomeDef_f TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::HomeDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_HomeDef_finders_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_finders_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_HomeDef_finders_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_finders_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_HomeDef_finders_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_finders_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -11766,7 +11766,7 @@ TAO_ServerRequestInfo_IR_HomeDef_finders_get::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_IR_HomeDef_finders_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -11776,10 +11776,10 @@ TAO_ServerRequestInfo_IR_HomeDef_finders_get::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_IR_HomeDef_finders_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -11796,31 +11796,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::HomeDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::Boolean result); @@ -11838,44 +11838,44 @@ TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::TAO_ServerRequestInfo_IR_HomeDef_ TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::HomeDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -11887,7 +11887,7 @@ TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -11897,10 +11897,10 @@ TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -11921,31 +11921,31 @@ public: const char * name, const char * version, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::PrimaryKeyDef_ptr result); @@ -11971,7 +11971,7 @@ TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::TAO_ServerRequestInfo_IR_Ho const char * name, const char * version, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -11982,12 +11982,12 @@ TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::TAO_ServerRequestInfo_IR_Ho {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -12012,25 +12012,25 @@ TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::arguments (TAO_ENV_SINGLE_A } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -12042,7 +12042,7 @@ TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::result (TAO_ENV_SINGLE_ARG_ char * TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -12052,10 +12052,10 @@ TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::target_most_derived_interfa CORBA::Boolean TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -12077,31 +12077,31 @@ public: const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::FactoryDef_ptr result); @@ -12129,7 +12129,7 @@ TAO_ServerRequestInfo_IR_HomeDef_create_factory::TAO_ServerRequestInfo_IR_HomeDe const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -12141,12 +12141,12 @@ TAO_ServerRequestInfo_IR_HomeDef_create_factory::TAO_ServerRequestInfo_IR_HomeDe {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_HomeDef_create_factory::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_create_factory::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -12174,25 +12174,25 @@ TAO_ServerRequestInfo_IR_HomeDef_create_factory::arguments (TAO_ENV_SINGLE_ARG_D } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_HomeDef_create_factory::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_create_factory::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_HomeDef_create_factory::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_create_factory::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -12204,7 +12204,7 @@ TAO_ServerRequestInfo_IR_HomeDef_create_factory::result (TAO_ENV_SINGLE_ARG_DECL char * TAO_ServerRequestInfo_IR_HomeDef_create_factory::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -12214,10 +12214,10 @@ TAO_ServerRequestInfo_IR_HomeDef_create_factory::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_IR_HomeDef_create_factory::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -12239,31 +12239,31 @@ public: const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::FinderDef_ptr result); @@ -12291,7 +12291,7 @@ TAO_ServerRequestInfo_IR_HomeDef_create_finder::TAO_ServerRequestInfo_IR_HomeDef const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -12303,12 +12303,12 @@ TAO_ServerRequestInfo_IR_HomeDef_create_finder::TAO_ServerRequestInfo_IR_HomeDef {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_HomeDef_create_finder::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_create_finder::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -12336,25 +12336,25 @@ TAO_ServerRequestInfo_IR_HomeDef_create_finder::arguments (TAO_ENV_SINGLE_ARG_DE } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_HomeDef_create_finder::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_create_finder::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_HomeDef_create_finder::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_create_finder::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -12366,7 +12366,7 @@ TAO_ServerRequestInfo_IR_HomeDef_create_finder::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_IR_HomeDef_create_finder::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -12376,10 +12376,10 @@ TAO_ServerRequestInfo_IR_HomeDef_create_finder::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_IR_HomeDef_create_finder::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -12419,17 +12419,17 @@ POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::~_TAO_HomeDef_Strategized_Proxy_B IR::_TAO_HomeDef_Proxy_Impl& POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::select_proxy ( ::IR::HomeDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -12439,7 +12439,7 @@ POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::select_proxy ( void POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -12509,7 +12509,7 @@ POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_TAO_HomeDef_ThruPOA_Proxy_Impl (void) IR::HomeDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::base_home ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -12525,7 +12525,7 @@ IR::HomeDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::base_home ( _collocated_tao_target_->_object_key (), "base_home", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -12534,13 +12534,13 @@ IR::HomeDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::base_home ( "IDL:omg.org/IR/HomeDef:1.0" ) )->base_home ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } IR::ComponentDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::managed_component ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -12556,7 +12556,7 @@ IR::ComponentDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::managed_component _collocated_tao_target_->_object_key (), "managed_component", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -12565,13 +12565,13 @@ IR::ComponentDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::managed_component "IDL:omg.org/IR/HomeDef:1.0" ) )->managed_component ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::primary_key ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -12587,7 +12587,7 @@ IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::primary_key ( _collocated_tao_target_->_object_key (), "primary_key", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -12596,13 +12596,13 @@ IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::primary_key ( "IDL:omg.org/IR/HomeDef:1.0" ) )->primary_key ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } IR::FactoryDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::factories ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -12618,7 +12618,7 @@ IR::FactoryDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::factories ( _collocated_tao_target_->_object_key (), "factories", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -12627,13 +12627,13 @@ IR::FactoryDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::factories ( "IDL:omg.org/IR/HomeDef:1.0" ) )->factories ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } IR::FinderDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::finders ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -12649,7 +12649,7 @@ IR::FinderDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::finders ( _collocated_tao_target_->_object_key (), "finders", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -12658,13 +12658,13 @@ IR::FinderDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::finders ( "IDL:omg.org/IR/HomeDef:1.0" ) )->finders ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } CORBA::Boolean POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::is_basic ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -12680,7 +12680,7 @@ CORBA::Boolean POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::is_basic ( _collocated_tao_target_->_object_key (), "is_basic", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -12689,7 +12689,7 @@ CORBA::Boolean POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::is_basic ( "IDL:omg.org/IR/HomeDef:1.0" ) )->is_basic ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -12699,7 +12699,7 @@ IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_primary_ke const char * name, const char * version, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -12715,7 +12715,7 @@ IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_primary_ke _collocated_tao_target_->_object_key (), "create_primary_key", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -12728,7 +12728,7 @@ IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_primary_ke name, version, primary_key - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -12739,7 +12739,7 @@ IR::FactoryDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_factory ( const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -12755,7 +12755,7 @@ IR::FactoryDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_factory ( _collocated_tao_target_->_object_key (), "create_factory", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -12769,7 +12769,7 @@ IR::FactoryDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_factory ( version, params, exceptions - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -12780,7 +12780,7 @@ IR::FinderDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_finder ( const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -12796,7 +12796,7 @@ IR::FinderDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_finder ( _collocated_tao_target_->_object_key (), "create_finder", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -12810,7 +12810,7 @@ IR::FinderDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_finder ( version, params, exceptions - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -12843,7 +12843,7 @@ void POA_IR::HomeDef::_get_base_home_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::HomeDef *_tao_impl = @@ -12864,18 +12864,18 @@ void POA_IR::HomeDef::_get_base_home_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->base_home ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -12884,7 +12884,7 @@ void POA_IR::HomeDef::_get_base_home_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -12892,12 +12892,12 @@ void POA_IR::HomeDef::_get_base_home_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -12925,7 +12925,7 @@ void POA_IR::HomeDef::_get_managed_component_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::HomeDef *_tao_impl = @@ -12946,18 +12946,18 @@ void POA_IR::HomeDef::_get_managed_component_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->managed_component ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -12966,7 +12966,7 @@ void POA_IR::HomeDef::_get_managed_component_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -12974,12 +12974,12 @@ void POA_IR::HomeDef::_get_managed_component_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -13007,7 +13007,7 @@ void POA_IR::HomeDef::_get_primary_key_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::HomeDef *_tao_impl = @@ -13028,18 +13028,18 @@ void POA_IR::HomeDef::_get_primary_key_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->primary_key ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -13048,7 +13048,7 @@ void POA_IR::HomeDef::_get_primary_key_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -13056,12 +13056,12 @@ void POA_IR::HomeDef::_get_primary_key_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -13089,7 +13089,7 @@ void POA_IR::HomeDef::_get_factories_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::HomeDef *_tao_impl = @@ -13110,18 +13110,18 @@ void POA_IR::HomeDef::_get_factories_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->factories ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -13130,7 +13130,7 @@ void POA_IR::HomeDef::_get_factories_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -13138,12 +13138,12 @@ void POA_IR::HomeDef::_get_factories_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -13171,7 +13171,7 @@ void POA_IR::HomeDef::_get_finders_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::HomeDef *_tao_impl = @@ -13192,18 +13192,18 @@ void POA_IR::HomeDef::_get_finders_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->finders ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -13212,7 +13212,7 @@ void POA_IR::HomeDef::_get_finders_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -13220,12 +13220,12 @@ void POA_IR::HomeDef::_get_finders_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -13253,7 +13253,7 @@ void POA_IR::HomeDef::_get_is_basic_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::HomeDef *_tao_impl = @@ -13274,18 +13274,18 @@ void POA_IR::HomeDef::_get_is_basic_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->is_basic ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -13293,7 +13293,7 @@ void POA_IR::HomeDef::_get_is_basic_skel ( CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -13301,12 +13301,12 @@ void POA_IR::HomeDef::_get_is_basic_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -13334,7 +13334,7 @@ void POA_IR::HomeDef::create_primary_key_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -13372,12 +13372,12 @@ void POA_IR::HomeDef::create_primary_key_skel ( name.in (), version.in (), primary_key.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -13387,7 +13387,7 @@ void POA_IR::HomeDef::create_primary_key_skel ( name.in (), version.in (), primary_key.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -13396,7 +13396,7 @@ void POA_IR::HomeDef::create_primary_key_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -13404,12 +13404,12 @@ void POA_IR::HomeDef::create_primary_key_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -13437,7 +13437,7 @@ void POA_IR::HomeDef::create_factory_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -13478,12 +13478,12 @@ void POA_IR::HomeDef::create_factory_skel ( version.in (), params, exceptions - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -13494,7 +13494,7 @@ void POA_IR::HomeDef::create_factory_skel ( version.in (), params, exceptions - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -13503,7 +13503,7 @@ void POA_IR::HomeDef::create_factory_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -13511,12 +13511,12 @@ void POA_IR::HomeDef::create_factory_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -13544,7 +13544,7 @@ void POA_IR::HomeDef::create_finder_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -13585,12 +13585,12 @@ void POA_IR::HomeDef::create_finder_skel ( version.in (), params, exceptions - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -13601,7 +13601,7 @@ void POA_IR::HomeDef::create_finder_skel ( version.in (), params, exceptions - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -13610,7 +13610,7 @@ void POA_IR::HomeDef::create_finder_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -13618,12 +13618,12 @@ void POA_IR::HomeDef::create_finder_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -13651,7 +13651,7 @@ void POA_IR::HomeDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -13661,7 +13661,7 @@ void POA_IR::HomeDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -13674,11 +13674,11 @@ void POA_IR::HomeDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -13691,7 +13691,7 @@ void POA_IR::HomeDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *) _tao_object_reference; @@ -13710,7 +13710,7 @@ void POA_IR::HomeDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -13737,10 +13737,10 @@ void POA_IR::HomeDef::_interface_skel ( CORBA::Boolean POA_IR::HomeDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -13777,12 +13777,12 @@ void* POA_IR::HomeDef::_downcast ( return 0; } -void POA_IR::HomeDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_IR::HomeDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -13792,9 +13792,9 @@ const char* POA_IR::HomeDef::_interface_repository_id (void) const } IR::HomeDef* -POA_IR::HomeDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::HomeDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.h b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.h index ce0d7b2a01a..cd49eb534e2 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.h +++ b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.h @@ -67,7 +67,7 @@ TAO_NAMESPACE POA_IR virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -78,31 +78,31 @@ TAO_NAMESPACE POA_IR TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::IR::ComponentRepository *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; @@ -113,7 +113,7 @@ TAO_NAMESPACE POA_IR const char * version, IR::ComponentDef_ptr base_component, const CORBA_InterfaceDefSeq & supports_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -123,7 +123,7 @@ TAO_NAMESPACE POA_IR TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual IR::HomeDef_ptr create_home ( @@ -133,7 +133,7 @@ TAO_NAMESPACE POA_IR IR::HomeDef_ptr base_home, IR::ComponentDef_ptr managed_component, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -143,196 +143,196 @@ TAO_NAMESPACE POA_IR TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void lookup_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void get_canonical_typecode_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void get_primitive_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_string_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_wstring_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_sequence_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_array_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_fixed_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -352,7 +352,7 @@ TAO_NAMESPACE POA_IR virtual ::IR::_TAO_ComponentRepository_Proxy_Impl &select_proxy ( ::IR::ComponentRepository *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -361,7 +361,7 @@ TAO_NAMESPACE POA_IR // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -409,7 +409,7 @@ TAO_NAMESPACE POA_IR const char * version, IR::ComponentDef_ptr base_component, const CORBA_InterfaceDefSeq & supports_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -423,7 +423,7 @@ TAO_NAMESPACE POA_IR IR::HomeDef_ptr base_home, IR::ComponentDef_ptr managed_component, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -455,7 +455,7 @@ TAO_NAMESPACE POA_IR virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -466,37 +466,37 @@ TAO_NAMESPACE POA_IR TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::IR::ProvidesDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA_InterfaceDef_ptr interface_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -506,98 +506,98 @@ TAO_NAMESPACE POA_IR TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -617,7 +617,7 @@ TAO_NAMESPACE POA_IR virtual ::IR::_TAO_ProvidesDef_Proxy_Impl &select_proxy ( ::IR::ProvidesDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -626,7 +626,7 @@ TAO_NAMESPACE POA_IR // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -669,7 +669,7 @@ private: virtual CORBA_InterfaceDef_ptr interface_type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -701,7 +701,7 @@ private: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -712,37 +712,37 @@ private: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::IR::UsesDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA_InterfaceDef_ptr interface_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -752,11 +752,11 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA::Boolean is_multiple ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -766,98 +766,98 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -877,7 +877,7 @@ private: virtual ::IR::_TAO_UsesDef_Proxy_Impl &select_proxy ( ::IR::UsesDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -886,7 +886,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -929,7 +929,7 @@ private: virtual CORBA_InterfaceDef_ptr interface_type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -937,7 +937,7 @@ private: virtual CORBA::Boolean is_multiple ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -969,7 +969,7 @@ private: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -980,38 +980,38 @@ private: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::IR::EventDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean is_a ( const char * event_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1021,11 +1021,11 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_ValueDef_ptr event ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1035,98 +1035,98 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -1146,7 +1146,7 @@ private: virtual ::IR::_TAO_EventDef_Proxy_Impl &select_proxy ( ::IR::EventDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1155,7 +1155,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1199,7 +1199,7 @@ private: virtual CORBA::Boolean is_a ( CORBA_Object *_collocated_tao_target_, const char * event_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1207,7 +1207,7 @@ private: virtual CORBA_ValueDef_ptr event ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1239,7 +1239,7 @@ private: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -1250,31 +1250,31 @@ private: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::IR::EmitsDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; @@ -1283,105 +1283,105 @@ private: TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_event_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -1401,7 +1401,7 @@ private: virtual ::IR::_TAO_EmitsDef_Proxy_Impl &select_proxy ( ::IR::EmitsDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1410,7 +1410,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1477,7 +1477,7 @@ private: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -1488,31 +1488,31 @@ private: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::IR::PublishesDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; @@ -1521,105 +1521,105 @@ private: TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_event_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -1639,7 +1639,7 @@ private: virtual ::IR::_TAO_PublishesDef_Proxy_Impl &select_proxy ( ::IR::PublishesDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1648,7 +1648,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1715,7 +1715,7 @@ private: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -1726,31 +1726,31 @@ private: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::IR::ConsumesDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; @@ -1759,105 +1759,105 @@ private: TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_event_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -1877,7 +1877,7 @@ private: virtual ::IR::_TAO_ConsumesDef_Proxy_Impl &select_proxy ( ::IR::ConsumesDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1886,7 +1886,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1953,7 +1953,7 @@ private: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -1964,37 +1964,37 @@ private: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::IR::ComponentDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA_InterfaceDefSeq * supported_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2004,12 +2004,12 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void supported_interfaces ( const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2019,11 +2019,11 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual IR::ComponentDef_ptr base_component ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2033,11 +2033,11 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual IR::ProvidesDefSeq * provides_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2047,11 +2047,11 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual IR::UsesDefSeq * uses_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2061,11 +2061,11 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual IR::EmitsDefSeq * emits_events ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2075,11 +2075,11 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual IR::PublishesDefSeq * publishes_events ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2089,11 +2089,11 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual IR::ConsumesDefSeq * consumes_events ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2103,11 +2103,11 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA::Boolean is_basic ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2117,7 +2117,7 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual IR::ProvidesDef_ptr create_provides ( @@ -2125,7 +2125,7 @@ private: const char * name, const char * version, CORBA_InterfaceDef_ptr interface_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2135,7 +2135,7 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual IR::UsesDef_ptr create_uses ( @@ -2144,7 +2144,7 @@ private: const char * version, CORBA_InterfaceDef_ptr interface_type, CORBA::Boolean is_multiple - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2154,7 +2154,7 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual IR::EmitsDef_ptr create_emits ( @@ -2162,7 +2162,7 @@ private: const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2172,7 +2172,7 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual IR::PublishesDef_ptr create_publishes ( @@ -2180,7 +2180,7 @@ private: const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2190,7 +2190,7 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual IR::ConsumesDef_ptr create_consumes ( @@ -2198,7 +2198,7 @@ private: const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2208,266 +2208,266 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_base_interfaces_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_base_interfaces_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void is_a_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_attribute_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_operation_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -2487,7 +2487,7 @@ private: virtual ::IR::_TAO_ComponentDef_Proxy_Impl &select_proxy ( ::IR::ComponentDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -2496,7 +2496,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -2539,7 +2539,7 @@ private: virtual CORBA_InterfaceDefSeq * supported_interfaces ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2548,7 +2548,7 @@ private: virtual void supported_interfaces ( CORBA_Object *_collocated_tao_target_, const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2556,7 +2556,7 @@ private: virtual IR::ComponentDef_ptr base_component ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2564,7 +2564,7 @@ private: virtual IR::ProvidesDefSeq * provides_interfaces ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2572,7 +2572,7 @@ private: virtual IR::UsesDefSeq * uses_interfaces ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2580,7 +2580,7 @@ private: virtual IR::EmitsDefSeq * emits_events ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2588,7 +2588,7 @@ private: virtual IR::PublishesDefSeq * publishes_events ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2596,7 +2596,7 @@ private: virtual IR::ConsumesDefSeq * consumes_events ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2604,7 +2604,7 @@ private: virtual CORBA::Boolean is_basic ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2616,7 +2616,7 @@ private: const char * name, const char * version, CORBA_InterfaceDef_ptr interface_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2629,7 +2629,7 @@ private: const char * version, CORBA_InterfaceDef_ptr interface_type, CORBA::Boolean is_multiple - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2641,7 +2641,7 @@ private: const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2653,7 +2653,7 @@ private: const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2665,7 +2665,7 @@ private: const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2697,7 +2697,7 @@ private: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -2708,38 +2708,38 @@ private: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::IR::PrimaryKeyDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean is_a ( const char * primary_key_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2749,11 +2749,11 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_ValueDef_ptr primary_key ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2763,98 +2763,98 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -2874,7 +2874,7 @@ private: virtual ::IR::_TAO_PrimaryKeyDef_Proxy_Impl &select_proxy ( ::IR::PrimaryKeyDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -2883,7 +2883,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -2927,7 +2927,7 @@ private: virtual CORBA::Boolean is_a ( CORBA_Object *_collocated_tao_target_, const char * primary_key_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2935,7 +2935,7 @@ private: virtual CORBA_ValueDef_ptr primary_key ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2967,7 +2967,7 @@ private: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -2978,31 +2978,31 @@ private: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::IR::FactoryDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; @@ -3011,168 +3011,168 @@ private: TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_result_def_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_result_def_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_params_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_params_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_mode_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_mode_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_contexts_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_contexts_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_exceptions_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_exceptions_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -3192,7 +3192,7 @@ private: virtual ::IR::_TAO_FactoryDef_Proxy_Impl &select_proxy ( ::IR::FactoryDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -3201,7 +3201,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -3268,7 +3268,7 @@ private: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -3279,31 +3279,31 @@ private: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::IR::FinderDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; @@ -3312,168 +3312,168 @@ private: TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_result_def_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_result_def_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_params_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_params_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_mode_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_mode_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_contexts_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_contexts_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_exceptions_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_exceptions_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -3493,7 +3493,7 @@ private: virtual ::IR::_TAO_FinderDef_Proxy_Impl &select_proxy ( ::IR::FinderDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -3502,7 +3502,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -3569,7 +3569,7 @@ private: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -3580,37 +3580,37 @@ private: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::IR::HomeDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual IR::HomeDef_ptr base_home ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3620,11 +3620,11 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual IR::ComponentDef_ptr managed_component ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3634,11 +3634,11 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual IR::PrimaryKeyDef_ptr primary_key ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3648,11 +3648,11 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual IR::FactoryDefSeq * factories ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3662,11 +3662,11 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual IR::FinderDefSeq * finders ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3676,11 +3676,11 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA::Boolean is_basic ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3690,7 +3690,7 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual IR::PrimaryKeyDef_ptr create_primary_key ( @@ -3698,7 +3698,7 @@ private: const char * name, const char * version, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3708,7 +3708,7 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual IR::FactoryDef_ptr create_factory ( @@ -3717,7 +3717,7 @@ private: const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3727,7 +3727,7 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual IR::FinderDef_ptr create_finder ( @@ -3736,7 +3736,7 @@ private: const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3746,266 +3746,266 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_base_interfaces_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_base_interfaces_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void is_a_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_attribute_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_operation_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -4025,7 +4025,7 @@ private: virtual ::IR::_TAO_HomeDef_Proxy_Impl &select_proxy ( ::IR::HomeDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -4034,7 +4034,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -4077,7 +4077,7 @@ private: virtual IR::HomeDef_ptr base_home ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4085,7 +4085,7 @@ private: virtual IR::ComponentDef_ptr managed_component ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4093,7 +4093,7 @@ private: virtual IR::PrimaryKeyDef_ptr primary_key ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4101,7 +4101,7 @@ private: virtual IR::FactoryDefSeq * factories ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4109,7 +4109,7 @@ private: virtual IR::FinderDefSeq * finders ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4117,7 +4117,7 @@ private: virtual CORBA::Boolean is_basic ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4129,7 +4129,7 @@ private: const char * name, const char * version, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4142,7 +4142,7 @@ private: const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4155,7 +4155,7 @@ private: const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.i b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.i index 96f3fd02407..8a5a82037d4 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.i +++ b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.i @@ -23,7 +23,7 @@ ACE_INLINE void POA_IR::ComponentRepository::lookup_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -31,14 +31,14 @@ ACE_INLINE void POA_IR::ComponentRepository::lookup_id_skel ( req, (POA_CORBA_Repository_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::get_canonical_typecode_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -46,14 +46,14 @@ ACE_INLINE void POA_IR::ComponentRepository::get_canonical_typecode_skel ( req, (POA_CORBA_Repository_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::get_primitive_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -61,14 +61,14 @@ ACE_INLINE void POA_IR::ComponentRepository::get_primitive_skel ( req, (POA_CORBA_Repository_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::create_string_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -76,14 +76,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_string_skel ( req, (POA_CORBA_Repository_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::create_wstring_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -91,14 +91,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_wstring_skel ( req, (POA_CORBA_Repository_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::create_sequence_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -106,14 +106,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_sequence_skel ( req, (POA_CORBA_Repository_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::create_array_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -121,14 +121,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_array_skel ( req, (POA_CORBA_Repository_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::create_fixed_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -136,14 +136,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_fixed_skel ( req, (POA_CORBA_Repository_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -151,14 +151,14 @@ ACE_INLINE void POA_IR::ComponentRepository::lookup_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -166,14 +166,14 @@ ACE_INLINE void POA_IR::ComponentRepository::contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -181,14 +181,14 @@ ACE_INLINE void POA_IR::ComponentRepository::lookup_name_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -196,14 +196,14 @@ ACE_INLINE void POA_IR::ComponentRepository::describe_contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -211,14 +211,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_module_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -226,14 +226,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_constant_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -241,14 +241,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_struct_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -256,14 +256,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_union_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -271,14 +271,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_enum_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -286,14 +286,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_alias_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -301,14 +301,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -316,14 +316,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_value_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -331,14 +331,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_value_box_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -346,14 +346,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_exception_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -361,14 +361,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_native_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -376,14 +376,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_abstract_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -391,14 +391,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_local_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -406,14 +406,14 @@ ACE_INLINE void POA_IR::ComponentRepository::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -421,14 +421,14 @@ ACE_INLINE void POA_IR::ComponentRepository::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ProvidesDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj; @@ -436,14 +436,14 @@ ACE_INLINE void POA_IR::ProvidesDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ProvidesDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj; @@ -451,14 +451,14 @@ ACE_INLINE void POA_IR::ProvidesDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ProvidesDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj; @@ -466,14 +466,14 @@ ACE_INLINE void POA_IR::ProvidesDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ProvidesDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj; @@ -481,14 +481,14 @@ ACE_INLINE void POA_IR::ProvidesDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ProvidesDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj; @@ -496,14 +496,14 @@ ACE_INLINE void POA_IR::ProvidesDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ProvidesDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj; @@ -511,14 +511,14 @@ ACE_INLINE void POA_IR::ProvidesDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ProvidesDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj; @@ -526,14 +526,14 @@ ACE_INLINE void POA_IR::ProvidesDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ProvidesDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj; @@ -541,14 +541,14 @@ ACE_INLINE void POA_IR::ProvidesDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ProvidesDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj; @@ -556,14 +556,14 @@ ACE_INLINE void POA_IR::ProvidesDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ProvidesDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj; @@ -571,14 +571,14 @@ ACE_INLINE void POA_IR::ProvidesDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ProvidesDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj; @@ -586,14 +586,14 @@ ACE_INLINE void POA_IR::ProvidesDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ProvidesDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::ProvidesDef_ptr) obj; @@ -601,14 +601,14 @@ ACE_INLINE void POA_IR::ProvidesDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ProvidesDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::ProvidesDef_ptr) obj; @@ -616,14 +616,14 @@ ACE_INLINE void POA_IR::ProvidesDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::UsesDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj; @@ -631,14 +631,14 @@ ACE_INLINE void POA_IR::UsesDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::UsesDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj; @@ -646,14 +646,14 @@ ACE_INLINE void POA_IR::UsesDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::UsesDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj; @@ -661,14 +661,14 @@ ACE_INLINE void POA_IR::UsesDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::UsesDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj; @@ -676,14 +676,14 @@ ACE_INLINE void POA_IR::UsesDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::UsesDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj; @@ -691,14 +691,14 @@ ACE_INLINE void POA_IR::UsesDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::UsesDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj; @@ -706,14 +706,14 @@ ACE_INLINE void POA_IR::UsesDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::UsesDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj; @@ -721,14 +721,14 @@ ACE_INLINE void POA_IR::UsesDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::UsesDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj; @@ -736,14 +736,14 @@ ACE_INLINE void POA_IR::UsesDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::UsesDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj; @@ -751,14 +751,14 @@ ACE_INLINE void POA_IR::UsesDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::UsesDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj; @@ -766,14 +766,14 @@ ACE_INLINE void POA_IR::UsesDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::UsesDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj; @@ -781,14 +781,14 @@ ACE_INLINE void POA_IR::UsesDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::UsesDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::UsesDef_ptr) obj; @@ -796,14 +796,14 @@ ACE_INLINE void POA_IR::UsesDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::UsesDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::UsesDef_ptr) obj; @@ -811,14 +811,14 @@ ACE_INLINE void POA_IR::UsesDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EventDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj; @@ -826,14 +826,14 @@ ACE_INLINE void POA_IR::EventDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EventDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj; @@ -841,14 +841,14 @@ ACE_INLINE void POA_IR::EventDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EventDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj; @@ -856,14 +856,14 @@ ACE_INLINE void POA_IR::EventDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EventDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj; @@ -871,14 +871,14 @@ ACE_INLINE void POA_IR::EventDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EventDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj; @@ -886,14 +886,14 @@ ACE_INLINE void POA_IR::EventDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EventDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj; @@ -901,14 +901,14 @@ ACE_INLINE void POA_IR::EventDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EventDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj; @@ -916,14 +916,14 @@ ACE_INLINE void POA_IR::EventDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EventDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj; @@ -931,14 +931,14 @@ ACE_INLINE void POA_IR::EventDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EventDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj; @@ -946,14 +946,14 @@ ACE_INLINE void POA_IR::EventDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EventDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj; @@ -961,14 +961,14 @@ ACE_INLINE void POA_IR::EventDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EventDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj; @@ -976,14 +976,14 @@ ACE_INLINE void POA_IR::EventDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EventDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::EventDef_ptr) obj; @@ -991,14 +991,14 @@ ACE_INLINE void POA_IR::EventDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EventDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::EventDef_ptr) obj; @@ -1006,14 +1006,14 @@ ACE_INLINE void POA_IR::EventDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EmitsDef::is_a_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::EventDef_ptr impl = (POA_IR::EmitsDef_ptr) obj; @@ -1021,14 +1021,14 @@ ACE_INLINE void POA_IR::EmitsDef::is_a_skel ( req, (POA_IR::EventDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EmitsDef::_get_event_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::EventDef_ptr impl = (POA_IR::EmitsDef_ptr) obj; @@ -1036,14 +1036,14 @@ ACE_INLINE void POA_IR::EmitsDef::_get_event_skel ( req, (POA_IR::EventDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EmitsDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj; @@ -1051,14 +1051,14 @@ ACE_INLINE void POA_IR::EmitsDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EmitsDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj; @@ -1066,14 +1066,14 @@ ACE_INLINE void POA_IR::EmitsDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EmitsDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj; @@ -1081,14 +1081,14 @@ ACE_INLINE void POA_IR::EmitsDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EmitsDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj; @@ -1096,14 +1096,14 @@ ACE_INLINE void POA_IR::EmitsDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EmitsDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj; @@ -1111,14 +1111,14 @@ ACE_INLINE void POA_IR::EmitsDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EmitsDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj; @@ -1126,14 +1126,14 @@ ACE_INLINE void POA_IR::EmitsDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EmitsDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj; @@ -1141,14 +1141,14 @@ ACE_INLINE void POA_IR::EmitsDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EmitsDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj; @@ -1156,14 +1156,14 @@ ACE_INLINE void POA_IR::EmitsDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EmitsDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj; @@ -1171,14 +1171,14 @@ ACE_INLINE void POA_IR::EmitsDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EmitsDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj; @@ -1186,14 +1186,14 @@ ACE_INLINE void POA_IR::EmitsDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EmitsDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj; @@ -1201,14 +1201,14 @@ ACE_INLINE void POA_IR::EmitsDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EmitsDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::EmitsDef_ptr) obj; @@ -1216,14 +1216,14 @@ ACE_INLINE void POA_IR::EmitsDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EmitsDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::EmitsDef_ptr) obj; @@ -1231,14 +1231,14 @@ ACE_INLINE void POA_IR::EmitsDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PublishesDef::is_a_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::EventDef_ptr impl = (POA_IR::PublishesDef_ptr) obj; @@ -1246,14 +1246,14 @@ ACE_INLINE void POA_IR::PublishesDef::is_a_skel ( req, (POA_IR::EventDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PublishesDef::_get_event_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::EventDef_ptr impl = (POA_IR::PublishesDef_ptr) obj; @@ -1261,14 +1261,14 @@ ACE_INLINE void POA_IR::PublishesDef::_get_event_skel ( req, (POA_IR::EventDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PublishesDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj; @@ -1276,14 +1276,14 @@ ACE_INLINE void POA_IR::PublishesDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PublishesDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj; @@ -1291,14 +1291,14 @@ ACE_INLINE void POA_IR::PublishesDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PublishesDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj; @@ -1306,14 +1306,14 @@ ACE_INLINE void POA_IR::PublishesDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PublishesDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj; @@ -1321,14 +1321,14 @@ ACE_INLINE void POA_IR::PublishesDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PublishesDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj; @@ -1336,14 +1336,14 @@ ACE_INLINE void POA_IR::PublishesDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PublishesDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj; @@ -1351,14 +1351,14 @@ ACE_INLINE void POA_IR::PublishesDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PublishesDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj; @@ -1366,14 +1366,14 @@ ACE_INLINE void POA_IR::PublishesDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PublishesDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj; @@ -1381,14 +1381,14 @@ ACE_INLINE void POA_IR::PublishesDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PublishesDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj; @@ -1396,14 +1396,14 @@ ACE_INLINE void POA_IR::PublishesDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PublishesDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj; @@ -1411,14 +1411,14 @@ ACE_INLINE void POA_IR::PublishesDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PublishesDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj; @@ -1426,14 +1426,14 @@ ACE_INLINE void POA_IR::PublishesDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PublishesDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::PublishesDef_ptr) obj; @@ -1441,14 +1441,14 @@ ACE_INLINE void POA_IR::PublishesDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PublishesDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::PublishesDef_ptr) obj; @@ -1456,14 +1456,14 @@ ACE_INLINE void POA_IR::PublishesDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ConsumesDef::is_a_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::EventDef_ptr impl = (POA_IR::ConsumesDef_ptr) obj; @@ -1471,14 +1471,14 @@ ACE_INLINE void POA_IR::ConsumesDef::is_a_skel ( req, (POA_IR::EventDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ConsumesDef::_get_event_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::EventDef_ptr impl = (POA_IR::ConsumesDef_ptr) obj; @@ -1486,14 +1486,14 @@ ACE_INLINE void POA_IR::ConsumesDef::_get_event_skel ( req, (POA_IR::EventDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ConsumesDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj; @@ -1501,14 +1501,14 @@ ACE_INLINE void POA_IR::ConsumesDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ConsumesDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj; @@ -1516,14 +1516,14 @@ ACE_INLINE void POA_IR::ConsumesDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ConsumesDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj; @@ -1531,14 +1531,14 @@ ACE_INLINE void POA_IR::ConsumesDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ConsumesDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj; @@ -1546,14 +1546,14 @@ ACE_INLINE void POA_IR::ConsumesDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ConsumesDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj; @@ -1561,14 +1561,14 @@ ACE_INLINE void POA_IR::ConsumesDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ConsumesDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj; @@ -1576,14 +1576,14 @@ ACE_INLINE void POA_IR::ConsumesDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ConsumesDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj; @@ -1591,14 +1591,14 @@ ACE_INLINE void POA_IR::ConsumesDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ConsumesDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj; @@ -1606,14 +1606,14 @@ ACE_INLINE void POA_IR::ConsumesDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ConsumesDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj; @@ -1621,14 +1621,14 @@ ACE_INLINE void POA_IR::ConsumesDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ConsumesDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj; @@ -1636,14 +1636,14 @@ ACE_INLINE void POA_IR::ConsumesDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ConsumesDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj; @@ -1651,14 +1651,14 @@ ACE_INLINE void POA_IR::ConsumesDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ConsumesDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::ConsumesDef_ptr) obj; @@ -1666,14 +1666,14 @@ ACE_INLINE void POA_IR::ConsumesDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ConsumesDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::ConsumesDef_ptr) obj; @@ -1681,14 +1681,14 @@ ACE_INLINE void POA_IR::ConsumesDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::_get_base_interfaces_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1696,14 +1696,14 @@ ACE_INLINE void POA_IR::ComponentDef::_get_base_interfaces_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::_set_base_interfaces_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1711,14 +1711,14 @@ ACE_INLINE void POA_IR::ComponentDef::_set_base_interfaces_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::is_a_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1726,14 +1726,14 @@ ACE_INLINE void POA_IR::ComponentDef::is_a_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::describe_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1741,14 +1741,14 @@ ACE_INLINE void POA_IR::ComponentDef::describe_interface_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::create_attribute_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1756,14 +1756,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_attribute_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::create_operation_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1771,14 +1771,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_operation_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1786,14 +1786,14 @@ ACE_INLINE void POA_IR::ComponentDef::lookup_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1801,14 +1801,14 @@ ACE_INLINE void POA_IR::ComponentDef::contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1816,14 +1816,14 @@ ACE_INLINE void POA_IR::ComponentDef::lookup_name_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1831,14 +1831,14 @@ ACE_INLINE void POA_IR::ComponentDef::describe_contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1846,14 +1846,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_module_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1861,14 +1861,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_constant_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1876,14 +1876,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_struct_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1891,14 +1891,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_union_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1906,14 +1906,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_enum_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1921,14 +1921,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_alias_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1936,14 +1936,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1951,14 +1951,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_value_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1966,14 +1966,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_value_box_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1981,14 +1981,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_exception_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1996,14 +1996,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_native_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -2011,14 +2011,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_abstract_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -2026,14 +2026,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_local_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -2041,14 +2041,14 @@ ACE_INLINE void POA_IR::ComponentDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -2056,14 +2056,14 @@ ACE_INLINE void POA_IR::ComponentDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -2071,14 +2071,14 @@ ACE_INLINE void POA_IR::ComponentDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -2086,14 +2086,14 @@ ACE_INLINE void POA_IR::ComponentDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -2101,14 +2101,14 @@ ACE_INLINE void POA_IR::ComponentDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -2116,14 +2116,14 @@ ACE_INLINE void POA_IR::ComponentDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -2131,14 +2131,14 @@ ACE_INLINE void POA_IR::ComponentDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -2146,14 +2146,14 @@ ACE_INLINE void POA_IR::ComponentDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -2161,14 +2161,14 @@ ACE_INLINE void POA_IR::ComponentDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -2176,14 +2176,14 @@ ACE_INLINE void POA_IR::ComponentDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -2191,14 +2191,14 @@ ACE_INLINE void POA_IR::ComponentDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::_get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -2206,14 +2206,14 @@ ACE_INLINE void POA_IR::ComponentDef::_get_type_skel ( req, (POA_CORBA_IDLType_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -2221,14 +2221,14 @@ ACE_INLINE void POA_IR::ComponentDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -2236,14 +2236,14 @@ ACE_INLINE void POA_IR::ComponentDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PrimaryKeyDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj; @@ -2251,14 +2251,14 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PrimaryKeyDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj; @@ -2266,14 +2266,14 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PrimaryKeyDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj; @@ -2281,14 +2281,14 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PrimaryKeyDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj; @@ -2296,14 +2296,14 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PrimaryKeyDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj; @@ -2311,14 +2311,14 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PrimaryKeyDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj; @@ -2326,14 +2326,14 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PrimaryKeyDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj; @@ -2341,14 +2341,14 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PrimaryKeyDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj; @@ -2356,14 +2356,14 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PrimaryKeyDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj; @@ -2371,14 +2371,14 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PrimaryKeyDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj; @@ -2386,14 +2386,14 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PrimaryKeyDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj; @@ -2401,14 +2401,14 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PrimaryKeyDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj; @@ -2416,14 +2416,14 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PrimaryKeyDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj; @@ -2431,14 +2431,14 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_get_result_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2446,14 +2446,14 @@ ACE_INLINE void POA_IR::FactoryDef::_get_result_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_get_result_def_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2461,14 +2461,14 @@ ACE_INLINE void POA_IR::FactoryDef::_get_result_def_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_set_result_def_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2476,14 +2476,14 @@ ACE_INLINE void POA_IR::FactoryDef::_set_result_def_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_get_params_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2491,14 +2491,14 @@ ACE_INLINE void POA_IR::FactoryDef::_get_params_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_set_params_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2506,14 +2506,14 @@ ACE_INLINE void POA_IR::FactoryDef::_set_params_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_get_mode_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2521,14 +2521,14 @@ ACE_INLINE void POA_IR::FactoryDef::_get_mode_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_set_mode_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2536,14 +2536,14 @@ ACE_INLINE void POA_IR::FactoryDef::_set_mode_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_get_contexts_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2551,14 +2551,14 @@ ACE_INLINE void POA_IR::FactoryDef::_get_contexts_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_set_contexts_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2566,14 +2566,14 @@ ACE_INLINE void POA_IR::FactoryDef::_set_contexts_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_get_exceptions_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2581,14 +2581,14 @@ ACE_INLINE void POA_IR::FactoryDef::_get_exceptions_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_set_exceptions_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2596,14 +2596,14 @@ ACE_INLINE void POA_IR::FactoryDef::_set_exceptions_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2611,14 +2611,14 @@ ACE_INLINE void POA_IR::FactoryDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2626,14 +2626,14 @@ ACE_INLINE void POA_IR::FactoryDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2641,14 +2641,14 @@ ACE_INLINE void POA_IR::FactoryDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2656,14 +2656,14 @@ ACE_INLINE void POA_IR::FactoryDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2671,14 +2671,14 @@ ACE_INLINE void POA_IR::FactoryDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2686,14 +2686,14 @@ ACE_INLINE void POA_IR::FactoryDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2701,14 +2701,14 @@ ACE_INLINE void POA_IR::FactoryDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2716,14 +2716,14 @@ ACE_INLINE void POA_IR::FactoryDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2731,14 +2731,14 @@ ACE_INLINE void POA_IR::FactoryDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2746,14 +2746,14 @@ ACE_INLINE void POA_IR::FactoryDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2761,14 +2761,14 @@ ACE_INLINE void POA_IR::FactoryDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2776,14 +2776,14 @@ ACE_INLINE void POA_IR::FactoryDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2791,14 +2791,14 @@ ACE_INLINE void POA_IR::FactoryDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_get_result_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -2806,14 +2806,14 @@ ACE_INLINE void POA_IR::FinderDef::_get_result_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_get_result_def_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -2821,14 +2821,14 @@ ACE_INLINE void POA_IR::FinderDef::_get_result_def_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_set_result_def_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -2836,14 +2836,14 @@ ACE_INLINE void POA_IR::FinderDef::_set_result_def_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_get_params_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -2851,14 +2851,14 @@ ACE_INLINE void POA_IR::FinderDef::_get_params_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_set_params_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -2866,14 +2866,14 @@ ACE_INLINE void POA_IR::FinderDef::_set_params_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_get_mode_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -2881,14 +2881,14 @@ ACE_INLINE void POA_IR::FinderDef::_get_mode_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_set_mode_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -2896,14 +2896,14 @@ ACE_INLINE void POA_IR::FinderDef::_set_mode_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_get_contexts_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -2911,14 +2911,14 @@ ACE_INLINE void POA_IR::FinderDef::_get_contexts_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_set_contexts_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -2926,14 +2926,14 @@ ACE_INLINE void POA_IR::FinderDef::_set_contexts_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_get_exceptions_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -2941,14 +2941,14 @@ ACE_INLINE void POA_IR::FinderDef::_get_exceptions_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_set_exceptions_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -2956,14 +2956,14 @@ ACE_INLINE void POA_IR::FinderDef::_set_exceptions_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -2971,14 +2971,14 @@ ACE_INLINE void POA_IR::FinderDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -2986,14 +2986,14 @@ ACE_INLINE void POA_IR::FinderDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -3001,14 +3001,14 @@ ACE_INLINE void POA_IR::FinderDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -3016,14 +3016,14 @@ ACE_INLINE void POA_IR::FinderDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -3031,14 +3031,14 @@ ACE_INLINE void POA_IR::FinderDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -3046,14 +3046,14 @@ ACE_INLINE void POA_IR::FinderDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -3061,14 +3061,14 @@ ACE_INLINE void POA_IR::FinderDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -3076,14 +3076,14 @@ ACE_INLINE void POA_IR::FinderDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -3091,14 +3091,14 @@ ACE_INLINE void POA_IR::FinderDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -3106,14 +3106,14 @@ ACE_INLINE void POA_IR::FinderDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -3121,14 +3121,14 @@ ACE_INLINE void POA_IR::FinderDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -3136,14 +3136,14 @@ ACE_INLINE void POA_IR::FinderDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -3151,14 +3151,14 @@ ACE_INLINE void POA_IR::FinderDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::_get_base_interfaces_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3166,14 +3166,14 @@ ACE_INLINE void POA_IR::HomeDef::_get_base_interfaces_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::_set_base_interfaces_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3181,14 +3181,14 @@ ACE_INLINE void POA_IR::HomeDef::_set_base_interfaces_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::is_a_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3196,14 +3196,14 @@ ACE_INLINE void POA_IR::HomeDef::is_a_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::describe_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3211,14 +3211,14 @@ ACE_INLINE void POA_IR::HomeDef::describe_interface_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::create_attribute_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3226,14 +3226,14 @@ ACE_INLINE void POA_IR::HomeDef::create_attribute_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::create_operation_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3241,14 +3241,14 @@ ACE_INLINE void POA_IR::HomeDef::create_operation_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3256,14 +3256,14 @@ ACE_INLINE void POA_IR::HomeDef::lookup_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3271,14 +3271,14 @@ ACE_INLINE void POA_IR::HomeDef::contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3286,14 +3286,14 @@ ACE_INLINE void POA_IR::HomeDef::lookup_name_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3301,14 +3301,14 @@ ACE_INLINE void POA_IR::HomeDef::describe_contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3316,14 +3316,14 @@ ACE_INLINE void POA_IR::HomeDef::create_module_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3331,14 +3331,14 @@ ACE_INLINE void POA_IR::HomeDef::create_constant_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3346,14 +3346,14 @@ ACE_INLINE void POA_IR::HomeDef::create_struct_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3361,14 +3361,14 @@ ACE_INLINE void POA_IR::HomeDef::create_union_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3376,14 +3376,14 @@ ACE_INLINE void POA_IR::HomeDef::create_enum_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3391,14 +3391,14 @@ ACE_INLINE void POA_IR::HomeDef::create_alias_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3406,14 +3406,14 @@ ACE_INLINE void POA_IR::HomeDef::create_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3421,14 +3421,14 @@ ACE_INLINE void POA_IR::HomeDef::create_value_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3436,14 +3436,14 @@ ACE_INLINE void POA_IR::HomeDef::create_value_box_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3451,14 +3451,14 @@ ACE_INLINE void POA_IR::HomeDef::create_exception_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3466,14 +3466,14 @@ ACE_INLINE void POA_IR::HomeDef::create_native_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3481,14 +3481,14 @@ ACE_INLINE void POA_IR::HomeDef::create_abstract_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3496,14 +3496,14 @@ ACE_INLINE void POA_IR::HomeDef::create_local_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3511,14 +3511,14 @@ ACE_INLINE void POA_IR::HomeDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3526,14 +3526,14 @@ ACE_INLINE void POA_IR::HomeDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3541,14 +3541,14 @@ ACE_INLINE void POA_IR::HomeDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3556,14 +3556,14 @@ ACE_INLINE void POA_IR::HomeDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3571,14 +3571,14 @@ ACE_INLINE void POA_IR::HomeDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3586,14 +3586,14 @@ ACE_INLINE void POA_IR::HomeDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3601,14 +3601,14 @@ ACE_INLINE void POA_IR::HomeDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3616,14 +3616,14 @@ ACE_INLINE void POA_IR::HomeDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3631,14 +3631,14 @@ ACE_INLINE void POA_IR::HomeDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3646,14 +3646,14 @@ ACE_INLINE void POA_IR::HomeDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3661,14 +3661,14 @@ ACE_INLINE void POA_IR::HomeDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::_get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3676,14 +3676,14 @@ ACE_INLINE void POA_IR::HomeDef::_get_type_skel ( req, (POA_CORBA_IDLType_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3691,14 +3691,14 @@ ACE_INLINE void POA_IR::HomeDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3706,6 +3706,6 @@ ACE_INLINE void POA_IR::HomeDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.h b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.h index 500e9839c58..cc915fc6a37 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.h +++ b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.h @@ -64,7 +64,7 @@ TAO_NAMESPACE POA_IR // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); IR::ComponentDef_ptr create_component ( const char * id, @@ -72,7 +72,7 @@ TAO_NAMESPACE POA_IR const char * version, IR::ComponentDef_ptr base_component, const CORBA_InterfaceDefSeq & supports_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -85,7 +85,7 @@ TAO_NAMESPACE POA_IR IR::HomeDef_ptr base_home, IR::ComponentDef_ptr managed_component, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -93,7 +93,7 @@ TAO_NAMESPACE POA_IR CORBA_Contained_ptr lookup_id ( const char * search_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -101,7 +101,7 @@ TAO_NAMESPACE POA_IR CORBA::TypeCode_ptr get_canonical_typecode ( CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -109,7 +109,7 @@ TAO_NAMESPACE POA_IR CORBA_PrimitiveDef_ptr get_primitive ( CORBA::PrimitiveKind kind - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -117,7 +117,7 @@ TAO_NAMESPACE POA_IR CORBA_StringDef_ptr create_string ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -125,7 +125,7 @@ TAO_NAMESPACE POA_IR CORBA_WstringDef_ptr create_wstring ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -134,7 +134,7 @@ TAO_NAMESPACE POA_IR CORBA_SequenceDef_ptr create_sequence ( CORBA::ULong bound, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -143,7 +143,7 @@ TAO_NAMESPACE POA_IR CORBA_ArrayDef_ptr create_array ( CORBA::ULong length, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -152,7 +152,7 @@ TAO_NAMESPACE POA_IR CORBA_FixedDef_ptr create_fixed ( CORBA::UShort digits, CORBA::Short scale - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -160,7 +160,7 @@ TAO_NAMESPACE POA_IR CORBA_Contained_ptr lookup ( const char * search_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -169,7 +169,7 @@ TAO_NAMESPACE POA_IR CORBA_ContainedSeq * contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -180,7 +180,7 @@ TAO_NAMESPACE POA_IR CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -190,7 +190,7 @@ TAO_NAMESPACE POA_IR CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -200,7 +200,7 @@ TAO_NAMESPACE POA_IR const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -212,7 +212,7 @@ TAO_NAMESPACE POA_IR const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -223,7 +223,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -235,7 +235,7 @@ TAO_NAMESPACE POA_IR const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -246,7 +246,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -257,7 +257,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -268,7 +268,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -285,7 +285,7 @@ TAO_NAMESPACE POA_IR const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -296,7 +296,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -307,7 +307,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -317,7 +317,7 @@ TAO_NAMESPACE POA_IR const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -328,7 +328,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -339,21 +339,21 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -399,17 +399,17 @@ TAO_NAMESPACE POA_IR // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA_InterfaceDef_ptr interface_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -417,14 +417,14 @@ TAO_NAMESPACE POA_IR void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -432,14 +432,14 @@ TAO_NAMESPACE POA_IR void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -447,35 +447,35 @@ TAO_NAMESPACE POA_IR void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -485,21 +485,21 @@ TAO_NAMESPACE POA_IR CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -545,24 +545,24 @@ TAO_NAMESPACE POA_IR // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA_InterfaceDef_ptr interface_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::Boolean is_multiple ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -570,14 +570,14 @@ TAO_NAMESPACE POA_IR void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -585,14 +585,14 @@ TAO_NAMESPACE POA_IR void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -600,35 +600,35 @@ TAO_NAMESPACE POA_IR void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -638,21 +638,21 @@ TAO_NAMESPACE POA_IR CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -698,25 +698,25 @@ TAO_NAMESPACE POA_IR // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::Boolean is_a ( const char * event_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_ValueDef_ptr event ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -724,14 +724,14 @@ TAO_NAMESPACE POA_IR void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -739,14 +739,14 @@ TAO_NAMESPACE POA_IR void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -754,35 +754,35 @@ TAO_NAMESPACE POA_IR void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -792,21 +792,21 @@ TAO_NAMESPACE POA_IR CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -852,25 +852,25 @@ TAO_NAMESPACE POA_IR // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::Boolean is_a ( const char * event_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_ValueDef_ptr event ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -878,14 +878,14 @@ TAO_NAMESPACE POA_IR void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -893,14 +893,14 @@ TAO_NAMESPACE POA_IR void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -908,35 +908,35 @@ TAO_NAMESPACE POA_IR void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -946,21 +946,21 @@ TAO_NAMESPACE POA_IR CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1006,25 +1006,25 @@ TAO_NAMESPACE POA_IR // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::Boolean is_a ( const char * event_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_ValueDef_ptr event ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1032,14 +1032,14 @@ TAO_NAMESPACE POA_IR void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1047,14 +1047,14 @@ TAO_NAMESPACE POA_IR void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1062,35 +1062,35 @@ TAO_NAMESPACE POA_IR void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1100,21 +1100,21 @@ TAO_NAMESPACE POA_IR CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1160,25 +1160,25 @@ TAO_NAMESPACE POA_IR // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::Boolean is_a ( const char * event_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_ValueDef_ptr event ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1186,14 +1186,14 @@ TAO_NAMESPACE POA_IR void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1201,14 +1201,14 @@ TAO_NAMESPACE POA_IR void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1216,35 +1216,35 @@ TAO_NAMESPACE POA_IR void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1254,21 +1254,21 @@ TAO_NAMESPACE POA_IR CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1314,10 +1314,10 @@ TAO_NAMESPACE POA_IR // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA_InterfaceDefSeq * supported_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1325,56 +1325,56 @@ TAO_NAMESPACE POA_IR void supported_interfaces ( const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); IR::ComponentDef_ptr base_component ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); IR::ProvidesDefSeq * provides_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); IR::UsesDefSeq * uses_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); IR::EmitsDefSeq * emits_events ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); IR::PublishesDefSeq * publishes_events ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); IR::ConsumesDefSeq * consumes_events ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::Boolean is_basic ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1385,7 +1385,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, CORBA_InterfaceDef_ptr interface_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1397,7 +1397,7 @@ TAO_NAMESPACE POA_IR const char * version, CORBA_InterfaceDef_ptr interface_type, CORBA::Boolean is_multiple - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1408,7 +1408,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1419,7 +1419,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1430,14 +1430,14 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_InterfaceDefSeq * base_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1445,7 +1445,7 @@ TAO_NAMESPACE POA_IR void base_interfaces ( const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1453,14 +1453,14 @@ TAO_NAMESPACE POA_IR CORBA::Boolean is_a ( const char * interface_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_InterfaceDef::FullInterfaceDescription * describe_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1472,7 +1472,7 @@ TAO_NAMESPACE POA_IR const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1487,7 +1487,7 @@ TAO_NAMESPACE POA_IR const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1495,7 +1495,7 @@ TAO_NAMESPACE POA_IR CORBA_Contained_ptr lookup ( const char * search_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1504,7 +1504,7 @@ TAO_NAMESPACE POA_IR CORBA_ContainedSeq * contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1515,7 +1515,7 @@ TAO_NAMESPACE POA_IR CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1525,7 +1525,7 @@ TAO_NAMESPACE POA_IR CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1535,7 +1535,7 @@ TAO_NAMESPACE POA_IR const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1547,7 +1547,7 @@ TAO_NAMESPACE POA_IR const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1558,7 +1558,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1570,7 +1570,7 @@ TAO_NAMESPACE POA_IR const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1581,7 +1581,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1592,7 +1592,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1603,7 +1603,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1620,7 +1620,7 @@ TAO_NAMESPACE POA_IR const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1631,7 +1631,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1642,7 +1642,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1652,7 +1652,7 @@ TAO_NAMESPACE POA_IR const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1663,7 +1663,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1674,14 +1674,14 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1689,14 +1689,14 @@ TAO_NAMESPACE POA_IR void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1704,14 +1704,14 @@ TAO_NAMESPACE POA_IR void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1719,35 +1719,35 @@ TAO_NAMESPACE POA_IR void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1757,28 +1757,28 @@ TAO_NAMESPACE POA_IR CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1824,25 +1824,25 @@ TAO_NAMESPACE POA_IR // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::Boolean is_a ( const char * primary_key_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_ValueDef_ptr primary_key ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1850,14 +1850,14 @@ TAO_NAMESPACE POA_IR void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1865,14 +1865,14 @@ TAO_NAMESPACE POA_IR void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1880,35 +1880,35 @@ TAO_NAMESPACE POA_IR void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1918,21 +1918,21 @@ TAO_NAMESPACE POA_IR CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1978,17 +1978,17 @@ TAO_NAMESPACE POA_IR // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::TypeCode_ptr result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_IDLType_ptr result_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1996,14 +1996,14 @@ TAO_NAMESPACE POA_IR void result_def ( CORBA_IDLType_ptr result_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_ParDescriptionSeq * params ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2011,14 +2011,14 @@ TAO_NAMESPACE POA_IR void params ( const CORBA_ParDescriptionSeq & params - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::OperationMode mode ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2026,14 +2026,14 @@ TAO_NAMESPACE POA_IR void mode ( CORBA::OperationMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_ContextIdSeq * contexts ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2041,14 +2041,14 @@ TAO_NAMESPACE POA_IR void contexts ( const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_ExceptionDefSeq * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2056,14 +2056,14 @@ TAO_NAMESPACE POA_IR void exceptions ( const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2071,14 +2071,14 @@ TAO_NAMESPACE POA_IR void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2086,14 +2086,14 @@ TAO_NAMESPACE POA_IR void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2101,35 +2101,35 @@ TAO_NAMESPACE POA_IR void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2139,21 +2139,21 @@ TAO_NAMESPACE POA_IR CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2199,17 +2199,17 @@ TAO_NAMESPACE POA_IR // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::TypeCode_ptr result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_IDLType_ptr result_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2217,14 +2217,14 @@ TAO_NAMESPACE POA_IR void result_def ( CORBA_IDLType_ptr result_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_ParDescriptionSeq * params ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2232,14 +2232,14 @@ TAO_NAMESPACE POA_IR void params ( const CORBA_ParDescriptionSeq & params - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::OperationMode mode ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2247,14 +2247,14 @@ TAO_NAMESPACE POA_IR void mode ( CORBA::OperationMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_ContextIdSeq * contexts ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2262,14 +2262,14 @@ TAO_NAMESPACE POA_IR void contexts ( const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_ExceptionDefSeq * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2277,14 +2277,14 @@ TAO_NAMESPACE POA_IR void exceptions ( const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2292,14 +2292,14 @@ TAO_NAMESPACE POA_IR void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2307,14 +2307,14 @@ TAO_NAMESPACE POA_IR void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2322,35 +2322,35 @@ TAO_NAMESPACE POA_IR void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2360,21 +2360,21 @@ TAO_NAMESPACE POA_IR CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2420,45 +2420,45 @@ TAO_NAMESPACE POA_IR // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); IR::HomeDef_ptr base_home ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); IR::ComponentDef_ptr managed_component ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); IR::PrimaryKeyDef_ptr primary_key ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); IR::FactoryDefSeq * factories ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); IR::FinderDefSeq * finders ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::Boolean is_basic ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2469,7 +2469,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2481,7 +2481,7 @@ TAO_NAMESPACE POA_IR const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2493,14 +2493,14 @@ TAO_NAMESPACE POA_IR const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_InterfaceDefSeq * base_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2508,7 +2508,7 @@ TAO_NAMESPACE POA_IR void base_interfaces ( const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2516,14 +2516,14 @@ TAO_NAMESPACE POA_IR CORBA::Boolean is_a ( const char * interface_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_InterfaceDef::FullInterfaceDescription * describe_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2535,7 +2535,7 @@ TAO_NAMESPACE POA_IR const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2550,7 +2550,7 @@ TAO_NAMESPACE POA_IR const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2558,7 +2558,7 @@ TAO_NAMESPACE POA_IR CORBA_Contained_ptr lookup ( const char * search_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2567,7 +2567,7 @@ TAO_NAMESPACE POA_IR CORBA_ContainedSeq * contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2578,7 +2578,7 @@ TAO_NAMESPACE POA_IR CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2588,7 +2588,7 @@ TAO_NAMESPACE POA_IR CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2598,7 +2598,7 @@ TAO_NAMESPACE POA_IR const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2610,7 +2610,7 @@ TAO_NAMESPACE POA_IR const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2621,7 +2621,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2633,7 +2633,7 @@ TAO_NAMESPACE POA_IR const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2644,7 +2644,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2655,7 +2655,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2666,7 +2666,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2683,7 +2683,7 @@ TAO_NAMESPACE POA_IR const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2694,7 +2694,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2705,7 +2705,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2715,7 +2715,7 @@ TAO_NAMESPACE POA_IR const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2726,7 +2726,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2737,14 +2737,14 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2752,14 +2752,14 @@ TAO_NAMESPACE POA_IR void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2767,14 +2767,14 @@ TAO_NAMESPACE POA_IR void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2782,35 +2782,35 @@ TAO_NAMESPACE POA_IR void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2820,28 +2820,28 @@ TAO_NAMESPACE POA_IR CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.i b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.i index 6742e31f286..4b3ff1655a0 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.i +++ b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.i @@ -90,12 +90,12 @@ POA_IR::ComponentRepository_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_IR::ComponentRepository_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::ComponentRepository_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->ComponentRepository::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->ComponentRepository::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE @@ -105,7 +105,7 @@ IR::ComponentDef_ptr POA_IR::ComponentRepository_tie::create_component ( const char * version, IR::ComponentDef_ptr base_component, const CORBA_InterfaceDefSeq & supports_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -117,7 +117,7 @@ id, version, base_component, supports_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -129,7 +129,7 @@ IR::HomeDef_ptr POA_IR::ComponentRepository_tie::create_home ( IR::HomeDef_ptr base_home, IR::ComponentDef_ptr managed_component, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -142,14 +142,14 @@ id, base_home, managed_component, primary_key - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained_ptr POA_IR::ComponentRepository_tie::lookup_id ( const char * search_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -157,14 +157,14 @@ CORBA_Contained_ptr POA_IR::ComponentRepository_tie::lookup_id ( { return this->ptr_->lookup_id ( search_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::TypeCode_ptr POA_IR::ComponentRepository_tie::get_canonical_typecode ( CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -172,14 +172,14 @@ CORBA::TypeCode_ptr POA_IR::ComponentRepository_tie::get_canonical_typecode { return this->ptr_->get_canonical_typecode ( tc - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_PrimitiveDef_ptr POA_IR::ComponentRepository_tie::get_primitive ( CORBA::PrimitiveKind kind - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -187,14 +187,14 @@ CORBA_PrimitiveDef_ptr POA_IR::ComponentRepository_tie::get_primitive ( { return this->ptr_->get_primitive ( kind - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_StringDef_ptr POA_IR::ComponentRepository_tie::create_string ( CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -202,14 +202,14 @@ CORBA_StringDef_ptr POA_IR::ComponentRepository_tie::create_string ( { return this->ptr_->create_string ( bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_WstringDef_ptr POA_IR::ComponentRepository_tie::create_wstring ( CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -217,7 +217,7 @@ CORBA_WstringDef_ptr POA_IR::ComponentRepository_tie::create_wstring ( { return this->ptr_->create_wstring ( bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -225,7 +225,7 @@ template ACE_INLINE CORBA_SequenceDef_ptr POA_IR::ComponentRepository_tie::create_sequence ( CORBA::ULong bound, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -234,7 +234,7 @@ CORBA_SequenceDef_ptr POA_IR::ComponentRepository_tie::create_sequence ( return this->ptr_->create_sequence ( bound, element_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -242,7 +242,7 @@ template ACE_INLINE CORBA_ArrayDef_ptr POA_IR::ComponentRepository_tie::create_array ( CORBA::ULong length, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -251,7 +251,7 @@ CORBA_ArrayDef_ptr POA_IR::ComponentRepository_tie::create_array ( return this->ptr_->create_array ( length, element_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -259,7 +259,7 @@ template ACE_INLINE CORBA_FixedDef_ptr POA_IR::ComponentRepository_tie::create_fixed ( CORBA::UShort digits, CORBA::Short scale - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -268,14 +268,14 @@ CORBA_FixedDef_ptr POA_IR::ComponentRepository_tie::create_fixed ( return this->ptr_->create_fixed ( digits, scale - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained_ptr POA_IR::ComponentRepository_tie::lookup ( const char * search_name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -283,7 +283,7 @@ CORBA_Contained_ptr POA_IR::ComponentRepository_tie::lookup ( { return this->ptr_->lookup ( search_name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -291,7 +291,7 @@ template ACE_INLINE CORBA_ContainedSeq * POA_IR::ComponentRepository_tie::contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -300,7 +300,7 @@ CORBA_ContainedSeq * POA_IR::ComponentRepository_tie::contents ( return this->ptr_->contents ( limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -310,7 +310,7 @@ CORBA_ContainedSeq * POA_IR::ComponentRepository_tie::lookup_name ( CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -321,7 +321,7 @@ search_name, levels_to_search, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -330,7 +330,7 @@ CORBA_Container::DescriptionSeq * POA_IR::ComponentRepository_tie::describe_c CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -340,7 +340,7 @@ CORBA_Container::DescriptionSeq * POA_IR::ComponentRepository_tie::describe_c limit_type, exclude_inherited, max_returned_objs - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -349,7 +349,7 @@ CORBA_ModuleDef_ptr POA_IR::ComponentRepository_tie::create_module ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -359,7 +359,7 @@ CORBA_ModuleDef_ptr POA_IR::ComponentRepository_tie::create_module ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -370,7 +370,7 @@ CORBA_ConstantDef_ptr POA_IR::ComponentRepository_tie::create_constant ( const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -382,7 +382,7 @@ id, version, type, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -392,7 +392,7 @@ CORBA_StructDef_ptr POA_IR::ComponentRepository_tie::create_struct ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -403,7 +403,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -414,7 +414,7 @@ CORBA_UnionDef_ptr POA_IR::ComponentRepository_tie::create_union ( const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -426,7 +426,7 @@ id, version, discriminator_type, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -436,7 +436,7 @@ CORBA_EnumDef_ptr POA_IR::ComponentRepository_tie::create_enum ( const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -447,7 +447,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -457,7 +457,7 @@ CORBA_AliasDef_ptr POA_IR::ComponentRepository_tie::create_alias ( const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -468,7 +468,7 @@ id, name, version, original_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -478,7 +478,7 @@ CORBA_InterfaceDef_ptr POA_IR::ComponentRepository_tie::create_interface ( const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -489,7 +489,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -505,7 +505,7 @@ CORBA_ValueDef_ptr POA_IR::ComponentRepository_tie::create_value ( const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -522,7 +522,7 @@ id, abstract_base_values, supported_interfaces, initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -532,7 +532,7 @@ CORBA_ValueBoxDef_ptr POA_IR::ComponentRepository_tie::create_value_box ( const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -543,7 +543,7 @@ id, name, version, original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -553,7 +553,7 @@ CORBA_ExceptionDef_ptr POA_IR::ComponentRepository_tie::create_exception ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -564,7 +564,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -573,7 +573,7 @@ CORBA_NativeDef_ptr POA_IR::ComponentRepository_tie::create_native ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -583,7 +583,7 @@ CORBA_NativeDef_ptr POA_IR::ComponentRepository_tie::create_native ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -593,7 +593,7 @@ CORBA_AbstractInterfaceDef_ptr POA_IR::ComponentRepository_tie::create_abstra const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -604,7 +604,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -614,7 +614,7 @@ CORBA_LocalInterfaceDef_ptr POA_IR::ComponentRepository_tie::create_local_int const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -625,33 +625,33 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::DefinitionKind POA_IR::ComponentRepository_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::ComponentRepository_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -724,44 +724,44 @@ POA_IR::ProvidesDef_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_IR::ProvidesDef_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::ProvidesDef_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->ProvidesDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->ProvidesDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE CORBA_InterfaceDef_ptr POA_IR::ProvidesDef_tie::interface_type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->interface_type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::ProvidesDef_tie::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::ProvidesDef_tie::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -769,27 +769,27 @@ void POA_IR::ProvidesDef_tie::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::ProvidesDef_tie::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::ProvidesDef_tie::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -797,27 +797,27 @@ void POA_IR::ProvidesDef_tie::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::ProvidesDef_tie::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::ProvidesDef_tie::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -825,59 +825,59 @@ void POA_IR::ProvidesDef_tie::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Container_ptr POA_IR::ProvidesDef_tie::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::ProvidesDef_tie::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Repository_ptr POA_IR::ProvidesDef_tie::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained::Description * POA_IR::ProvidesDef_tie::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -886,7 +886,7 @@ void POA_IR::ProvidesDef_tie::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -896,33 +896,33 @@ void POA_IR::ProvidesDef_tie::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::DefinitionKind POA_IR::ProvidesDef_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::ProvidesDef_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -995,57 +995,57 @@ POA_IR::UsesDef_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_IR::UsesDef_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::UsesDef_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->UsesDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->UsesDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE CORBA_InterfaceDef_ptr POA_IR::UsesDef_tie::interface_type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->interface_type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA::Boolean POA_IR::UsesDef_tie::is_multiple ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->is_multiple ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::UsesDef_tie::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::UsesDef_tie::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1053,27 +1053,27 @@ void POA_IR::UsesDef_tie::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::UsesDef_tie::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::UsesDef_tie::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1081,27 +1081,27 @@ void POA_IR::UsesDef_tie::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::UsesDef_tie::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::UsesDef_tie::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1109,59 +1109,59 @@ void POA_IR::UsesDef_tie::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Container_ptr POA_IR::UsesDef_tie::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::UsesDef_tie::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Repository_ptr POA_IR::UsesDef_tie::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained::Description * POA_IR::UsesDef_tie::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -1170,7 +1170,7 @@ void POA_IR::UsesDef_tie::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1180,33 +1180,33 @@ void POA_IR::UsesDef_tie::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::DefinitionKind POA_IR::UsesDef_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::UsesDef_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -1279,18 +1279,18 @@ POA_IR::EventDef_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_IR::EventDef_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::EventDef_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->EventDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->EventDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE CORBA::Boolean POA_IR::EventDef_tie::is_a ( const char * event_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1298,40 +1298,40 @@ CORBA::Boolean POA_IR::EventDef_tie::is_a ( { return this->ptr_->is_a ( event_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_ValueDef_ptr POA_IR::EventDef_tie::event ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->event ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::EventDef_tie::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::EventDef_tie::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1339,27 +1339,27 @@ void POA_IR::EventDef_tie::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::EventDef_tie::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::EventDef_tie::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1367,27 +1367,27 @@ void POA_IR::EventDef_tie::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::EventDef_tie::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::EventDef_tie::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1395,59 +1395,59 @@ void POA_IR::EventDef_tie::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Container_ptr POA_IR::EventDef_tie::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::EventDef_tie::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Repository_ptr POA_IR::EventDef_tie::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained::Description * POA_IR::EventDef_tie::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -1456,7 +1456,7 @@ void POA_IR::EventDef_tie::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1466,33 +1466,33 @@ void POA_IR::EventDef_tie::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::DefinitionKind POA_IR::EventDef_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::EventDef_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -1565,18 +1565,18 @@ POA_IR::EmitsDef_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_IR::EmitsDef_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::EmitsDef_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->EmitsDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->EmitsDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE CORBA::Boolean POA_IR::EmitsDef_tie::is_a ( const char * event_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1584,40 +1584,40 @@ CORBA::Boolean POA_IR::EmitsDef_tie::is_a ( { return this->ptr_->is_a ( event_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_ValueDef_ptr POA_IR::EmitsDef_tie::event ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->event ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::EmitsDef_tie::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::EmitsDef_tie::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1625,27 +1625,27 @@ void POA_IR::EmitsDef_tie::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::EmitsDef_tie::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::EmitsDef_tie::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1653,27 +1653,27 @@ void POA_IR::EmitsDef_tie::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::EmitsDef_tie::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::EmitsDef_tie::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1681,59 +1681,59 @@ void POA_IR::EmitsDef_tie::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Container_ptr POA_IR::EmitsDef_tie::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::EmitsDef_tie::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Repository_ptr POA_IR::EmitsDef_tie::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained::Description * POA_IR::EmitsDef_tie::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -1742,7 +1742,7 @@ void POA_IR::EmitsDef_tie::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1752,33 +1752,33 @@ void POA_IR::EmitsDef_tie::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::DefinitionKind POA_IR::EmitsDef_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::EmitsDef_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -1851,18 +1851,18 @@ POA_IR::PublishesDef_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_IR::PublishesDef_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::PublishesDef_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->PublishesDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->PublishesDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE CORBA::Boolean POA_IR::PublishesDef_tie::is_a ( const char * event_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1870,40 +1870,40 @@ CORBA::Boolean POA_IR::PublishesDef_tie::is_a ( { return this->ptr_->is_a ( event_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_ValueDef_ptr POA_IR::PublishesDef_tie::event ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->event ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::PublishesDef_tie::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::PublishesDef_tie::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1911,27 +1911,27 @@ void POA_IR::PublishesDef_tie::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::PublishesDef_tie::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::PublishesDef_tie::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1939,27 +1939,27 @@ void POA_IR::PublishesDef_tie::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::PublishesDef_tie::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::PublishesDef_tie::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1967,59 +1967,59 @@ void POA_IR::PublishesDef_tie::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Container_ptr POA_IR::PublishesDef_tie::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::PublishesDef_tie::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Repository_ptr POA_IR::PublishesDef_tie::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained::Description * POA_IR::PublishesDef_tie::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -2028,7 +2028,7 @@ void POA_IR::PublishesDef_tie::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2038,33 +2038,33 @@ void POA_IR::PublishesDef_tie::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::DefinitionKind POA_IR::PublishesDef_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::PublishesDef_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -2137,18 +2137,18 @@ POA_IR::ConsumesDef_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_IR::ConsumesDef_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::ConsumesDef_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->ConsumesDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->ConsumesDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE CORBA::Boolean POA_IR::ConsumesDef_tie::is_a ( const char * event_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2156,40 +2156,40 @@ CORBA::Boolean POA_IR::ConsumesDef_tie::is_a ( { return this->ptr_->is_a ( event_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_ValueDef_ptr POA_IR::ConsumesDef_tie::event ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->event ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::ConsumesDef_tie::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::ConsumesDef_tie::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2197,27 +2197,27 @@ void POA_IR::ConsumesDef_tie::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::ConsumesDef_tie::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::ConsumesDef_tie::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2225,27 +2225,27 @@ void POA_IR::ConsumesDef_tie::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::ConsumesDef_tie::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::ConsumesDef_tie::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2253,59 +2253,59 @@ void POA_IR::ConsumesDef_tie::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Container_ptr POA_IR::ConsumesDef_tie::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::ConsumesDef_tie::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Repository_ptr POA_IR::ConsumesDef_tie::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained::Description * POA_IR::ConsumesDef_tie::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -2314,7 +2314,7 @@ void POA_IR::ConsumesDef_tie::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2324,33 +2324,33 @@ void POA_IR::ConsumesDef_tie::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::DefinitionKind POA_IR::ConsumesDef_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::ConsumesDef_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -2423,31 +2423,31 @@ POA_IR::ComponentDef_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_IR::ComponentDef_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::ComponentDef_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->ComponentDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->ComponentDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE CORBA_InterfaceDefSeq * POA_IR::ComponentDef_tie::supported_interfaces ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->supported_interfaces ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::ComponentDef_tie::supported_interfaces ( const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2455,98 +2455,98 @@ void POA_IR::ComponentDef_tie::supported_interfaces ( { this->ptr_->supported_interfaces ( supported_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE IR::ComponentDef_ptr POA_IR::ComponentDef_tie::base_component ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->base_component ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE IR::ProvidesDefSeq * POA_IR::ComponentDef_tie::provides_interfaces ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->provides_interfaces ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE IR::UsesDefSeq * POA_IR::ComponentDef_tie::uses_interfaces ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->uses_interfaces ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE IR::EmitsDefSeq * POA_IR::ComponentDef_tie::emits_events ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->emits_events ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE IR::PublishesDefSeq * POA_IR::ComponentDef_tie::publishes_events ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->publishes_events ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE IR::ConsumesDefSeq * POA_IR::ComponentDef_tie::consumes_events ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->consumes_events ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA::Boolean POA_IR::ComponentDef_tie::is_basic ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->is_basic ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -2556,7 +2556,7 @@ IR::ProvidesDef_ptr POA_IR::ComponentDef_tie::create_provides ( const char * name, const char * version, CORBA_InterfaceDef_ptr interface_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2567,7 +2567,7 @@ id, name, version, interface_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2578,7 +2578,7 @@ IR::UsesDef_ptr POA_IR::ComponentDef_tie::create_uses ( const char * version, CORBA_InterfaceDef_ptr interface_type, CORBA::Boolean is_multiple - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2590,7 +2590,7 @@ id, version, interface_type, is_multiple - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2600,7 +2600,7 @@ IR::EmitsDef_ptr POA_IR::ComponentDef_tie::create_emits ( const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2611,7 +2611,7 @@ id, name, version, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2621,7 +2621,7 @@ IR::PublishesDef_ptr POA_IR::ComponentDef_tie::create_publishes ( const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2632,7 +2632,7 @@ id, name, version, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2642,7 +2642,7 @@ IR::ConsumesDef_ptr POA_IR::ComponentDef_tie::create_consumes ( const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2653,27 +2653,27 @@ id, name, version, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_InterfaceDefSeq * POA_IR::ComponentDef_tie::base_interfaces ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->base_interfaces ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::ComponentDef_tie::base_interfaces ( const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2681,14 +2681,14 @@ void POA_IR::ComponentDef_tie::base_interfaces ( { this->ptr_->base_interfaces ( base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::Boolean POA_IR::ComponentDef_tie::is_a ( const char * interface_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2696,20 +2696,20 @@ CORBA::Boolean POA_IR::ComponentDef_tie::is_a ( { return this->ptr_->is_a ( interface_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_InterfaceDef::FullInterfaceDescription * POA_IR::ComponentDef_tie::describe_interface ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe_interface ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -2720,7 +2720,7 @@ CORBA_AttributeDef_ptr POA_IR::ComponentDef_tie::create_attribute ( const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2732,7 +2732,7 @@ id, version, type, mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2746,7 +2746,7 @@ CORBA_OperationDef_ptr POA_IR::ComponentDef_tie::create_operation ( const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2761,14 +2761,14 @@ id, params, exceptions, contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained_ptr POA_IR::ComponentDef_tie::lookup ( const char * search_name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2776,7 +2776,7 @@ CORBA_Contained_ptr POA_IR::ComponentDef_tie::lookup ( { return this->ptr_->lookup ( search_name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2784,7 +2784,7 @@ template ACE_INLINE CORBA_ContainedSeq * POA_IR::ComponentDef_tie::contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2793,7 +2793,7 @@ CORBA_ContainedSeq * POA_IR::ComponentDef_tie::contents ( return this->ptr_->contents ( limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2803,7 +2803,7 @@ CORBA_ContainedSeq * POA_IR::ComponentDef_tie::lookup_name ( CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2814,7 +2814,7 @@ search_name, levels_to_search, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2823,7 +2823,7 @@ CORBA_Container::DescriptionSeq * POA_IR::ComponentDef_tie::describe_contents CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2833,7 +2833,7 @@ CORBA_Container::DescriptionSeq * POA_IR::ComponentDef_tie::describe_contents limit_type, exclude_inherited, max_returned_objs - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2842,7 +2842,7 @@ CORBA_ModuleDef_ptr POA_IR::ComponentDef_tie::create_module ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2852,7 +2852,7 @@ CORBA_ModuleDef_ptr POA_IR::ComponentDef_tie::create_module ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2863,7 +2863,7 @@ CORBA_ConstantDef_ptr POA_IR::ComponentDef_tie::create_constant ( const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2875,7 +2875,7 @@ id, version, type, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2885,7 +2885,7 @@ CORBA_StructDef_ptr POA_IR::ComponentDef_tie::create_struct ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2896,7 +2896,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2907,7 +2907,7 @@ CORBA_UnionDef_ptr POA_IR::ComponentDef_tie::create_union ( const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2919,7 +2919,7 @@ id, version, discriminator_type, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2929,7 +2929,7 @@ CORBA_EnumDef_ptr POA_IR::ComponentDef_tie::create_enum ( const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2940,7 +2940,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2950,7 +2950,7 @@ CORBA_AliasDef_ptr POA_IR::ComponentDef_tie::create_alias ( const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2961,7 +2961,7 @@ id, name, version, original_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2971,7 +2971,7 @@ CORBA_InterfaceDef_ptr POA_IR::ComponentDef_tie::create_interface ( const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2982,7 +2982,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2998,7 +2998,7 @@ CORBA_ValueDef_ptr POA_IR::ComponentDef_tie::create_value ( const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3015,7 +3015,7 @@ id, abstract_base_values, supported_interfaces, initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -3025,7 +3025,7 @@ CORBA_ValueBoxDef_ptr POA_IR::ComponentDef_tie::create_value_box ( const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3036,7 +3036,7 @@ id, name, version, original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -3046,7 +3046,7 @@ CORBA_ExceptionDef_ptr POA_IR::ComponentDef_tie::create_exception ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3057,7 +3057,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -3066,7 +3066,7 @@ CORBA_NativeDef_ptr POA_IR::ComponentDef_tie::create_native ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3076,7 +3076,7 @@ CORBA_NativeDef_ptr POA_IR::ComponentDef_tie::create_native ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -3086,7 +3086,7 @@ CORBA_AbstractInterfaceDef_ptr POA_IR::ComponentDef_tie::create_abstract_inte const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3097,7 +3097,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -3107,7 +3107,7 @@ CORBA_LocalInterfaceDef_ptr POA_IR::ComponentDef_tie::create_local_interface const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3118,27 +3118,27 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::ComponentDef_tie::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::ComponentDef_tie::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3146,27 +3146,27 @@ void POA_IR::ComponentDef_tie::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::ComponentDef_tie::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::ComponentDef_tie::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3174,27 +3174,27 @@ void POA_IR::ComponentDef_tie::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::ComponentDef_tie::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::ComponentDef_tie::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3202,59 +3202,59 @@ void POA_IR::ComponentDef_tie::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Container_ptr POA_IR::ComponentDef_tie::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::ComponentDef_tie::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Repository_ptr POA_IR::ComponentDef_tie::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained::Description * POA_IR::ComponentDef_tie::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -3263,7 +3263,7 @@ void POA_IR::ComponentDef_tie::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3273,46 +3273,46 @@ void POA_IR::ComponentDef_tie::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::TypeCode_ptr POA_IR::ComponentDef_tie::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA::DefinitionKind POA_IR::ComponentDef_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::ComponentDef_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -3385,18 +3385,18 @@ POA_IR::PrimaryKeyDef_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_IR::PrimaryKeyDef_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::PrimaryKeyDef_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->PrimaryKeyDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->PrimaryKeyDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE CORBA::Boolean POA_IR::PrimaryKeyDef_tie::is_a ( const char * primary_key_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3404,40 +3404,40 @@ CORBA::Boolean POA_IR::PrimaryKeyDef_tie::is_a ( { return this->ptr_->is_a ( primary_key_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_ValueDef_ptr POA_IR::PrimaryKeyDef_tie::primary_key ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->primary_key ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::PrimaryKeyDef_tie::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::PrimaryKeyDef_tie::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3445,27 +3445,27 @@ void POA_IR::PrimaryKeyDef_tie::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::PrimaryKeyDef_tie::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::PrimaryKeyDef_tie::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3473,27 +3473,27 @@ void POA_IR::PrimaryKeyDef_tie::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::PrimaryKeyDef_tie::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::PrimaryKeyDef_tie::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3501,59 +3501,59 @@ void POA_IR::PrimaryKeyDef_tie::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Container_ptr POA_IR::PrimaryKeyDef_tie::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::PrimaryKeyDef_tie::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Repository_ptr POA_IR::PrimaryKeyDef_tie::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained::Description * POA_IR::PrimaryKeyDef_tie::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -3562,7 +3562,7 @@ void POA_IR::PrimaryKeyDef_tie::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3572,33 +3572,33 @@ void POA_IR::PrimaryKeyDef_tie::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::DefinitionKind POA_IR::PrimaryKeyDef_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::PrimaryKeyDef_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -3671,44 +3671,44 @@ POA_IR::FactoryDef_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_IR::FactoryDef_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::FactoryDef_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->FactoryDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->FactoryDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE CORBA::TypeCode_ptr POA_IR::FactoryDef_tie::result ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->result ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_IDLType_ptr POA_IR::FactoryDef_tie::result_def ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->result_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::FactoryDef_tie::result_def ( CORBA_IDLType_ptr result_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3716,27 +3716,27 @@ void POA_IR::FactoryDef_tie::result_def ( { this->ptr_->result_def ( result_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_ParDescriptionSeq * POA_IR::FactoryDef_tie::params ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->params ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::FactoryDef_tie::params ( const CORBA_ParDescriptionSeq & params - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3744,27 +3744,27 @@ void POA_IR::FactoryDef_tie::params ( { this->ptr_->params ( params - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::OperationMode POA_IR::FactoryDef_tie::mode ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->mode ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::FactoryDef_tie::mode ( CORBA::OperationMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3772,27 +3772,27 @@ void POA_IR::FactoryDef_tie::mode ( { this->ptr_->mode ( mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_ContextIdSeq * POA_IR::FactoryDef_tie::contexts ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->contexts ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::FactoryDef_tie::contexts ( const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3800,27 +3800,27 @@ void POA_IR::FactoryDef_tie::contexts ( { this->ptr_->contexts ( contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_ExceptionDefSeq * POA_IR::FactoryDef_tie::exceptions ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->exceptions ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::FactoryDef_tie::exceptions ( const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3828,27 +3828,27 @@ void POA_IR::FactoryDef_tie::exceptions ( { this->ptr_->exceptions ( exceptions - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::FactoryDef_tie::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::FactoryDef_tie::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3856,27 +3856,27 @@ void POA_IR::FactoryDef_tie::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::FactoryDef_tie::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::FactoryDef_tie::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3884,27 +3884,27 @@ void POA_IR::FactoryDef_tie::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::FactoryDef_tie::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::FactoryDef_tie::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3912,59 +3912,59 @@ void POA_IR::FactoryDef_tie::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Container_ptr POA_IR::FactoryDef_tie::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::FactoryDef_tie::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Repository_ptr POA_IR::FactoryDef_tie::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained::Description * POA_IR::FactoryDef_tie::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -3973,7 +3973,7 @@ void POA_IR::FactoryDef_tie::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3983,33 +3983,33 @@ void POA_IR::FactoryDef_tie::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::DefinitionKind POA_IR::FactoryDef_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::FactoryDef_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -4082,44 +4082,44 @@ POA_IR::FinderDef_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_IR::FinderDef_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::FinderDef_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->FinderDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->FinderDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE CORBA::TypeCode_ptr POA_IR::FinderDef_tie::result ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->result ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_IDLType_ptr POA_IR::FinderDef_tie::result_def ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->result_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::FinderDef_tie::result_def ( CORBA_IDLType_ptr result_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4127,27 +4127,27 @@ void POA_IR::FinderDef_tie::result_def ( { this->ptr_->result_def ( result_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_ParDescriptionSeq * POA_IR::FinderDef_tie::params ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->params ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::FinderDef_tie::params ( const CORBA_ParDescriptionSeq & params - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4155,27 +4155,27 @@ void POA_IR::FinderDef_tie::params ( { this->ptr_->params ( params - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::OperationMode POA_IR::FinderDef_tie::mode ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->mode ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::FinderDef_tie::mode ( CORBA::OperationMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4183,27 +4183,27 @@ void POA_IR::FinderDef_tie::mode ( { this->ptr_->mode ( mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_ContextIdSeq * POA_IR::FinderDef_tie::contexts ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->contexts ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::FinderDef_tie::contexts ( const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4211,27 +4211,27 @@ void POA_IR::FinderDef_tie::contexts ( { this->ptr_->contexts ( contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_ExceptionDefSeq * POA_IR::FinderDef_tie::exceptions ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->exceptions ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::FinderDef_tie::exceptions ( const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4239,27 +4239,27 @@ void POA_IR::FinderDef_tie::exceptions ( { this->ptr_->exceptions ( exceptions - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::FinderDef_tie::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::FinderDef_tie::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4267,27 +4267,27 @@ void POA_IR::FinderDef_tie::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::FinderDef_tie::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::FinderDef_tie::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4295,27 +4295,27 @@ void POA_IR::FinderDef_tie::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::FinderDef_tie::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::FinderDef_tie::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4323,59 +4323,59 @@ void POA_IR::FinderDef_tie::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Container_ptr POA_IR::FinderDef_tie::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::FinderDef_tie::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Repository_ptr POA_IR::FinderDef_tie::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained::Description * POA_IR::FinderDef_tie::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -4384,7 +4384,7 @@ void POA_IR::FinderDef_tie::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4394,33 +4394,33 @@ void POA_IR::FinderDef_tie::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::DefinitionKind POA_IR::FinderDef_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::FinderDef_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -4493,89 +4493,89 @@ POA_IR::HomeDef_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_IR::HomeDef_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::HomeDef_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->HomeDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->HomeDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE IR::HomeDef_ptr POA_IR::HomeDef_tie::base_home ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->base_home ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE IR::ComponentDef_ptr POA_IR::HomeDef_tie::managed_component ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->managed_component ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE IR::PrimaryKeyDef_ptr POA_IR::HomeDef_tie::primary_key ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->primary_key ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE IR::FactoryDefSeq * POA_IR::HomeDef_tie::factories ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->factories ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE IR::FinderDefSeq * POA_IR::HomeDef_tie::finders ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->finders ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA::Boolean POA_IR::HomeDef_tie::is_basic ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->is_basic ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -4585,7 +4585,7 @@ IR::PrimaryKeyDef_ptr POA_IR::HomeDef_tie::create_primary_key ( const char * name, const char * version, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4596,7 +4596,7 @@ id, name, version, primary_key - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4607,7 +4607,7 @@ IR::FactoryDef_ptr POA_IR::HomeDef_tie::create_factory ( const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4619,7 +4619,7 @@ id, version, params, exceptions - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4630,7 +4630,7 @@ IR::FinderDef_ptr POA_IR::HomeDef_tie::create_finder ( const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4642,27 +4642,27 @@ id, version, params, exceptions - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_InterfaceDefSeq * POA_IR::HomeDef_tie::base_interfaces ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->base_interfaces ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::HomeDef_tie::base_interfaces ( const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4670,14 +4670,14 @@ void POA_IR::HomeDef_tie::base_interfaces ( { this->ptr_->base_interfaces ( base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::Boolean POA_IR::HomeDef_tie::is_a ( const char * interface_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4685,20 +4685,20 @@ CORBA::Boolean POA_IR::HomeDef_tie::is_a ( { return this->ptr_->is_a ( interface_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_InterfaceDef::FullInterfaceDescription * POA_IR::HomeDef_tie::describe_interface ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe_interface ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -4709,7 +4709,7 @@ CORBA_AttributeDef_ptr POA_IR::HomeDef_tie::create_attribute ( const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4721,7 +4721,7 @@ id, version, type, mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4735,7 +4735,7 @@ CORBA_OperationDef_ptr POA_IR::HomeDef_tie::create_operation ( const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4750,14 +4750,14 @@ id, params, exceptions, contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained_ptr POA_IR::HomeDef_tie::lookup ( const char * search_name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4765,7 +4765,7 @@ CORBA_Contained_ptr POA_IR::HomeDef_tie::lookup ( { return this->ptr_->lookup ( search_name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4773,7 +4773,7 @@ template ACE_INLINE CORBA_ContainedSeq * POA_IR::HomeDef_tie::contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4782,7 +4782,7 @@ CORBA_ContainedSeq * POA_IR::HomeDef_tie::contents ( return this->ptr_->contents ( limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4792,7 +4792,7 @@ CORBA_ContainedSeq * POA_IR::HomeDef_tie::lookup_name ( CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4803,7 +4803,7 @@ search_name, levels_to_search, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4812,7 +4812,7 @@ CORBA_Container::DescriptionSeq * POA_IR::HomeDef_tie::describe_contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4822,7 +4822,7 @@ CORBA_Container::DescriptionSeq * POA_IR::HomeDef_tie::describe_contents ( limit_type, exclude_inherited, max_returned_objs - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4831,7 +4831,7 @@ CORBA_ModuleDef_ptr POA_IR::HomeDef_tie::create_module ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4841,7 +4841,7 @@ CORBA_ModuleDef_ptr POA_IR::HomeDef_tie::create_module ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4852,7 +4852,7 @@ CORBA_ConstantDef_ptr POA_IR::HomeDef_tie::create_constant ( const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4864,7 +4864,7 @@ id, version, type, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4874,7 +4874,7 @@ CORBA_StructDef_ptr POA_IR::HomeDef_tie::create_struct ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4885,7 +4885,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4896,7 +4896,7 @@ CORBA_UnionDef_ptr POA_IR::HomeDef_tie::create_union ( const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4908,7 +4908,7 @@ id, version, discriminator_type, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4918,7 +4918,7 @@ CORBA_EnumDef_ptr POA_IR::HomeDef_tie::create_enum ( const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4929,7 +4929,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4939,7 +4939,7 @@ CORBA_AliasDef_ptr POA_IR::HomeDef_tie::create_alias ( const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4950,7 +4950,7 @@ id, name, version, original_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4960,7 +4960,7 @@ CORBA_InterfaceDef_ptr POA_IR::HomeDef_tie::create_interface ( const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4971,7 +4971,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4987,7 +4987,7 @@ CORBA_ValueDef_ptr POA_IR::HomeDef_tie::create_value ( const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5004,7 +5004,7 @@ id, abstract_base_values, supported_interfaces, initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -5014,7 +5014,7 @@ CORBA_ValueBoxDef_ptr POA_IR::HomeDef_tie::create_value_box ( const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5025,7 +5025,7 @@ id, name, version, original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -5035,7 +5035,7 @@ CORBA_ExceptionDef_ptr POA_IR::HomeDef_tie::create_exception ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5046,7 +5046,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -5055,7 +5055,7 @@ CORBA_NativeDef_ptr POA_IR::HomeDef_tie::create_native ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5065,7 +5065,7 @@ CORBA_NativeDef_ptr POA_IR::HomeDef_tie::create_native ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -5075,7 +5075,7 @@ CORBA_AbstractInterfaceDef_ptr POA_IR::HomeDef_tie::create_abstract_interface const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5086,7 +5086,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -5096,7 +5096,7 @@ CORBA_LocalInterfaceDef_ptr POA_IR::HomeDef_tie::create_local_interface ( const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5107,27 +5107,27 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::HomeDef_tie::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::HomeDef_tie::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5135,27 +5135,27 @@ void POA_IR::HomeDef_tie::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::HomeDef_tie::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::HomeDef_tie::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5163,27 +5163,27 @@ void POA_IR::HomeDef_tie::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::HomeDef_tie::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::HomeDef_tie::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5191,59 +5191,59 @@ void POA_IR::HomeDef_tie::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Container_ptr POA_IR::HomeDef_tie::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE char * POA_IR::HomeDef_tie::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Repository_ptr POA_IR::HomeDef_tie::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained::Description * POA_IR::HomeDef_tie::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -5252,7 +5252,7 @@ void POA_IR::HomeDef_tie::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5262,46 +5262,46 @@ void POA_IR::HomeDef_tie::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::TypeCode_ptr POA_IR::HomeDef_tie::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA::DefinitionKind POA_IR::HomeDef_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_IR::HomeDef_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp index 60601af3a69..66afb133074 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp +++ b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp @@ -186,31 +186,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_FixedDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::UShort result); @@ -228,44 +228,44 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::TAO_ServerRequestInfo_CORBA_Fix TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_FixedDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -277,7 +277,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::result (TAO_ENV_SINGLE_ARG_DECL char * TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -287,10 +287,10 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -308,31 +308,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_FixedDef *tao_impl , const CORBA::UShort & digits - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -351,7 +351,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::TAO_ServerRequestInfo_CORBA_Fix TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_FixedDef *tao_impl, const CORBA::UShort & digits - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -359,12 +359,12 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::TAO_ServerRequestInfo_CORBA_Fix {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -380,25 +380,25 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::arguments (TAO_ENV_SINGLE_ARG_D } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -406,7 +406,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::result (TAO_ENV_SINGLE_ARG_DECL char * TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -416,10 +416,10 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_FixedDef_scale_get : public TAO_ServerRequestInfo @@ -429,31 +429,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_FixedDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::Short result); @@ -471,44 +471,44 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::TAO_ServerRequestInfo_CORBA_Fixe TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_FixedDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -520,7 +520,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -530,10 +530,10 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -551,31 +551,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_FixedDef *tao_impl , const CORBA::Short & scale - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -594,7 +594,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::TAO_ServerRequestInfo_CORBA_Fixe TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_FixedDef *tao_impl, const CORBA::Short & scale - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -602,12 +602,12 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::TAO_ServerRequestInfo_CORBA_Fixe {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -623,25 +623,25 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::arguments (TAO_ENV_SINGLE_ARG_DE } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -649,7 +649,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -659,10 +659,10 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -695,17 +695,17 @@ _TAO_CORBA_FixedDef_Strategized_Proxy_Broker::~_TAO_CORBA_FixedDef_Strategized_P _TAO_CORBA_FixedDef_Proxy_Impl& _TAO_CORBA_FixedDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_FixedDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -715,7 +715,7 @@ _TAO_CORBA_FixedDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_FixedDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -785,7 +785,7 @@ _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::_TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl ( CORBA::UShort _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::digits ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -801,7 +801,7 @@ CORBA::UShort _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::digits ( _collocated_tao_target_->_object_key (), "digits", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -810,14 +810,14 @@ CORBA::UShort _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::digits ( "IDL:omg.org/CORBA/FixedDef:1.0" ) )->digits ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::digits ( CORBA_Object *_collocated_tao_target_, CORBA::UShort digits - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -831,7 +831,7 @@ void _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::digits ( _collocated_tao_target_->_object_key (), "digits", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -841,14 +841,14 @@ void _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::digits ( ) )->digits ( digits - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } CORBA::Short _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::scale ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -864,7 +864,7 @@ CORBA::Short _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::scale ( _collocated_tao_target_->_object_key (), "scale", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -873,14 +873,14 @@ CORBA::Short _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::scale ( "IDL:omg.org/CORBA/FixedDef:1.0" ) )->scale ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::scale ( CORBA_Object *_collocated_tao_target_, CORBA::Short scale - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -894,7 +894,7 @@ void _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::scale ( _collocated_tao_target_->_object_key (), "scale", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -904,7 +904,7 @@ void _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::scale ( ) )->scale ( scale - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -935,7 +935,7 @@ void POA_CORBA_FixedDef::_get_digits_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_FixedDef *_tao_impl = @@ -956,18 +956,18 @@ void POA_CORBA_FixedDef::_get_digits_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->digits ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -975,7 +975,7 @@ void POA_CORBA_FixedDef::_get_digits_skel ( CORBA::UShort _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -983,12 +983,12 @@ void POA_CORBA_FixedDef::_get_digits_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -1016,7 +1016,7 @@ void POA_CORBA_FixedDef::_set_digits_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -1045,25 +1045,25 @@ void POA_CORBA_FixedDef::_set_digits_skel ( _tao_upcall, _tao_impl, digits - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->digits ( digits - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -1071,12 +1071,12 @@ void POA_CORBA_FixedDef::_set_digits_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -1097,7 +1097,7 @@ void POA_CORBA_FixedDef::_get_scale_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_FixedDef *_tao_impl = @@ -1118,18 +1118,18 @@ void POA_CORBA_FixedDef::_get_scale_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->scale ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -1137,7 +1137,7 @@ void POA_CORBA_FixedDef::_get_scale_skel ( CORBA::Short _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -1145,12 +1145,12 @@ void POA_CORBA_FixedDef::_get_scale_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -1178,7 +1178,7 @@ void POA_CORBA_FixedDef::_set_scale_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -1207,25 +1207,25 @@ void POA_CORBA_FixedDef::_set_scale_skel ( _tao_upcall, _tao_impl, scale - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->scale ( scale - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -1233,12 +1233,12 @@ void POA_CORBA_FixedDef::_set_scale_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -1259,7 +1259,7 @@ void POA_CORBA_FixedDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -1269,7 +1269,7 @@ void POA_CORBA_FixedDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -1282,11 +1282,11 @@ void POA_CORBA_FixedDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_FixedDef *_tao_impl = (POA_CORBA_FixedDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -1299,7 +1299,7 @@ void POA_CORBA_FixedDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_FixedDef *_tao_impl = (POA_CORBA_FixedDef *) _tao_object_reference; @@ -1318,7 +1318,7 @@ void POA_CORBA_FixedDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -1345,10 +1345,10 @@ void POA_CORBA_FixedDef::_interface_skel ( CORBA::Boolean POA_CORBA_FixedDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -1376,12 +1376,12 @@ void* POA_CORBA_FixedDef::_downcast ( return 0; } -void POA_CORBA_FixedDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_FixedDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -1391,9 +1391,9 @@ const char* POA_CORBA_FixedDef::_interface_repository_id (void) const } CORBA_FixedDef* -POA_CORBA_FixedDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_FixedDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -1564,31 +1564,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueMemberDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::TypeCode_ptr result); @@ -1606,44 +1606,44 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::TAO_ServerRequestInfo_CORBA TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueMemberDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -1655,7 +1655,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::result (TAO_ENV_SINGLE_ARG_ char * TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1665,10 +1665,10 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::target_most_derived_interfa CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -1685,31 +1685,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueMemberDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_IDLType_ptr result); @@ -1727,44 +1727,44 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::TAO_ServerRequestInfo_C TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueMemberDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -1776,7 +1776,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::result (TAO_ENV_SINGLE_ char * TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1786,10 +1786,10 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::target_most_derived_int CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -1807,31 +1807,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueMemberDef *tao_impl , CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -1850,7 +1850,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::TAO_ServerRequestInfo_C TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueMemberDef *tao_impl, CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -1858,12 +1858,12 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::TAO_ServerRequestInfo_C {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -1879,25 +1879,25 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::arguments (TAO_ENV_SING } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -1905,7 +1905,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::result (TAO_ENV_SINGLE_ char * TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1915,10 +1915,10 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::target_most_derived_int CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get : public TAO_ServerRequestInfo @@ -1928,31 +1928,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueMemberDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::Visibility result); @@ -1970,44 +1970,44 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::TAO_ServerRequestInfo_COR TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueMemberDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -2019,7 +2019,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::result (TAO_ENV_SINGLE_AR char * TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -2029,10 +2029,10 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::target_most_derived_inter CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -2050,31 +2050,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueMemberDef *tao_impl , const CORBA::Visibility & access - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -2093,7 +2093,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::TAO_ServerRequestInfo_COR TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueMemberDef *tao_impl, const CORBA::Visibility & access - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -2101,12 +2101,12 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::TAO_ServerRequestInfo_COR {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -2122,25 +2122,25 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::arguments (TAO_ENV_SINGLE } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -2148,7 +2148,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::result (TAO_ENV_SINGLE_AR char * TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -2158,10 +2158,10 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::target_most_derived_inter CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -2194,17 +2194,17 @@ _TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker::~_TAO_CORBA_ValueMemberDef_S _TAO_CORBA_ValueMemberDef_Proxy_Impl& _TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_ValueMemberDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -2214,7 +2214,7 @@ _TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -2284,7 +2284,7 @@ _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::_TAO_CORBA_ValueMemberDef_ThruPOA_ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2300,7 +2300,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type ( _collocated_tao_target_->_object_key (), "type", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -2309,13 +2309,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type ( "IDL:omg.org/CORBA/ValueMemberDef:1.0" ) )->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2331,7 +2331,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type_def ( _collocated_tao_target_->_object_key (), "type_def", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -2340,14 +2340,14 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type_def ( "IDL:omg.org/CORBA/ValueMemberDef:1.0" ) )->type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2361,7 +2361,7 @@ void _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type_def ( _collocated_tao_target_->_object_key (), "type_def", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -2371,14 +2371,14 @@ void _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type_def ( ) )->type_def ( type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } CORBA::Visibility _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::access ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2394,7 +2394,7 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::access ( _collocated_tao_target_->_object_key (), "access", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -2403,14 +2403,14 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::access ( "IDL:omg.org/CORBA/ValueMemberDef:1.0" ) )->access ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::access ( CORBA_Object *_collocated_tao_target_, CORBA::Visibility access - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2424,7 +2424,7 @@ void _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::access ( _collocated_tao_target_->_object_key (), "access", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -2434,7 +2434,7 @@ void _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::access ( ) )->access ( access - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -2465,7 +2465,7 @@ void POA_CORBA_ValueMemberDef::_get_type_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ValueMemberDef *_tao_impl = @@ -2486,18 +2486,18 @@ void POA_CORBA_ValueMemberDef::_get_type_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -2506,7 +2506,7 @@ void POA_CORBA_ValueMemberDef::_get_type_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2514,12 +2514,12 @@ void POA_CORBA_ValueMemberDef::_get_type_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -2547,7 +2547,7 @@ void POA_CORBA_ValueMemberDef::_get_type_def_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ValueMemberDef *_tao_impl = @@ -2568,18 +2568,18 @@ void POA_CORBA_ValueMemberDef::_get_type_def_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -2588,7 +2588,7 @@ void POA_CORBA_ValueMemberDef::_get_type_def_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2596,12 +2596,12 @@ void POA_CORBA_ValueMemberDef::_get_type_def_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -2629,7 +2629,7 @@ void POA_CORBA_ValueMemberDef::_set_type_def_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -2658,25 +2658,25 @@ void POA_CORBA_ValueMemberDef::_set_type_def_skel ( _tao_upcall, _tao_impl, type_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->type_def ( type_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2684,12 +2684,12 @@ void POA_CORBA_ValueMemberDef::_set_type_def_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -2710,7 +2710,7 @@ void POA_CORBA_ValueMemberDef::_get_access_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ValueMemberDef *_tao_impl = @@ -2731,18 +2731,18 @@ void POA_CORBA_ValueMemberDef::_get_access_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->access ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -2750,7 +2750,7 @@ void POA_CORBA_ValueMemberDef::_get_access_skel ( CORBA::Visibility _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2758,12 +2758,12 @@ void POA_CORBA_ValueMemberDef::_get_access_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -2791,7 +2791,7 @@ void POA_CORBA_ValueMemberDef::_set_access_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -2820,25 +2820,25 @@ void POA_CORBA_ValueMemberDef::_set_access_skel ( _tao_upcall, _tao_impl, access - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->access ( access - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2846,12 +2846,12 @@ void POA_CORBA_ValueMemberDef::_set_access_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -2872,7 +2872,7 @@ void POA_CORBA_ValueMemberDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -2882,7 +2882,7 @@ void POA_CORBA_ValueMemberDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -2895,11 +2895,11 @@ void POA_CORBA_ValueMemberDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ValueMemberDef *_tao_impl = (POA_CORBA_ValueMemberDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -2912,7 +2912,7 @@ void POA_CORBA_ValueMemberDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ValueMemberDef *_tao_impl = (POA_CORBA_ValueMemberDef *) _tao_object_reference; @@ -2931,7 +2931,7 @@ void POA_CORBA_ValueMemberDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -2958,10 +2958,10 @@ void POA_CORBA_ValueMemberDef::_interface_skel ( CORBA::Boolean POA_CORBA_ValueMemberDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -2989,12 +2989,12 @@ void* POA_CORBA_ValueMemberDef::_downcast ( return 0; } -void POA_CORBA_ValueMemberDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_ValueMemberDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -3004,9 +3004,9 @@ const char* POA_CORBA_ValueMemberDef::_interface_repository_id (void) const } CORBA_ValueMemberDef* -POA_CORBA_ValueMemberDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_ValueMemberDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -3213,31 +3213,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_InterfaceDefSeq * result); @@ -3255,44 +3255,44 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::TAO_ServerRequest TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -3304,7 +3304,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (TAO_ENV_S char * TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -3314,10 +3314,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::target_most_deriv CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -3335,31 +3335,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl , const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -3378,7 +3378,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::TAO_ServerRequest TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueDef *tao_impl, const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -3386,12 +3386,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::TAO_ServerRequest {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -3407,25 +3407,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::arguments (TAO_EN } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -3433,7 +3433,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::result (TAO_ENV_S char * TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -3443,10 +3443,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::target_most_deriv CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get : public TAO_ServerRequestInfo @@ -3456,31 +3456,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_InitializerSeq * result); @@ -3498,44 +3498,44 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::TAO_ServerRequestInfo_COR TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -3547,7 +3547,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::result (TAO_ENV_SINGLE_AR char * TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -3557,10 +3557,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::target_most_derived_inter CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -3578,31 +3578,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl , const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -3621,7 +3621,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::TAO_ServerRequestInfo_COR TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueDef *tao_impl, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -3629,12 +3629,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::TAO_ServerRequestInfo_COR {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -3650,25 +3650,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::arguments (TAO_ENV_SINGLE } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -3676,7 +3676,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::result (TAO_ENV_SINGLE_AR char * TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -3686,10 +3686,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::target_most_derived_inter CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get : public TAO_ServerRequestInfo @@ -3699,31 +3699,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_ValueDef_ptr result); @@ -3741,44 +3741,44 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::TAO_ServerRequestInfo_CORBA TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -3790,7 +3790,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::result (TAO_ENV_SINGLE_ARG_ char * TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -3800,10 +3800,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::target_most_derived_interfa CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -3821,31 +3821,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl , CORBA_ValueDef_ptr base_value - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -3864,7 +3864,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::TAO_ServerRequestInfo_CORBA TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueDef *tao_impl, CORBA_ValueDef_ptr base_value - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -3872,12 +3872,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::TAO_ServerRequestInfo_CORBA {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -3893,25 +3893,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::arguments (TAO_ENV_SINGLE_A } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -3919,7 +3919,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::result (TAO_ENV_SINGLE_ARG_ char * TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -3929,10 +3929,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::target_most_derived_interfa CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get : public TAO_ServerRequestInfo @@ -3942,31 +3942,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_ValueDefSeq * result); @@ -3984,44 +3984,44 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::TAO_ServerRequest TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -4033,7 +4033,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (TAO_ENV_S char * TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -4043,10 +4043,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::target_most_deriv CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -4064,31 +4064,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl , const CORBA_ValueDefSeq & abstract_base_values - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -4107,7 +4107,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::TAO_ServerRequest TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueDef *tao_impl, const CORBA_ValueDefSeq & abstract_base_values - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -4115,12 +4115,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::TAO_ServerRequest {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -4136,25 +4136,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::arguments (TAO_EN } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -4162,7 +4162,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::result (TAO_ENV_S char * TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -4172,10 +4172,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::target_most_deriv CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get : public TAO_ServerRequestInfo @@ -4185,31 +4185,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::Boolean result); @@ -4227,44 +4227,44 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::TAO_ServerRequestInfo_CORB TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -4276,7 +4276,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::result (TAO_ENV_SINGLE_ARG char * TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -4286,10 +4286,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::target_most_derived_interf CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -4307,31 +4307,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl , const CORBA::Boolean & is_abstract - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -4350,7 +4350,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::TAO_ServerRequestInfo_CORB TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueDef *tao_impl, const CORBA::Boolean & is_abstract - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -4358,12 +4358,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::TAO_ServerRequestInfo_CORB {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -4379,25 +4379,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::arguments (TAO_ENV_SINGLE_ } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -4405,7 +4405,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::result (TAO_ENV_SINGLE_ARG char * TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -4415,10 +4415,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::target_most_derived_interf CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get : public TAO_ServerRequestInfo @@ -4428,31 +4428,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::Boolean result); @@ -4470,44 +4470,44 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::TAO_ServerRequestInfo_CORBA_ TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -4519,7 +4519,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::result (TAO_ENV_SINGLE_ARG_D char * TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -4529,10 +4529,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::target_most_derived_interfac CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -4550,31 +4550,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl , const CORBA::Boolean & is_custom - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -4593,7 +4593,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::TAO_ServerRequestInfo_CORBA_ TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueDef *tao_impl, const CORBA::Boolean & is_custom - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -4601,12 +4601,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::TAO_ServerRequestInfo_CORBA_ {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -4622,25 +4622,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::arguments (TAO_ENV_SINGLE_AR } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -4648,7 +4648,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::result (TAO_ENV_SINGLE_ARG_D char * TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -4658,10 +4658,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::target_most_derived_interfac CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get : public TAO_ServerRequestInfo @@ -4671,31 +4671,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::Boolean result); @@ -4713,44 +4713,44 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::TAO_ServerRequestInfo_C TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -4762,7 +4762,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::result (TAO_ENV_SINGLE_ char * TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -4772,10 +4772,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::target_most_derived_int CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -4793,31 +4793,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl , const CORBA::Boolean & is_truncatable - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -4836,7 +4836,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::TAO_ServerRequestInfo_C TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueDef *tao_impl, const CORBA::Boolean & is_truncatable - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -4844,12 +4844,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::TAO_ServerRequestInfo_C {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -4865,25 +4865,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::arguments (TAO_ENV_SING } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -4891,7 +4891,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::result (TAO_ENV_SINGLE_ char * TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -4901,10 +4901,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::target_most_derived_int CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_ValueDef_is_a : public TAO_ServerRequestInfo @@ -4915,31 +4915,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl , const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::Boolean result); @@ -4959,7 +4959,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_a::TAO_ServerRequestInfo_CORBA_ValueDef_ TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueDef *tao_impl, const char * id - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -4967,12 +4967,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_a::TAO_ServerRequestInfo_CORBA_ValueDef_ {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_a::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -4988,25 +4988,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL) } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueDef_is_a::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_a::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_a::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5018,7 +5018,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_CORBA_ValueDef_is_a::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5028,10 +5028,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_a::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueDef_is_a::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -5048,31 +5048,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_ValueDef::FullValueDescription * result); @@ -5090,44 +5090,44 @@ TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::TAO_ServerRequestInfo_CORBA TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5139,7 +5139,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::result (TAO_ENV_SINGLE_ARG_ char * TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5149,10 +5149,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::target_most_derived_interfa CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -5174,31 +5174,31 @@ public: const char * version, CORBA_IDLType_ptr type, const CORBA::Visibility & access - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_ValueMemberDef_ptr result); @@ -5226,7 +5226,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::TAO_ServerRequestInfo_ const char * version, CORBA_IDLType_ptr type, const CORBA::Visibility & access - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -5238,12 +5238,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::TAO_ServerRequestInfo_ {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -5271,25 +5271,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::arguments (TAO_ENV_SIN } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5301,7 +5301,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::result (TAO_ENV_SINGLE char * TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5311,10 +5311,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::target_most_derived_in CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -5336,31 +5336,31 @@ public: const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode & mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_AttributeDef_ptr result); @@ -5388,7 +5388,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::TAO_ServerRequestInfo_COR const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode & mode - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -5400,12 +5400,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::TAO_ServerRequestInfo_COR {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -5433,25 +5433,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::arguments (TAO_ENV_SINGLE } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5463,7 +5463,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::result (TAO_ENV_SINGLE_AR char * TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5473,10 +5473,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::target_most_derived_inter CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -5501,31 +5501,31 @@ public: const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_OperationDef_ptr result); @@ -5559,7 +5559,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::TAO_ServerRequestInfo_COR const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -5574,12 +5574,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::TAO_ServerRequestInfo_COR {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -5616,25 +5616,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::arguments (TAO_ENV_SINGLE } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5646,7 +5646,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::result (TAO_ENV_SINGLE_AR char * TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5656,10 +5656,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::target_most_derived_inter CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -5699,17 +5699,17 @@ _TAO_CORBA_ValueDef_Strategized_Proxy_Broker::~_TAO_CORBA_ValueDef_Strategized_P _TAO_CORBA_ValueDef_Proxy_Impl& _TAO_CORBA_ValueDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_ValueDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -5719,7 +5719,7 @@ _TAO_CORBA_ValueDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_ValueDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -5789,7 +5789,7 @@ _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::_TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl ( CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5805,7 +5805,7 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::supported_interf _collocated_tao_target_->_object_key (), "supported_interfaces", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -5814,14 +5814,14 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::supported_interf "IDL:omg.org/CORBA/ValueDef:1.0" ) )->supported_interfaces ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces ( CORBA_Object *_collocated_tao_target_, const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5835,7 +5835,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces ( _collocated_tao_target_->_object_key (), "supported_interfaces", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -5845,14 +5845,14 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces ( ) )->supported_interfaces ( supported_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } CORBA_InitializerSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::initializers ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5868,7 +5868,7 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::initializers ( _collocated_tao_target_->_object_key (), "initializers", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -5877,14 +5877,14 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::initializers ( "IDL:omg.org/CORBA/ValueDef:1.0" ) )->initializers ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::initializers ( CORBA_Object *_collocated_tao_target_, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5898,7 +5898,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::initializers ( _collocated_tao_target_->_object_key (), "initializers", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -5908,14 +5908,14 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::initializers ( ) )->initializers ( initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::base_value ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5931,7 +5931,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::base_value ( _collocated_tao_target_->_object_key (), "base_value", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -5940,14 +5940,14 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::base_value ( "IDL:omg.org/CORBA/ValueDef:1.0" ) )->base_value ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::base_value ( CORBA_Object *_collocated_tao_target_, CORBA_ValueDef_ptr base_value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5961,7 +5961,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::base_value ( _collocated_tao_target_->_object_key (), "base_value", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -5971,14 +5971,14 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::base_value ( ) )->base_value ( base_value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5994,7 +5994,7 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values _collocated_tao_target_->_object_key (), "abstract_base_values", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -6003,14 +6003,14 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values "IDL:omg.org/CORBA/ValueDef:1.0" ) )->abstract_base_values ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values ( CORBA_Object *_collocated_tao_target_, const CORBA_ValueDefSeq & abstract_base_values - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6024,7 +6024,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values ( _collocated_tao_target_->_object_key (), "abstract_base_values", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -6034,14 +6034,14 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values ( ) )->abstract_base_values ( abstract_base_values - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_abstract ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6057,7 +6057,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_abstract ( _collocated_tao_target_->_object_key (), "is_abstract", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -6066,14 +6066,14 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_abstract ( "IDL:omg.org/CORBA/ValueDef:1.0" ) )->is_abstract ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_abstract ( CORBA_Object *_collocated_tao_target_, CORBA::Boolean is_abstract - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6087,7 +6087,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_abstract ( _collocated_tao_target_->_object_key (), "is_abstract", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -6097,14 +6097,14 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_abstract ( ) )->is_abstract ( is_abstract - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_custom ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6120,7 +6120,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_custom ( _collocated_tao_target_->_object_key (), "is_custom", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -6129,14 +6129,14 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_custom ( "IDL:omg.org/CORBA/ValueDef:1.0" ) )->is_custom ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_custom ( CORBA_Object *_collocated_tao_target_, CORBA::Boolean is_custom - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6150,7 +6150,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_custom ( _collocated_tao_target_->_object_key (), "is_custom", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -6160,14 +6160,14 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_custom ( ) )->is_custom ( is_custom - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_truncatable ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6183,7 +6183,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_truncatable ( _collocated_tao_target_->_object_key (), "is_truncatable", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -6192,14 +6192,14 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_truncatable ( "IDL:omg.org/CORBA/ValueDef:1.0" ) )->is_truncatable ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_truncatable ( CORBA_Object *_collocated_tao_target_, CORBA::Boolean is_truncatable - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6213,7 +6213,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_truncatable ( _collocated_tao_target_->_object_key (), "is_truncatable", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -6223,7 +6223,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_truncatable ( ) )->is_truncatable ( is_truncatable - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -6231,7 +6231,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_truncatable ( CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_a ( CORBA_Object *_collocated_tao_target_, const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6247,7 +6247,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_a ( _collocated_tao_target_->_object_key (), "is_a", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -6257,13 +6257,13 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_a ( ) )->is_a ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::describe_value ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6279,7 +6279,7 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::d _collocated_tao_target_->_object_key (), "describe_value", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -6288,7 +6288,7 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::d "IDL:omg.org/CORBA/ValueDef:1.0" ) )->describe_value ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -6299,7 +6299,7 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_value_me const char * version, CORBA_IDLType_ptr type, CORBA::Visibility access - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6315,7 +6315,7 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_value_me _collocated_tao_target_->_object_key (), "create_value_member", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -6329,7 +6329,7 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_value_me version, type, access - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6340,7 +6340,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_attribute const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6356,7 +6356,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_attribute _collocated_tao_target_->_object_key (), "create_attribute", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -6370,7 +6370,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_attribute version, type, mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6384,7 +6384,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_operation const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6400,7 +6400,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_operation _collocated_tao_target_->_object_key (), "create_operation", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -6417,7 +6417,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_operation params, exceptions, contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6449,7 +6449,7 @@ void POA_CORBA_ValueDef::_get_supported_interfaces_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ValueDef *_tao_impl = @@ -6470,18 +6470,18 @@ void POA_CORBA_ValueDef::_get_supported_interfaces_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->supported_interfaces ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -6490,7 +6490,7 @@ void POA_CORBA_ValueDef::_get_supported_interfaces_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -6498,12 +6498,12 @@ void POA_CORBA_ValueDef::_get_supported_interfaces_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -6531,7 +6531,7 @@ void POA_CORBA_ValueDef::_set_supported_interfaces_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -6560,25 +6560,25 @@ void POA_CORBA_ValueDef::_set_supported_interfaces_skel ( _tao_upcall, _tao_impl, supported_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->supported_interfaces ( supported_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -6586,12 +6586,12 @@ void POA_CORBA_ValueDef::_set_supported_interfaces_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -6612,7 +6612,7 @@ void POA_CORBA_ValueDef::_get_initializers_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ValueDef *_tao_impl = @@ -6633,18 +6633,18 @@ void POA_CORBA_ValueDef::_get_initializers_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->initializers ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -6653,7 +6653,7 @@ void POA_CORBA_ValueDef::_get_initializers_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -6661,12 +6661,12 @@ void POA_CORBA_ValueDef::_get_initializers_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -6694,7 +6694,7 @@ void POA_CORBA_ValueDef::_set_initializers_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -6723,25 +6723,25 @@ void POA_CORBA_ValueDef::_set_initializers_skel ( _tao_upcall, _tao_impl, initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->initializers ( initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -6749,12 +6749,12 @@ void POA_CORBA_ValueDef::_set_initializers_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -6775,7 +6775,7 @@ void POA_CORBA_ValueDef::_get_base_value_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ValueDef *_tao_impl = @@ -6796,18 +6796,18 @@ void POA_CORBA_ValueDef::_get_base_value_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->base_value ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -6816,7 +6816,7 @@ void POA_CORBA_ValueDef::_get_base_value_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -6824,12 +6824,12 @@ void POA_CORBA_ValueDef::_get_base_value_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -6857,7 +6857,7 @@ void POA_CORBA_ValueDef::_set_base_value_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -6886,25 +6886,25 @@ void POA_CORBA_ValueDef::_set_base_value_skel ( _tao_upcall, _tao_impl, base_value.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->base_value ( base_value.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -6912,12 +6912,12 @@ void POA_CORBA_ValueDef::_set_base_value_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -6938,7 +6938,7 @@ void POA_CORBA_ValueDef::_get_abstract_base_values_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ValueDef *_tao_impl = @@ -6959,18 +6959,18 @@ void POA_CORBA_ValueDef::_get_abstract_base_values_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->abstract_base_values ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -6979,7 +6979,7 @@ void POA_CORBA_ValueDef::_get_abstract_base_values_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -6987,12 +6987,12 @@ void POA_CORBA_ValueDef::_get_abstract_base_values_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7020,7 +7020,7 @@ void POA_CORBA_ValueDef::_set_abstract_base_values_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -7049,25 +7049,25 @@ void POA_CORBA_ValueDef::_set_abstract_base_values_skel ( _tao_upcall, _tao_impl, abstract_base_values - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->abstract_base_values ( abstract_base_values - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7075,12 +7075,12 @@ void POA_CORBA_ValueDef::_set_abstract_base_values_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7101,7 +7101,7 @@ void POA_CORBA_ValueDef::_get_is_abstract_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ValueDef *_tao_impl = @@ -7122,18 +7122,18 @@ void POA_CORBA_ValueDef::_get_is_abstract_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->is_abstract ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7141,7 +7141,7 @@ void POA_CORBA_ValueDef::_get_is_abstract_skel ( CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7149,12 +7149,12 @@ void POA_CORBA_ValueDef::_get_is_abstract_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7182,7 +7182,7 @@ void POA_CORBA_ValueDef::_set_is_abstract_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -7211,25 +7211,25 @@ void POA_CORBA_ValueDef::_set_is_abstract_skel ( _tao_upcall, _tao_impl, is_abstract - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->is_abstract ( is_abstract - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7237,12 +7237,12 @@ void POA_CORBA_ValueDef::_set_is_abstract_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7263,7 +7263,7 @@ void POA_CORBA_ValueDef::_get_is_custom_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ValueDef *_tao_impl = @@ -7284,18 +7284,18 @@ void POA_CORBA_ValueDef::_get_is_custom_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->is_custom ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7303,7 +7303,7 @@ void POA_CORBA_ValueDef::_get_is_custom_skel ( CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7311,12 +7311,12 @@ void POA_CORBA_ValueDef::_get_is_custom_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7344,7 +7344,7 @@ void POA_CORBA_ValueDef::_set_is_custom_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -7373,25 +7373,25 @@ void POA_CORBA_ValueDef::_set_is_custom_skel ( _tao_upcall, _tao_impl, is_custom - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->is_custom ( is_custom - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7399,12 +7399,12 @@ void POA_CORBA_ValueDef::_set_is_custom_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7425,7 +7425,7 @@ void POA_CORBA_ValueDef::_get_is_truncatable_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ValueDef *_tao_impl = @@ -7446,18 +7446,18 @@ void POA_CORBA_ValueDef::_get_is_truncatable_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->is_truncatable ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7465,7 +7465,7 @@ void POA_CORBA_ValueDef::_get_is_truncatable_skel ( CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7473,12 +7473,12 @@ void POA_CORBA_ValueDef::_get_is_truncatable_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7506,7 +7506,7 @@ void POA_CORBA_ValueDef::_set_is_truncatable_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -7535,25 +7535,25 @@ void POA_CORBA_ValueDef::_set_is_truncatable_skel ( _tao_upcall, _tao_impl, is_truncatable - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->is_truncatable ( is_truncatable - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7561,12 +7561,12 @@ void POA_CORBA_ValueDef::_set_is_truncatable_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7587,7 +7587,7 @@ void POA_CORBA_ValueDef::is_a_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -7616,19 +7616,19 @@ void POA_CORBA_ValueDef::is_a_skel ( _tao_upcall, _tao_impl, id.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->is_a ( id.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7636,7 +7636,7 @@ void POA_CORBA_ValueDef::is_a_skel ( CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7644,12 +7644,12 @@ void POA_CORBA_ValueDef::is_a_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7677,7 +7677,7 @@ void POA_CORBA_ValueDef::describe_value_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ValueDef *_tao_impl = @@ -7698,18 +7698,18 @@ void POA_CORBA_ValueDef::describe_value_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->describe_value ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7718,7 +7718,7 @@ void POA_CORBA_ValueDef::describe_value_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7726,12 +7726,12 @@ void POA_CORBA_ValueDef::describe_value_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7759,7 +7759,7 @@ void POA_CORBA_ValueDef::create_value_member_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -7800,12 +7800,12 @@ void POA_CORBA_ValueDef::create_value_member_skel ( version.in (), type.in (), access - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -7816,7 +7816,7 @@ void POA_CORBA_ValueDef::create_value_member_skel ( version.in (), type.in (), access - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7825,7 +7825,7 @@ void POA_CORBA_ValueDef::create_value_member_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7833,12 +7833,12 @@ void POA_CORBA_ValueDef::create_value_member_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7866,7 +7866,7 @@ void POA_CORBA_ValueDef::create_attribute_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -7907,12 +7907,12 @@ void POA_CORBA_ValueDef::create_attribute_skel ( version.in (), type.in (), mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -7923,7 +7923,7 @@ void POA_CORBA_ValueDef::create_attribute_skel ( version.in (), type.in (), mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7932,7 +7932,7 @@ void POA_CORBA_ValueDef::create_attribute_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7940,12 +7940,12 @@ void POA_CORBA_ValueDef::create_attribute_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7973,7 +7973,7 @@ void POA_CORBA_ValueDef::create_operation_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8023,12 +8023,12 @@ void POA_CORBA_ValueDef::create_operation_skel ( params, exceptions, contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -8042,7 +8042,7 @@ void POA_CORBA_ValueDef::create_operation_skel ( params, exceptions, contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8051,7 +8051,7 @@ void POA_CORBA_ValueDef::create_operation_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8059,12 +8059,12 @@ void POA_CORBA_ValueDef::create_operation_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8092,7 +8092,7 @@ void POA_CORBA_ValueDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8102,7 +8102,7 @@ void POA_CORBA_ValueDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -8115,11 +8115,11 @@ void POA_CORBA_ValueDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ValueDef *_tao_impl = (POA_CORBA_ValueDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -8132,7 +8132,7 @@ void POA_CORBA_ValueDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ValueDef *_tao_impl = (POA_CORBA_ValueDef *) _tao_object_reference; @@ -8151,7 +8151,7 @@ void POA_CORBA_ValueDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -8178,10 +8178,10 @@ void POA_CORBA_ValueDef::_interface_skel ( CORBA::Boolean POA_CORBA_ValueDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -8215,12 +8215,12 @@ void* POA_CORBA_ValueDef::_downcast ( return 0; } -void POA_CORBA_ValueDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_ValueDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -8230,9 +8230,9 @@ const char* POA_CORBA_ValueDef::_interface_repository_id (void) const } CORBA_ValueDef* -POA_CORBA_ValueDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_ValueDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -8401,31 +8401,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueBoxDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_IDLType_ptr result); @@ -8443,44 +8443,44 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::TAO_ServerRequest TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueBoxDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -8492,7 +8492,7 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (TAO_ENV_S char * TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -8502,10 +8502,10 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::target_most_deriv CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -8523,31 +8523,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueBoxDef *tao_impl , CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -8566,7 +8566,7 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::TAO_ServerRequest TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueBoxDef *tao_impl, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -8574,12 +8574,12 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::TAO_ServerRequest {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -8595,25 +8595,25 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::arguments (TAO_EN } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -8621,7 +8621,7 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::result (TAO_ENV_S char * TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -8631,10 +8631,10 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::target_most_deriv CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -8667,17 +8667,17 @@ _TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker::~_TAO_CORBA_ValueBoxDef_Strateg _TAO_CORBA_ValueBoxDef_Proxy_Impl& _TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_ValueBoxDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -8687,7 +8687,7 @@ _TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -8757,7 +8757,7 @@ _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::_TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -8773,7 +8773,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def ( _collocated_tao_target_->_object_key (), "original_type_def", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -8782,14 +8782,14 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def ( "IDL:omg.org/CORBA/ValueBoxDef:1.0" ) )->original_type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -8803,7 +8803,7 @@ void _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def ( _collocated_tao_target_->_object_key (), "original_type_def", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -8813,7 +8813,7 @@ void _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def ( ) )->original_type_def ( original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -8846,7 +8846,7 @@ void POA_CORBA_ValueBoxDef::_get_original_type_def_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ValueBoxDef *_tao_impl = @@ -8867,18 +8867,18 @@ void POA_CORBA_ValueBoxDef::_get_original_type_def_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->original_type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8887,7 +8887,7 @@ void POA_CORBA_ValueBoxDef::_get_original_type_def_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8895,12 +8895,12 @@ void POA_CORBA_ValueBoxDef::_get_original_type_def_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8928,7 +8928,7 @@ void POA_CORBA_ValueBoxDef::_set_original_type_def_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8957,25 +8957,25 @@ void POA_CORBA_ValueBoxDef::_set_original_type_def_skel ( _tao_upcall, _tao_impl, original_type_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->original_type_def ( original_type_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8983,12 +8983,12 @@ void POA_CORBA_ValueBoxDef::_set_original_type_def_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -9009,7 +9009,7 @@ void POA_CORBA_ValueBoxDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -9019,7 +9019,7 @@ void POA_CORBA_ValueBoxDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -9032,11 +9032,11 @@ void POA_CORBA_ValueBoxDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ValueBoxDef *_tao_impl = (POA_CORBA_ValueBoxDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -9049,7 +9049,7 @@ void POA_CORBA_ValueBoxDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ValueBoxDef *_tao_impl = (POA_CORBA_ValueBoxDef *) _tao_object_reference; @@ -9068,7 +9068,7 @@ void POA_CORBA_ValueBoxDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -9095,10 +9095,10 @@ void POA_CORBA_ValueBoxDef::_interface_skel ( CORBA::Boolean POA_CORBA_ValueBoxDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -9132,12 +9132,12 @@ void* POA_CORBA_ValueBoxDef::_downcast ( return 0; } -void POA_CORBA_ValueBoxDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_ValueBoxDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -9147,9 +9147,9 @@ const char* POA_CORBA_ValueBoxDef::_interface_repository_id (void) const } CORBA_ValueBoxDef* -POA_CORBA_ValueBoxDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_ValueBoxDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.h b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.h index 44ebf1426b3..722fd223576 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.h +++ b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.h @@ -65,7 +65,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -76,37 +76,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_FixedDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA::UShort digits ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -116,12 +116,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void digits ( CORBA::UShort digits - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -131,11 +131,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA::Short scale ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -145,12 +145,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void scale ( CORBA::Short scale - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -160,28 +160,28 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -201,7 +201,7 @@ public: virtual ::_TAO_CORBA_FixedDef_Proxy_Impl &select_proxy ( ::CORBA_FixedDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -210,7 +210,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -253,7 +253,7 @@ public: virtual CORBA::UShort digits ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -262,7 +262,7 @@ public: virtual void digits ( CORBA_Object *_collocated_tao_target_, CORBA::UShort digits - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -270,7 +270,7 @@ public: virtual CORBA::Short scale ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -279,7 +279,7 @@ public: virtual void scale ( CORBA_Object *_collocated_tao_target_, CORBA::Short scale - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -311,7 +311,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -322,37 +322,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_ValueMemberDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -362,11 +362,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_IDLType_ptr type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -376,12 +376,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void type_def ( CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -391,11 +391,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA::Visibility access ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -405,12 +405,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void access ( CORBA::Visibility access - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -420,98 +420,98 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -531,7 +531,7 @@ public: virtual ::_TAO_CORBA_ValueMemberDef_Proxy_Impl &select_proxy ( ::CORBA_ValueMemberDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -540,7 +540,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -583,7 +583,7 @@ public: virtual CORBA::TypeCode_ptr type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -591,7 +591,7 @@ public: virtual CORBA_IDLType_ptr type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -600,7 +600,7 @@ public: virtual void type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -608,7 +608,7 @@ public: virtual CORBA::Visibility access ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -617,7 +617,7 @@ public: virtual void access ( CORBA_Object *_collocated_tao_target_, CORBA::Visibility access - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -649,7 +649,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -660,37 +660,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_ValueDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA_InterfaceDefSeq * supported_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -700,12 +700,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void supported_interfaces ( const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -715,11 +715,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_InitializerSeq * initializers ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -729,12 +729,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void initializers ( const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -744,11 +744,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_ValueDef_ptr base_value ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -758,12 +758,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void base_value ( CORBA_ValueDef_ptr base_value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -773,11 +773,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_ValueDefSeq * abstract_base_values ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -787,12 +787,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void abstract_base_values ( const CORBA_ValueDefSeq & abstract_base_values - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -802,11 +802,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA::Boolean is_abstract ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -816,12 +816,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void is_abstract ( CORBA::Boolean is_abstract - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -831,11 +831,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA::Boolean is_custom ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -845,12 +845,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void is_custom ( CORBA::Boolean is_custom - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -860,11 +860,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA::Boolean is_truncatable ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -874,12 +874,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void is_truncatable ( CORBA::Boolean is_truncatable - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -889,12 +889,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA::Boolean is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -904,11 +904,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_ValueDef::FullValueDescription * describe_value ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -918,7 +918,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_ValueMemberDef_ptr create_value_member ( @@ -927,7 +927,7 @@ public: const char * version, CORBA_IDLType_ptr type, CORBA::Visibility access - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -937,7 +937,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_AttributeDef_ptr create_attribute ( @@ -946,7 +946,7 @@ public: const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -956,7 +956,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_OperationDef_ptr create_operation ( @@ -968,7 +968,7 @@ public: const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -978,224 +978,224 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -1215,7 +1215,7 @@ public: virtual ::_TAO_CORBA_ValueDef_Proxy_Impl &select_proxy ( ::CORBA_ValueDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1224,7 +1224,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1269,7 +1269,7 @@ public: virtual CORBA_InterfaceDefSeq * supported_interfaces ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1278,7 +1278,7 @@ public: virtual void supported_interfaces ( CORBA_Object *_collocated_tao_target_, const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1286,7 +1286,7 @@ public: virtual CORBA_InitializerSeq * initializers ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1295,7 +1295,7 @@ public: virtual void initializers ( CORBA_Object *_collocated_tao_target_, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1303,7 +1303,7 @@ public: virtual CORBA_ValueDef_ptr base_value ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1312,7 +1312,7 @@ public: virtual void base_value ( CORBA_Object *_collocated_tao_target_, CORBA_ValueDef_ptr base_value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1320,7 +1320,7 @@ public: virtual CORBA_ValueDefSeq * abstract_base_values ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1329,7 +1329,7 @@ public: virtual void abstract_base_values ( CORBA_Object *_collocated_tao_target_, const CORBA_ValueDefSeq & abstract_base_values - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1337,7 +1337,7 @@ public: virtual CORBA::Boolean is_abstract ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1346,7 +1346,7 @@ public: virtual void is_abstract ( CORBA_Object *_collocated_tao_target_, CORBA::Boolean is_abstract - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1354,7 +1354,7 @@ public: virtual CORBA::Boolean is_custom ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1363,7 +1363,7 @@ public: virtual void is_custom ( CORBA_Object *_collocated_tao_target_, CORBA::Boolean is_custom - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1371,7 +1371,7 @@ public: virtual CORBA::Boolean is_truncatable ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1380,7 +1380,7 @@ public: virtual void is_truncatable ( CORBA_Object *_collocated_tao_target_, CORBA::Boolean is_truncatable - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1389,7 +1389,7 @@ public: virtual CORBA::Boolean is_a ( CORBA_Object *_collocated_tao_target_, const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1397,7 +1397,7 @@ public: virtual CORBA_ValueDef::FullValueDescription * describe_value ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1410,7 +1410,7 @@ public: const char * version, CORBA_IDLType_ptr type, CORBA::Visibility access - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1423,7 +1423,7 @@ public: const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1439,7 +1439,7 @@ public: const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1471,7 +1471,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -1482,37 +1482,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_ValueBoxDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA_IDLType_ptr original_type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1522,12 +1522,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void original_type_def ( CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1537,105 +1537,105 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -1655,7 +1655,7 @@ public: virtual ::_TAO_CORBA_ValueBoxDef_Proxy_Impl &select_proxy ( ::CORBA_ValueBoxDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1664,7 +1664,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1707,7 +1707,7 @@ public: virtual CORBA_IDLType_ptr original_type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1716,7 +1716,7 @@ public: virtual void original_type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.i b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.i index 103672775f1..7248973257f 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.i +++ b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.i @@ -23,7 +23,7 @@ ACE_INLINE void POA_CORBA_FixedDef::_get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType_ptr impl = (POA_CORBA_FixedDef_ptr) obj; @@ -31,14 +31,14 @@ ACE_INLINE void POA_CORBA_FixedDef::_get_type_skel ( req, (POA_CORBA_IDLType_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_FixedDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_FixedDef_ptr) obj; @@ -46,14 +46,14 @@ ACE_INLINE void POA_CORBA_FixedDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_FixedDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_FixedDef_ptr) obj; @@ -61,14 +61,14 @@ ACE_INLINE void POA_CORBA_FixedDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueMemberDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj; @@ -76,14 +76,14 @@ ACE_INLINE void POA_CORBA_ValueMemberDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueMemberDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj; @@ -91,14 +91,14 @@ ACE_INLINE void POA_CORBA_ValueMemberDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueMemberDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj; @@ -106,14 +106,14 @@ ACE_INLINE void POA_CORBA_ValueMemberDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueMemberDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj; @@ -121,14 +121,14 @@ ACE_INLINE void POA_CORBA_ValueMemberDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueMemberDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj; @@ -136,14 +136,14 @@ ACE_INLINE void POA_CORBA_ValueMemberDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueMemberDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj; @@ -151,14 +151,14 @@ ACE_INLINE void POA_CORBA_ValueMemberDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueMemberDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj; @@ -166,14 +166,14 @@ ACE_INLINE void POA_CORBA_ValueMemberDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueMemberDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj; @@ -181,14 +181,14 @@ ACE_INLINE void POA_CORBA_ValueMemberDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueMemberDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj; @@ -196,14 +196,14 @@ ACE_INLINE void POA_CORBA_ValueMemberDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueMemberDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj; @@ -211,14 +211,14 @@ ACE_INLINE void POA_CORBA_ValueMemberDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueMemberDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj; @@ -226,14 +226,14 @@ ACE_INLINE void POA_CORBA_ValueMemberDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueMemberDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj; @@ -241,14 +241,14 @@ ACE_INLINE void POA_CORBA_ValueMemberDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueMemberDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj; @@ -256,14 +256,14 @@ ACE_INLINE void POA_CORBA_ValueMemberDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -271,14 +271,14 @@ ACE_INLINE void POA_CORBA_ValueDef::lookup_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -286,14 +286,14 @@ ACE_INLINE void POA_CORBA_ValueDef::contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -301,14 +301,14 @@ ACE_INLINE void POA_CORBA_ValueDef::lookup_name_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -316,14 +316,14 @@ ACE_INLINE void POA_CORBA_ValueDef::describe_contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -331,14 +331,14 @@ ACE_INLINE void POA_CORBA_ValueDef::create_module_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -346,14 +346,14 @@ ACE_INLINE void POA_CORBA_ValueDef::create_constant_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -361,14 +361,14 @@ ACE_INLINE void POA_CORBA_ValueDef::create_struct_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -376,14 +376,14 @@ ACE_INLINE void POA_CORBA_ValueDef::create_union_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -391,14 +391,14 @@ ACE_INLINE void POA_CORBA_ValueDef::create_enum_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -406,14 +406,14 @@ ACE_INLINE void POA_CORBA_ValueDef::create_alias_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -421,14 +421,14 @@ ACE_INLINE void POA_CORBA_ValueDef::create_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -436,14 +436,14 @@ ACE_INLINE void POA_CORBA_ValueDef::create_value_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -451,14 +451,14 @@ ACE_INLINE void POA_CORBA_ValueDef::create_value_box_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -466,14 +466,14 @@ ACE_INLINE void POA_CORBA_ValueDef::create_exception_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -481,14 +481,14 @@ ACE_INLINE void POA_CORBA_ValueDef::create_native_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -496,14 +496,14 @@ ACE_INLINE void POA_CORBA_ValueDef::create_abstract_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -511,14 +511,14 @@ ACE_INLINE void POA_CORBA_ValueDef::create_local_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -526,14 +526,14 @@ ACE_INLINE void POA_CORBA_ValueDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -541,14 +541,14 @@ ACE_INLINE void POA_CORBA_ValueDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -556,14 +556,14 @@ ACE_INLINE void POA_CORBA_ValueDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -571,14 +571,14 @@ ACE_INLINE void POA_CORBA_ValueDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -586,14 +586,14 @@ ACE_INLINE void POA_CORBA_ValueDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -601,14 +601,14 @@ ACE_INLINE void POA_CORBA_ValueDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -616,14 +616,14 @@ ACE_INLINE void POA_CORBA_ValueDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -631,14 +631,14 @@ ACE_INLINE void POA_CORBA_ValueDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -646,14 +646,14 @@ ACE_INLINE void POA_CORBA_ValueDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -661,14 +661,14 @@ ACE_INLINE void POA_CORBA_ValueDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -676,14 +676,14 @@ ACE_INLINE void POA_CORBA_ValueDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::_get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -691,14 +691,14 @@ ACE_INLINE void POA_CORBA_ValueDef::_get_type_skel ( req, (POA_CORBA_IDLType_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -706,14 +706,14 @@ ACE_INLINE void POA_CORBA_ValueDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -721,14 +721,14 @@ ACE_INLINE void POA_CORBA_ValueDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueBoxDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj; @@ -736,14 +736,14 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueBoxDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj; @@ -751,14 +751,14 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueBoxDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj; @@ -766,14 +766,14 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueBoxDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj; @@ -781,14 +781,14 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueBoxDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj; @@ -796,14 +796,14 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueBoxDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj; @@ -811,14 +811,14 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueBoxDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj; @@ -826,14 +826,14 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueBoxDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj; @@ -841,14 +841,14 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueBoxDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj; @@ -856,14 +856,14 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueBoxDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj; @@ -871,14 +871,14 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueBoxDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj; @@ -886,14 +886,14 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueBoxDef::_get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj; @@ -901,14 +901,14 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::_get_type_skel ( req, (POA_CORBA_IDLType_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueBoxDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj; @@ -916,14 +916,14 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueBoxDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj; @@ -931,6 +931,6 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.h b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.h index 9d4328f4b01..0fd833515c9 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.h +++ b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.h @@ -67,10 +67,10 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::UShort digits ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -78,14 +78,14 @@ public: void digits ( CORBA::UShort digits - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::Short scale ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -93,28 +93,28 @@ public: void scale ( CORBA::Short scale - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -160,17 +160,17 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_IDLType_ptr type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -178,14 +178,14 @@ public: void type_def ( CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::Visibility access ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -193,14 +193,14 @@ public: void access ( CORBA::Visibility access - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -208,14 +208,14 @@ public: void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -223,14 +223,14 @@ public: void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -238,35 +238,35 @@ public: void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -276,21 +276,21 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -336,10 +336,10 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA_InterfaceDefSeq * supported_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -347,14 +347,14 @@ public: void supported_interfaces ( const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_InitializerSeq * initializers ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -362,14 +362,14 @@ public: void initializers ( const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_ValueDef_ptr base_value ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -377,14 +377,14 @@ public: void base_value ( CORBA_ValueDef_ptr base_value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_ValueDefSeq * abstract_base_values ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -392,14 +392,14 @@ public: void abstract_base_values ( const CORBA_ValueDefSeq & abstract_base_values - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::Boolean is_abstract ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -407,14 +407,14 @@ public: void is_abstract ( CORBA::Boolean is_abstract - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::Boolean is_custom ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -422,14 +422,14 @@ public: void is_custom ( CORBA::Boolean is_custom - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::Boolean is_truncatable ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -437,7 +437,7 @@ public: void is_truncatable ( CORBA::Boolean is_truncatable - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -445,14 +445,14 @@ public: CORBA::Boolean is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_ValueDef::FullValueDescription * describe_value ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -464,7 +464,7 @@ public: const char * version, CORBA_IDLType_ptr type, CORBA::Visibility access - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -476,7 +476,7 @@ public: const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -491,7 +491,7 @@ public: const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -499,7 +499,7 @@ public: CORBA_Contained_ptr lookup ( const char * search_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -508,7 +508,7 @@ public: CORBA_ContainedSeq * contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -519,7 +519,7 @@ public: CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -529,7 +529,7 @@ public: CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -539,7 +539,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -551,7 +551,7 @@ public: const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -562,7 +562,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -574,7 +574,7 @@ public: const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -585,7 +585,7 @@ public: const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -596,7 +596,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -607,7 +607,7 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -624,7 +624,7 @@ public: const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -635,7 +635,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -646,7 +646,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -656,7 +656,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -667,7 +667,7 @@ public: const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -678,14 +678,14 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -693,14 +693,14 @@ public: void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -708,14 +708,14 @@ public: void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -723,35 +723,35 @@ public: void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -761,28 +761,28 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -828,10 +828,10 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA_IDLType_ptr original_type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -839,14 +839,14 @@ public: void original_type_def ( CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -854,14 +854,14 @@ public: void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -869,14 +869,14 @@ public: void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -884,35 +884,35 @@ public: void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -922,28 +922,28 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.i b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.i index 29831f87b03..362bd1e0da5 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.i +++ b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.i @@ -90,31 +90,31 @@ POA_CORBA_FixedDef_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_CORBA_FixedDef_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_FixedDef_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_FixedDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_FixedDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE CORBA::UShort POA_CORBA_FixedDef_tie::digits ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->digits ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_FixedDef_tie::digits ( CORBA::UShort digits - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -122,27 +122,27 @@ void POA_CORBA_FixedDef_tie::digits ( { this->ptr_->digits ( digits - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::Short POA_CORBA_FixedDef_tie::scale ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->scale ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_FixedDef_tie::scale ( CORBA::Short scale - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -150,46 +150,46 @@ void POA_CORBA_FixedDef_tie::scale ( { this->ptr_->scale ( scale - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_FixedDef_tie::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA::DefinitionKind POA_CORBA_FixedDef_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_FixedDef_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -262,44 +262,44 @@ POA_CORBA_ValueMemberDef_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_CORBA_ValueMemberDef_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_ValueMemberDef_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_ValueMemberDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_ValueMemberDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_ValueMemberDef_tie::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_IDLType_ptr POA_CORBA_ValueMemberDef_tie::type_def ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ValueMemberDef_tie::type_def ( CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -307,27 +307,27 @@ void POA_CORBA_ValueMemberDef_tie::type_def ( { this->ptr_->type_def ( type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::Visibility POA_CORBA_ValueMemberDef_tie::access ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->access ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ValueMemberDef_tie::access ( CORBA::Visibility access - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -335,27 +335,27 @@ void POA_CORBA_ValueMemberDef_tie::access ( { this->ptr_->access ( access - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_ValueMemberDef_tie::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ValueMemberDef_tie::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -363,27 +363,27 @@ void POA_CORBA_ValueMemberDef_tie::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_ValueMemberDef_tie::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ValueMemberDef_tie::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -391,27 +391,27 @@ void POA_CORBA_ValueMemberDef_tie::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_ValueMemberDef_tie::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ValueMemberDef_tie::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -419,59 +419,59 @@ void POA_CORBA_ValueMemberDef_tie::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Container_ptr POA_CORBA_ValueMemberDef_tie::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_ValueMemberDef_tie::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Repository_ptr POA_CORBA_ValueMemberDef_tie::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained::Description * POA_CORBA_ValueMemberDef_tie::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -480,7 +480,7 @@ void POA_CORBA_ValueMemberDef_tie::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -490,33 +490,33 @@ void POA_CORBA_ValueMemberDef_tie::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::DefinitionKind POA_CORBA_ValueMemberDef_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ValueMemberDef_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -589,31 +589,31 @@ POA_CORBA_ValueDef_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_CORBA_ValueDef_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_ValueDef_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_ValueDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_ValueDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE CORBA_InterfaceDefSeq * POA_CORBA_ValueDef_tie::supported_interfaces ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->supported_interfaces ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ValueDef_tie::supported_interfaces ( const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -621,27 +621,27 @@ void POA_CORBA_ValueDef_tie::supported_interfaces ( { this->ptr_->supported_interfaces ( supported_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_InitializerSeq * POA_CORBA_ValueDef_tie::initializers ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->initializers ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ValueDef_tie::initializers ( const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -649,27 +649,27 @@ void POA_CORBA_ValueDef_tie::initializers ( { this->ptr_->initializers ( initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_ValueDef_ptr POA_CORBA_ValueDef_tie::base_value ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->base_value ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ValueDef_tie::base_value ( CORBA_ValueDef_ptr base_value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -677,27 +677,27 @@ void POA_CORBA_ValueDef_tie::base_value ( { this->ptr_->base_value ( base_value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_ValueDefSeq * POA_CORBA_ValueDef_tie::abstract_base_values ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->abstract_base_values ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ValueDef_tie::abstract_base_values ( const CORBA_ValueDefSeq & abstract_base_values - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -705,27 +705,27 @@ void POA_CORBA_ValueDef_tie::abstract_base_values ( { this->ptr_->abstract_base_values ( abstract_base_values - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::Boolean POA_CORBA_ValueDef_tie::is_abstract ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->is_abstract ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ValueDef_tie::is_abstract ( CORBA::Boolean is_abstract - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -733,27 +733,27 @@ void POA_CORBA_ValueDef_tie::is_abstract ( { this->ptr_->is_abstract ( is_abstract - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::Boolean POA_CORBA_ValueDef_tie::is_custom ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->is_custom ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ValueDef_tie::is_custom ( CORBA::Boolean is_custom - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -761,27 +761,27 @@ void POA_CORBA_ValueDef_tie::is_custom ( { this->ptr_->is_custom ( is_custom - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::Boolean POA_CORBA_ValueDef_tie::is_truncatable ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->is_truncatable ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ValueDef_tie::is_truncatable ( CORBA::Boolean is_truncatable - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -789,14 +789,14 @@ void POA_CORBA_ValueDef_tie::is_truncatable ( { this->ptr_->is_truncatable ( is_truncatable - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::Boolean POA_CORBA_ValueDef_tie::is_a ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -804,20 +804,20 @@ CORBA::Boolean POA_CORBA_ValueDef_tie::is_a ( { return this->ptr_->is_a ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_ValueDef::FullValueDescription * POA_CORBA_ValueDef_tie::describe_value ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe_value ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -828,7 +828,7 @@ CORBA_ValueMemberDef_ptr POA_CORBA_ValueDef_tie::create_value_member ( const char * version, CORBA_IDLType_ptr type, CORBA::Visibility access - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -840,7 +840,7 @@ id, version, type, access - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -851,7 +851,7 @@ CORBA_AttributeDef_ptr POA_CORBA_ValueDef_tie::create_attribute ( const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -863,7 +863,7 @@ id, version, type, mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -877,7 +877,7 @@ CORBA_OperationDef_ptr POA_CORBA_ValueDef_tie::create_operation ( const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -892,14 +892,14 @@ id, params, exceptions, contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained_ptr POA_CORBA_ValueDef_tie::lookup ( const char * search_name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -907,7 +907,7 @@ CORBA_Contained_ptr POA_CORBA_ValueDef_tie::lookup ( { return this->ptr_->lookup ( search_name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -915,7 +915,7 @@ template ACE_INLINE CORBA_ContainedSeq * POA_CORBA_ValueDef_tie::contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -924,7 +924,7 @@ CORBA_ContainedSeq * POA_CORBA_ValueDef_tie::contents ( return this->ptr_->contents ( limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -934,7 +934,7 @@ CORBA_ContainedSeq * POA_CORBA_ValueDef_tie::lookup_name ( CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -945,7 +945,7 @@ search_name, levels_to_search, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -954,7 +954,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_ValueDef_tie::describe_contents CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -964,7 +964,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_ValueDef_tie::describe_contents limit_type, exclude_inherited, max_returned_objs - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -973,7 +973,7 @@ CORBA_ModuleDef_ptr POA_CORBA_ValueDef_tie::create_module ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -983,7 +983,7 @@ CORBA_ModuleDef_ptr POA_CORBA_ValueDef_tie::create_module ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -994,7 +994,7 @@ CORBA_ConstantDef_ptr POA_CORBA_ValueDef_tie::create_constant ( const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1006,7 +1006,7 @@ id, version, type, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1016,7 +1016,7 @@ CORBA_StructDef_ptr POA_CORBA_ValueDef_tie::create_struct ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1027,7 +1027,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1038,7 +1038,7 @@ CORBA_UnionDef_ptr POA_CORBA_ValueDef_tie::create_union ( const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1050,7 +1050,7 @@ id, version, discriminator_type, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1060,7 +1060,7 @@ CORBA_EnumDef_ptr POA_CORBA_ValueDef_tie::create_enum ( const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1071,7 +1071,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1081,7 +1081,7 @@ CORBA_AliasDef_ptr POA_CORBA_ValueDef_tie::create_alias ( const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1092,7 +1092,7 @@ id, name, version, original_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1102,7 +1102,7 @@ CORBA_InterfaceDef_ptr POA_CORBA_ValueDef_tie::create_interface ( const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1113,7 +1113,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1129,7 +1129,7 @@ CORBA_ValueDef_ptr POA_CORBA_ValueDef_tie::create_value ( const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1146,7 +1146,7 @@ id, abstract_base_values, supported_interfaces, initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1156,7 +1156,7 @@ CORBA_ValueBoxDef_ptr POA_CORBA_ValueDef_tie::create_value_box ( const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1167,7 +1167,7 @@ id, name, version, original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1177,7 +1177,7 @@ CORBA_ExceptionDef_ptr POA_CORBA_ValueDef_tie::create_exception ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1188,7 +1188,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1197,7 +1197,7 @@ CORBA_NativeDef_ptr POA_CORBA_ValueDef_tie::create_native ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1207,7 +1207,7 @@ CORBA_NativeDef_ptr POA_CORBA_ValueDef_tie::create_native ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1217,7 +1217,7 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_ValueDef_tie::create_abstract_interf const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1228,7 +1228,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1238,7 +1238,7 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_ValueDef_tie::create_local_interface ( const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1249,27 +1249,27 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_ValueDef_tie::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ValueDef_tie::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1277,27 +1277,27 @@ void POA_CORBA_ValueDef_tie::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_ValueDef_tie::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ValueDef_tie::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1305,27 +1305,27 @@ void POA_CORBA_ValueDef_tie::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_ValueDef_tie::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ValueDef_tie::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1333,59 +1333,59 @@ void POA_CORBA_ValueDef_tie::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Container_ptr POA_CORBA_ValueDef_tie::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_ValueDef_tie::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Repository_ptr POA_CORBA_ValueDef_tie::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained::Description * POA_CORBA_ValueDef_tie::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -1394,7 +1394,7 @@ void POA_CORBA_ValueDef_tie::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1404,46 +1404,46 @@ void POA_CORBA_ValueDef_tie::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_ValueDef_tie::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA::DefinitionKind POA_CORBA_ValueDef_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ValueDef_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -1516,31 +1516,31 @@ POA_CORBA_ValueBoxDef_tie::_is_owner (CORBA::Boolean b) } template ACE_INLINE PortableServer::POA_ptr -POA_CORBA_ValueBoxDef_tie::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_ValueBoxDef_tie::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_ValueBoxDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_ValueBoxDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template ACE_INLINE CORBA_IDLType_ptr POA_CORBA_ValueBoxDef_tie::original_type_def ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->original_type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ValueBoxDef_tie::original_type_def ( CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1548,27 +1548,27 @@ void POA_CORBA_ValueBoxDef_tie::original_type_def ( { this->ptr_->original_type_def ( original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_ValueBoxDef_tie::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ValueBoxDef_tie::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1576,27 +1576,27 @@ void POA_CORBA_ValueBoxDef_tie::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_ValueBoxDef_tie::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ValueBoxDef_tie::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1604,27 +1604,27 @@ void POA_CORBA_ValueBoxDef_tie::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_ValueBoxDef_tie::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ValueBoxDef_tie::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1632,59 +1632,59 @@ void POA_CORBA_ValueBoxDef_tie::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA_Container_ptr POA_CORBA_ValueBoxDef_tie::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE char * POA_CORBA_ValueBoxDef_tie::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Repository_ptr POA_CORBA_ValueBoxDef_tie::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA_Contained::Description * POA_CORBA_ValueBoxDef_tie::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -1693,7 +1693,7 @@ void POA_CORBA_ValueBoxDef_tie::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1703,46 +1703,46 @@ void POA_CORBA_ValueBoxDef_tie::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_ValueBoxDef_tie::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE CORBA::DefinitionKind POA_CORBA_ValueBoxDef_tie::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template ACE_INLINE void POA_CORBA_ValueBoxDef_tie::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } diff --git a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp index 51fbfd395fa..f9a463f4f71 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp +++ b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp @@ -12,10 +12,10 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "TAO Interface Repository\n")); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - int status = server.init (argc, argv TAO_ENV_ARG_PARAMETER); + int status = server.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (status == -1) @@ -24,10 +24,10 @@ main (int argc, char *argv[]) } else { - server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - status = server.fini (TAO_ENV_SINGLE_ARG_PARAMETER); + status = server.fini (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (status == -1) diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp index 045cad101bd..059b2abbd46 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp +++ b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp @@ -45,24 +45,24 @@ IFR_Service::~IFR_Service (void) int IFR_Service::init (int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { this->orb_ = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = this->orb_->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->root_poa_ = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int retval = OPTIONS::instance()->parse_args (argc, @@ -71,31 +71,31 @@ IFR_Service::init (int argc, if (retval != 0) return retval; - retval = this->create_poas (TAO_ENV_SINGLE_ARG_PARAMETER); + retval = this->create_poas (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (retval != 0) return retval; - retval = this->open_config (TAO_ENV_SINGLE_ARG_PARAMETER); + retval = this->open_config (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (retval != 0) return retval; - retval = this->create_repository (TAO_ENV_SINGLE_ARG_PARAMETER); + retval = this->create_repository (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (retval != 0) return retval; - retval = this->create_locator (TAO_ENV_SINGLE_ARG_PARAMETER); + retval = this->create_locator (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (retval != 0) return retval; - retval = this->init_multicast_server (TAO_ENV_SINGLE_ARG_PARAMETER); + retval = this->init_multicast_server (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (retval != 0) @@ -118,22 +118,22 @@ IFR_Service::init (int argc, } int -IFR_Service::run (TAO_ENV_SINGLE_ARG_DECL) +IFR_Service::run (ACE_ENV_SINGLE_ARG_DECL) { - this->orb_->run (0 TAO_ENV_ARG_PARAMETER); + this->orb_->run (0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; } int -IFR_Service::fini (TAO_ENV_SINGLE_ARG_DECL) +IFR_Service::fini (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { this->root_poa_->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -148,13 +148,13 @@ IFR_Service::fini (TAO_ENV_SINGLE_ARG_DECL) } int -IFR_Service::create_poas (TAO_ENV_SINGLE_ARG_DECL) +IFR_Service::create_poas (ACE_ENV_SINGLE_ARG_DECL) { PortableServer::POAManager_var poa_manager = - this->root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::PolicyList policies (4); @@ -163,7 +163,7 @@ IFR_Service::create_poas (TAO_ENV_SINGLE_ARG_DECL) // So the Repository's POA can survive a crash. policies[0] = this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_TString repo_name = "repoPOA"; @@ -172,7 +172,7 @@ IFR_Service::create_poas (TAO_ENV_SINGLE_ARG_DECL) this->root_poa_->create_POA (repo_name.c_str (), poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); policies.length (4); @@ -181,7 +181,7 @@ IFR_Service::create_poas (TAO_ENV_SINGLE_ARG_DECL) policies[1] = this->root_poa_->create_id_assignment_policy ( PortableServer::USER_ID - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (-1); @@ -189,7 +189,7 @@ IFR_Service::create_poas (TAO_ENV_SINGLE_ARG_DECL) policies[2] = this->root_poa_->create_request_processing_policy ( PortableServer::USE_SERVANT_MANAGER - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (-1); @@ -197,7 +197,7 @@ IFR_Service::create_poas (TAO_ENV_SINGLE_ARG_DECL) policies[3] = this->root_poa_->create_servant_retention_policy ( PortableServer::NON_RETAIN - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (-1); @@ -207,7 +207,7 @@ IFR_Service::create_poas (TAO_ENV_SINGLE_ARG_DECL) this->root_poa_->create_POA (name.c_str (), poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Destroy the policy objects as they have been passed to @@ -217,7 +217,7 @@ IFR_Service::create_poas (TAO_ENV_SINGLE_ARG_DECL) for (CORBA::ULong i = 0; i < length; ++i) { CORBA::Policy_ptr policy = policies[i]; - policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } @@ -225,7 +225,7 @@ IFR_Service::create_poas (TAO_ENV_SINGLE_ARG_DECL) } int -IFR_Service::create_locator (TAO_ENV_SINGLE_ARG_DECL) +IFR_Service::create_locator (ACE_ENV_SINGLE_ARG_DECL) { ACE_NEW_THROW_EX (this->servant_locator_impl_, IFR_ServantLocator (this->repo_impl_), @@ -233,14 +233,14 @@ IFR_Service::create_locator (TAO_ENV_SINGLE_ARG_DECL) ACE_CHECK_RETURN (-1); this->ir_object_poa_->set_servant_manager (this->servant_locator_impl_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; } int -IFR_Service::open_config (TAO_ENV_SINGLE_ARG_DECL) +IFR_Service::open_config (ACE_ENV_SINGLE_ARG_DECL) { if (OPTIONS::instance ()->using_registry ()) { @@ -294,7 +294,7 @@ IFR_Service::open_config (TAO_ENV_SINGLE_ARG_DECL) } int -IFR_Service::create_repository (TAO_ENV_SINGLE_ARG_DECL) +IFR_Service::create_repository (ACE_ENV_SINGLE_ARG_DECL) { TAO_ComponentRepository_i *impl = 0; ACE_NEW_THROW_EX ( @@ -329,10 +329,10 @@ IFR_Service::create_repository (TAO_ENV_SINGLE_ARG_DECL) PortableServer::ObjectId_var repo_oid = this->repo_poa_->activate_object (impl_tie - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - this->repository_ = impl_tie->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->repository_ = impl_tie->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); @@ -341,16 +341,16 @@ IFR_Service::create_repository (TAO_ENV_SINGLE_ARG_DECL) // Save and output the IOR string. this->ifr_ior_ = this->orb_->object_to_string (this->repository_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::Object_var table_object = - this->orb_->resolve_initial_references ("IORTable" TAO_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); IORTable::Table_var adapter = - IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER); + IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (adapter.in ())) { @@ -360,7 +360,7 @@ IFR_Service::create_repository (TAO_ENV_SINGLE_ARG_DECL) { adapter->bind ("InterfaceRepository", this->ifr_ior_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } @@ -379,7 +379,7 @@ IFR_Service::create_repository (TAO_ENV_SINGLE_ARG_DECL) // Install ior multicast handler. int -IFR_Service::init_multicast_server (TAO_ENV_SINGLE_ARG_DECL) +IFR_Service::init_multicast_server (ACE_ENV_SINGLE_ARG_DECL) { // Get reactor instance from TAO. ACE_Reactor *reactor = this->orb_->orb_core ()->reactor (); diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.h b/TAO/orbsvcs/IFR_Service/IFR_Service.h index c73abc1c595..2df674784d1 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_Service.h +++ b/TAO/orbsvcs/IFR_Service/IFR_Service.h @@ -46,29 +46,29 @@ public: int init (int argc, char *argv[] - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize the IFR service. - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the IFR service. - int fini (TAO_ENV_SINGLE_ARG_DECL); + int fini (ACE_ENV_SINGLE_ARG_DECL); // Shut down the IFR service. protected: - int create_poas (TAO_ENV_SINGLE_ARG_DECL); + int create_poas (ACE_ENV_SINGLE_ARG_DECL); // Two persistent POAs, one using a servant locator. - int create_locator (TAO_ENV_SINGLE_ARG_DECL); + int create_locator (ACE_ENV_SINGLE_ARG_DECL); // Create a servant locator and register it with its POA. - int open_config (TAO_ENV_SINGLE_ARG_DECL); + int open_config (ACE_ENV_SINGLE_ARG_DECL); // Open an ACE_Configuration of the appropriate type. - int create_repository (TAO_ENV_SINGLE_ARG_DECL); + int create_repository (ACE_ENV_SINGLE_ARG_DECL); // Create and initialize the repository. - int init_multicast_server (TAO_ENV_SINGLE_ARG_DECL); + int init_multicast_server (ACE_ENV_SINGLE_ARG_DECL); // Enable the Interface Repository to answer multicast requests // for its IOR. diff --git a/TAO/orbsvcs/IFR_Service/IRObject_i.h b/TAO/orbsvcs/IFR_Service/IRObject_i.h index 315b1a508e6..45ade535476 100644 --- a/TAO/orbsvcs/IFR_Service/IRObject_i.h +++ b/TAO/orbsvcs/IFR_Service/IRObject_i.h @@ -53,19 +53,19 @@ public: // Destructor. virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; // Pure virtual. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; // Pure virtual. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; // Pure virtual- the unlocked version called by destroy() wrapper. diff --git a/TAO/orbsvcs/IFR_Service/InterfaceDef_i.cpp b/TAO/orbsvcs/IFR_Service/InterfaceDef_i.cpp index 0bab296d146..af7eceb62cc 100644 --- a/TAO/orbsvcs/IFR_Service/InterfaceDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/InterfaceDef_i.cpp @@ -25,53 +25,53 @@ TAO_InterfaceDef_i::~TAO_InterfaceDef_i (void) } CORBA::DefinitionKind -TAO_InterfaceDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_InterfaceDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Interface; } void -TAO_InterfaceDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_InterfaceDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_InterfaceDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_InterfaceDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Destroy our members. - TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // This will get rid of the repo ids, which Contained_i::destroy()'s // call to remove_section (recursive = 1) will not get, and also // destroy the attribute's anonymous type, if any. - this->destroy_special ("attrs" TAO_ENV_ARG_PARAMETER); + this->destroy_special ("attrs" ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->destroy_special ("ops" TAO_ENV_ARG_PARAMETER); + this->destroy_special ("ops" ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Destroy ourself. - TAO_Contained_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Contained_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } CORBA_Contained::Description * -TAO_InterfaceDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) +TAO_InterfaceDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_InterfaceDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_InterfaceDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA_Contained::Description *desc_ptr = 0; @@ -82,15 +82,15 @@ TAO_InterfaceDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) CORBA_Contained::Description_var retval = desc_ptr; - retval->kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA_InterfaceDescription ifd; - ifd.name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER); + ifd.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - ifd.id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER); + ifd.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_TString container_id; @@ -101,11 +101,11 @@ TAO_InterfaceDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) ifd.defined_in = container_id.c_str (); - ifd.version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER); + ifd.version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::ULong i = 0; - CORBA_InterfaceDefSeq_var bases = this->base_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_InterfaceDefSeq_var bases = this->base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::ULong length = bases->length (); @@ -122,7 +122,7 @@ TAO_InterfaceDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) { oid = this->repo_->ir_poa ()->reference_to_id (bases[i] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); base_path = @@ -136,7 +136,7 @@ TAO_InterfaceDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) TAO_InterfaceDef_i impl (this->repo_, base_key); - repo_ids[i] = impl.id_i (TAO_ENV_SINGLE_ARG_PARAMETER); + repo_ids[i] = impl.id_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -148,16 +148,16 @@ TAO_InterfaceDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) } CORBA::TypeCode_ptr -TAO_InterfaceDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_InterfaceDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_InterfaceDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_InterfaceDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString id; @@ -174,20 +174,20 @@ TAO_InterfaceDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) return this->repo_->tc_factory ()->create_interface_tc (id.c_str (), name.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_InterfaceDefSeq * -TAO_InterfaceDef_i::base_interfaces (TAO_ENV_SINGLE_ARG_DECL) +TAO_InterfaceDef_i::base_interfaces (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->base_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_InterfaceDefSeq * -TAO_InterfaceDef_i::base_interfaces_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_InterfaceDef_i::base_interfaces_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Unbounded_Queue kind_queue; @@ -219,12 +219,12 @@ TAO_InterfaceDef_i::base_interfaces_i (TAO_ENV_SINGLE_ARG_DECL) this->repo_->servant_factory ()->create_objref ( def_kind, path.c_str () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); retval[i] = CORBA_InterfaceDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -233,23 +233,23 @@ TAO_InterfaceDef_i::base_interfaces_i (TAO_ENV_SINGLE_ARG_DECL) void TAO_InterfaceDef_i::base_interfaces (const CORBA_InterfaceDefSeq &base_interfaces - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->base_interfaces_i (base_interfaces - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_InterfaceDef_i::base_interfaces_i (const CORBA_InterfaceDefSeq &base_interfaces - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // If we are an abstract interface, all our base interfaces must be // abstract as well. - CORBA::DefinitionKind def_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::DefinitionKind def_kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (def_kind == CORBA::dk_AbstractInterface) @@ -258,7 +258,7 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA_InterfaceDefSeq &base_interfa for (CORBA::ULong i = 0; i < length; ++i) { - def_kind = base_interfaces[i]->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + def_kind = base_interfaces[i]->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (def_kind != CORBA::dk_AbstractInterface) @@ -291,7 +291,7 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA_InterfaceDefSeq &base_interfa { oid = this->repo_->ir_poa ()->reference_to_id (base_interfaces[i] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; inherited_path = @@ -305,7 +305,7 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA_InterfaceDefSeq &base_interfa TAO_InterfaceDef_i impl (this->repo_, base_key); - name = impl.name_i (TAO_ENV_SINGLE_ARG_PARAMETER); + name = impl.name_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // None of these names can clash with any we may already have. @@ -322,18 +322,18 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA_InterfaceDefSeq &base_interfa CORBA::Boolean TAO_InterfaceDef_i::is_a (const char *interface_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); return this->is_a_i (interface_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Boolean TAO_InterfaceDef_i::is_a_i (const char *interface_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (ACE_OS::strcmp (interface_id, "IDL:omg.org/CORBA/Object:1.0") == 0) @@ -341,7 +341,7 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id return 1; } - CORBA::String_var id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Is it our type? @@ -349,7 +349,7 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id return 1; // Is it one of our ancestors' types? - CORBA_InterfaceDefSeq_var bases = this->base_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_InterfaceDefSeq_var bases = this->base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::ULong length = bases->length (); @@ -362,7 +362,7 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id { oid = this->repo_->ir_poa ()->reference_to_id (bases[i] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); base_path = @@ -377,7 +377,7 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id base_key); CORBA::Boolean success = impl.is_a_i (interface_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (success == 1) @@ -388,16 +388,16 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id } CORBA_InterfaceDef::FullInterfaceDescription * -TAO_InterfaceDef_i::describe_interface (TAO_ENV_SINGLE_ARG_DECL) +TAO_InterfaceDef_i::describe_interface (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_interface_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_interface_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_InterfaceDef::FullInterfaceDescription * -TAO_InterfaceDef_i::describe_interface_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_InterfaceDef_i::describe_interface_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA_InterfaceDef::FullInterfaceDescription *fifd = 0; @@ -407,10 +407,10 @@ TAO_InterfaceDef_i::describe_interface_i (TAO_ENV_SINGLE_ARG_DECL) CORBA_InterfaceDef::FullInterfaceDescription_var retval = fifd; - fifd->name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER); + fifd->name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - fifd->id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER); + fifd->id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_TString container_id; @@ -421,7 +421,7 @@ TAO_InterfaceDef_i::describe_interface_i (TAO_ENV_SINGLE_ARG_DECL) fifd->defined_in = container_id.c_str (); - fifd->version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER); + fifd->version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::ULong i = 0; @@ -472,7 +472,7 @@ TAO_InterfaceDef_i::describe_interface_i (TAO_ENV_SINGLE_ARG_DECL) TAO_OperationDef_i op (this->repo_, key); - fifd->operations[i] = op.make_description (TAO_ENV_SINGLE_ARG_PARAMETER); + fifd->operations[i] = op.make_description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -520,11 +520,11 @@ TAO_InterfaceDef_i::describe_interface_i (TAO_ENV_SINGLE_ARG_DECL) TAO_AttributeDef_i attr (this->repo_, key); - fifd->attributes[i] = attr.make_description (TAO_ENV_SINGLE_ARG_PARAMETER); + fifd->attributes[i] = attr.make_description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); } - CORBA_InterfaceDefSeq_var bases = this->base_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_InterfaceDefSeq_var bases = this->base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::ULong length = bases->length (); @@ -541,7 +541,7 @@ TAO_InterfaceDef_i::describe_interface_i (TAO_ENV_SINGLE_ARG_DECL) { oid = this->repo_->ir_poa ()->reference_to_id (bases[i] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); base_path = @@ -555,13 +555,13 @@ TAO_InterfaceDef_i::describe_interface_i (TAO_ENV_SINGLE_ARG_DECL) TAO_InterfaceDef_i impl (this->repo_, base_key); - repo_ids[i] = impl.id_i (TAO_ENV_SINGLE_ARG_PARAMETER); + repo_ids[i] = impl.id_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); } fifd->base_interfaces = repo_ids; - fifd->type = this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + fifd->type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return retval._retn (); @@ -574,7 +574,7 @@ TAO_InterfaceDef_i::create_attribute ( const char *version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -585,7 +585,7 @@ TAO_InterfaceDef_i::create_attribute ( version, type, mode - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_AttributeDef_ptr @@ -595,20 +595,20 @@ TAO_InterfaceDef_i::create_attribute_i ( const char *version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean bad_params = this->pre_exist (id, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ()); if (bad_params) return CORBA_AttributeDef::_nil (); bad_params = this->check_inherited_attrs (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ()); if (bad_params) @@ -636,7 +636,7 @@ TAO_InterfaceDef_i::create_attribute_i ( // Store the path to the attribute's type definition. PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ()); CORBA::String_var type_path = @@ -657,7 +657,7 @@ TAO_InterfaceDef_i::create_attribute_i ( version, type, mode - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::AttributeDef::_nil ()); #if 0 // CCM specific. @@ -681,7 +681,7 @@ TAO_InterfaceDef_i::create_attribute_i ( { PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (get_exceptions[i] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ()); @@ -713,7 +713,7 @@ TAO_InterfaceDef_i::create_attribute_i ( { PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (put_exceptions[i] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ()); @@ -734,12 +734,12 @@ TAO_InterfaceDef_i::create_attribute_i ( CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_Attribute, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ()); CORBA_AttributeDef_var retval = CORBA_AttributeDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ()); return retval._retn (); @@ -754,7 +754,7 @@ TAO_InterfaceDef_i::create_operation (const char *id, const CORBA_ParDescriptionSeq ¶ms, const CORBA_ExceptionDefSeq &exceptions, const CORBA_ContextIdSeq &contexts - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_OperationDef::_nil ()); @@ -767,7 +767,7 @@ TAO_InterfaceDef_i::create_operation (const char *id, params, exceptions, contexts - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_OperationDef_ptr @@ -779,12 +779,12 @@ TAO_InterfaceDef_i::create_operation_i (const char *id, const CORBA_ParDescriptionSeq ¶ms, const CORBA_ExceptionDefSeq &exceptions, const CORBA_ContextIdSeq &contexts - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean bad_params = this->pre_exist (id, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_OperationDef::_nil ()); if (bad_params) @@ -811,9 +811,9 @@ TAO_InterfaceDef_i::create_operation_i (const char *id, "ops\\", CORBA::dk_Operation); - CORBA::TypeCode_var rettype = result->type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var rettype = result->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_OperationDef::_nil ()); - CORBA::TCKind kind = rettype->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind kind = rettype->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_OperationDef::_nil ()); // Oneway operations cannot have a non-void return type. @@ -827,7 +827,7 @@ TAO_InterfaceDef_i::create_operation_i (const char *id, // Get the path to our return type and store it. PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (result - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_OperationDef::_nil ()); CORBA::String_var result_path = @@ -883,7 +883,7 @@ TAO_InterfaceDef_i::create_operation_i (const char *id, params[i].name.in ()); PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (params[i].type_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_OperationDef::_nil ()); @@ -924,7 +924,7 @@ TAO_InterfaceDef_i::create_operation_i (const char *id, { PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (exceptions[i] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_OperationDef::_nil ()); @@ -965,12 +965,12 @@ TAO_InterfaceDef_i::create_operation_i (const char *id, CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_Operation, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_OperationDef::_nil ()); CORBA_OperationDef_var retval = CORBA_OperationDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_OperationDef::_nil ()); return retval._retn (); @@ -982,7 +982,7 @@ TAO_InterfaceDef_i::interface_contents ( ACE_Unbounded_Queue &path_queue, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1083,7 +1083,7 @@ TAO_InterfaceDef_i::interface_contents ( path_queue, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -1091,7 +1091,7 @@ TAO_InterfaceDef_i::interface_contents ( void TAO_InterfaceDef_i::destroy_special (const char *sub_section - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Configuration_Section_Key sub_key; @@ -1118,7 +1118,7 @@ TAO_InterfaceDef_i::destroy_special (const char *sub_section TAO_AttributeDef_i attr (this->repo_, member_key); - attr.destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + attr.destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } else @@ -1126,7 +1126,7 @@ TAO_InterfaceDef_i::destroy_special (const char *sub_section TAO_OperationDef_i op (this->repo_, member_key); - op.destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + op.destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } @@ -1139,7 +1139,7 @@ TAO_InterfaceDef_i::create_attr_ops (const char *id, const char *version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_CString the_get_name ("_get_"); @@ -1167,7 +1167,7 @@ TAO_InterfaceDef_i::create_attr_ops (const char *id, params, excepts, contexts - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (mode == CORBA::ATTR_NORMAL) @@ -1180,7 +1180,7 @@ TAO_InterfaceDef_i::create_attr_ops (const char *id, CORBA_PrimitiveDef_var rettype = this->repo_->get_primitive (CORBA::pk_void - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; params.length (1); @@ -1199,7 +1199,7 @@ TAO_InterfaceDef_i::create_attr_ops (const char *id, params, excepts, contexts - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -1365,7 +1365,7 @@ TAO_InterfaceDef_i::inherited_operations ( CORBA::Boolean TAO_InterfaceDef_i::check_inherited_attrs (const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Unbounded_Queue key_queue; diff --git a/TAO/orbsvcs/IFR_Service/InterfaceDef_i.h b/TAO/orbsvcs/IFR_Service/InterfaceDef_i.h index 88a237df5ad..28b0e3fd3cc 100644 --- a/TAO/orbsvcs/IFR_Service/InterfaceDef_i.h +++ b/TAO/orbsvcs/IFR_Service/InterfaceDef_i.h @@ -54,87 +54,87 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA_InterfaceDefSeq *base_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_InterfaceDefSeq *base_interfaces_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void base_interfaces ( const CORBA_InterfaceDefSeq &base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void base_interfaces_i ( const CORBA_InterfaceDefSeq &base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean is_a ( const char *interface_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Boolean is_a_i ( const char *interface_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_InterfaceDef::FullInterfaceDescription *describe_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_InterfaceDef::FullInterfaceDescription *describe_interface_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -144,7 +144,7 @@ public: const char *version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -154,7 +154,7 @@ public: const char *version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -167,7 +167,7 @@ public: const CORBA_ParDescriptionSeq ¶ms, const CORBA_ExceptionDefSeq &exceptions, const CORBA_ContextIdSeq &contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -180,7 +180,7 @@ public: const CORBA_ParDescriptionSeq ¶ms, const CORBA_ExceptionDefSeq &exceptions, const CORBA_ContextIdSeq &contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -189,7 +189,7 @@ public: ACE_Unbounded_Queue &path_queue, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Gathers the attributes and operations of all the ancestors. @@ -197,7 +197,7 @@ public: private: void destroy_special ( const char *sub_section - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Removed the repo ids of our attributes and operations from @@ -208,7 +208,7 @@ private: const char *version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Create set and/or get operations for an attribute. @@ -232,7 +232,7 @@ private: // operations. CORBA::Boolean check_inherited_attrs (const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // When creating a new attribute, check for a clash with an inherited // attribute name. diff --git a/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.cpp b/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.cpp index 06c9d510374..8443fc29d69 100644 --- a/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.cpp @@ -23,7 +23,7 @@ TAO_LocalInterfaceDef_i::~TAO_LocalInterfaceDef_i (void) } CORBA::DefinitionKind -TAO_LocalInterfaceDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_LocalInterfaceDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_LocalInterface; @@ -31,18 +31,18 @@ TAO_LocalInterfaceDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) CORBA::Boolean TAO_LocalInterfaceDef_i::is_a (const char *interface_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); return this->is_a_i (interface_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Boolean TAO_LocalInterfaceDef_i::is_a_i (const char *interface_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (ACE_OS::strcmp (interface_id, "IDL:omg.org/CORBA/LocalBase:1.0") == 0) @@ -51,5 +51,5 @@ TAO_LocalInterfaceDef_i::is_a_i (const char *interface_id } return this->TAO_InterfaceDef_i::is_a_i (interface_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.h b/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.h index 9c99c164af3..c4a9e3851b2 100644 --- a/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.h +++ b/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.h @@ -50,20 +50,20 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual CORBA::Boolean is_a ( const char *interface_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Boolean is_a_i ( const char *interface_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/ModuleDef_i.cpp b/TAO/orbsvcs/IFR_Service/ModuleDef_i.cpp index 81063de075e..9b3097ec619 100644 --- a/TAO/orbsvcs/IFR_Service/ModuleDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/ModuleDef_i.cpp @@ -19,45 +19,45 @@ TAO_ModuleDef_i::~TAO_ModuleDef_i (void) } CORBA::DefinitionKind -TAO_ModuleDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ModuleDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Module; } -void -TAO_ModuleDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +void +TAO_ModuleDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -void -TAO_ModuleDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL) +void +TAO_ModuleDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Destroy our members. - TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - + // Destroy ourself. - TAO_Contained_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Contained_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } CORBA_Contained::Description * -TAO_ModuleDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) +TAO_ModuleDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_ModuleDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_ModuleDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA_Contained::Description *desc_ptr = 0; @@ -68,15 +68,15 @@ TAO_ModuleDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) CORBA_Contained::Description_var retval = desc_ptr; - retval->kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA_ModuleDescription md; - md.name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER); + md.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - md.id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER); + md.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_TString container_id; @@ -87,7 +87,7 @@ TAO_ModuleDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) md.defined_in = container_id.c_str (); - md.version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER); + md.version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); retval->value <<= md; diff --git a/TAO/orbsvcs/IFR_Service/ModuleDef_i.h b/TAO/orbsvcs/IFR_Service/ModuleDef_i.h index d6f1c902c12..5b233dd642d 100644 --- a/TAO/orbsvcs/IFR_Service/ModuleDef_i.h +++ b/TAO/orbsvcs/IFR_Service/ModuleDef_i.h @@ -34,7 +34,7 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -class TAO_ModuleDef_i : public virtual TAO_Container_i, +class TAO_ModuleDef_i : public virtual TAO_Container_i, public virtual TAO_Contained_i { // = TITLE @@ -52,31 +52,31 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. diff --git a/TAO/orbsvcs/IFR_Service/NativeDef_i.cpp b/TAO/orbsvcs/IFR_Service/NativeDef_i.cpp index 458f8b216c1..366530bfa56 100644 --- a/TAO/orbsvcs/IFR_Service/NativeDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/NativeDef_i.cpp @@ -20,23 +20,23 @@ TAO_NativeDef_i::~TAO_NativeDef_i (void) } CORBA::DefinitionKind -TAO_NativeDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_NativeDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Native; } CORBA::TypeCode_ptr -TAO_NativeDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_NativeDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_NativeDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_NativeDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString id; @@ -51,6 +51,6 @@ TAO_NativeDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) return this->repo_->tc_factory ()->create_native_tc (id.c_str (), name.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/IFR_Service/NativeDef_i.h b/TAO/orbsvcs/IFR_Service/NativeDef_i.h index b3e758f97ac..1f5000782ac 100644 --- a/TAO/orbsvcs/IFR_Service/NativeDef_i.h +++ b/TAO/orbsvcs/IFR_Service/NativeDef_i.h @@ -51,19 +51,19 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. diff --git a/TAO/orbsvcs/IFR_Service/OperationDef_i.cpp b/TAO/orbsvcs/IFR_Service/OperationDef_i.cpp index 93a972df3bb..f5cc22de14a 100644 --- a/TAO/orbsvcs/IFR_Service/OperationDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/OperationDef_i.cpp @@ -24,23 +24,23 @@ TAO_OperationDef_i::~TAO_OperationDef_i (void) } CORBA::DefinitionKind -TAO_OperationDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_OperationDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Operation; } CORBA_Contained::Description * -TAO_OperationDef_i::describe (TAO_ENV_SINGLE_ARG_DECL ) +TAO_OperationDef_i::describe (ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_OperationDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL ) +TAO_OperationDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA_Contained::Description *desc_ptr = 0; @@ -51,26 +51,26 @@ TAO_OperationDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL ) CORBA_Contained::Description_var retval = desc_ptr; - retval->kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - retval->value <<= this->make_description (TAO_ENV_SINGLE_ARG_PARAMETER); + retval->value <<= this->make_description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return retval._retn (); } CORBA::TypeCode_ptr -TAO_OperationDef_i::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_OperationDef_i::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->result_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->result_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_OperationDef_i::result_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_OperationDef_i::result_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString result_path; @@ -86,25 +86,25 @@ TAO_OperationDef_i::result_i (TAO_ENV_SINGLE_ARG_DECL) TAO_IDLType_i *impl = this->repo_->servant_factory ()->create_idltype (result_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); auto_ptr safety (impl); - return impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_IDLType_ptr -TAO_OperationDef_i::result_def (TAO_ENV_SINGLE_ARG_DECL) +TAO_OperationDef_i::result_def (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ()); - return this->result_def_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->result_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_IDLType_ptr -TAO_OperationDef_i::result_def_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_OperationDef_i::result_def_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString result_path; @@ -129,32 +129,32 @@ TAO_OperationDef_i::result_def_i (TAO_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (def_kind, result_path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_IDLType::_nil ()); return CORBA_IDLType::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_OperationDef_i::result_def (CORBA_IDLType_ptr result_def - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->result_def_i (result_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_OperationDef_i::result_def_i (CORBA_IDLType_ptr result_def - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (result_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var result_path = @@ -166,16 +166,16 @@ TAO_OperationDef_i::result_def_i (CORBA_IDLType_ptr result_def } CORBA_ParDescriptionSeq * -TAO_OperationDef_i::params (TAO_ENV_SINGLE_ARG_DECL) +TAO_OperationDef_i::params (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->params_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->params_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_ParDescriptionSeq * -TAO_OperationDef_i::params_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_OperationDef_i::params_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong i = 0; @@ -258,12 +258,12 @@ TAO_OperationDef_i::params_i (TAO_ENV_SINGLE_ARG_DECL) TAO_IDLType_i *impl = this->repo_->servant_factory ()->create_idltype (type_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); auto_ptr safety (impl); - retval[i].type = impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + retval[i].type = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); u_int kind = 0; @@ -277,11 +277,11 @@ TAO_OperationDef_i::params_i (TAO_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (def_kind, type_path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); retval[i].type_def = CORBA_IDLType::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -290,18 +290,18 @@ TAO_OperationDef_i::params_i (TAO_ENV_SINGLE_ARG_DECL) void TAO_OperationDef_i::params (const CORBA_ParDescriptionSeq ¶ms - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->params_i (params - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_OperationDef_i::params_i (const CORBA_ParDescriptionSeq ¶ms - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->remove_section (this->section_key_, @@ -338,7 +338,7 @@ TAO_OperationDef_i::params_i (const CORBA_ParDescriptionSeq ¶ms params[i].name.in ()); PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (params[i].type_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var type_path = @@ -355,16 +355,16 @@ TAO_OperationDef_i::params_i (const CORBA_ParDescriptionSeq ¶ms } CORBA::OperationMode -TAO_OperationDef_i::mode (TAO_ENV_SINGLE_ARG_DECL) +TAO_OperationDef_i::mode (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::OP_NORMAL); - return this->mode_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->mode_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::OperationMode -TAO_OperationDef_i::mode_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_OperationDef_i::mode_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { u_int mode; @@ -377,18 +377,18 @@ TAO_OperationDef_i::mode_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_OperationDef_i::mode (CORBA::OperationMode mode - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->mode_i (mode - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_OperationDef_i::mode_i (CORBA::OperationMode mode - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->set_integer_value (this->section_key_, @@ -397,16 +397,16 @@ TAO_OperationDef_i::mode_i (CORBA::OperationMode mode } CORBA_ContextIdSeq * -TAO_OperationDef_i::contexts (TAO_ENV_SINGLE_ARG_DECL) +TAO_OperationDef_i::contexts (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->contexts_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->contexts_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_ContextIdSeq * -TAO_OperationDef_i::contexts_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_OperationDef_i::contexts_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Configuration_Section_Key contexts_key; @@ -462,18 +462,18 @@ TAO_OperationDef_i::contexts_i (TAO_ENV_SINGLE_ARG_DECL) void TAO_OperationDef_i::contexts (const CORBA_ContextIdSeq &contexts - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->contexts_i (contexts - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_OperationDef_i::contexts_i (const CORBA_ContextIdSeq &contexts - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->remove_section (this->section_key_, @@ -502,16 +502,16 @@ TAO_OperationDef_i::contexts_i (const CORBA_ContextIdSeq &contexts } CORBA_ExceptionDefSeq * -TAO_OperationDef_i::exceptions (TAO_ENV_SINGLE_ARG_DECL ) +TAO_OperationDef_i::exceptions (ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->exceptions_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->exceptions_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_ExceptionDefSeq * -TAO_OperationDef_i::exceptions_i (TAO_ENV_SINGLE_ARG_DECL ) +TAO_OperationDef_i::exceptions_i (ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Configuration_Section_Key excepts_key; @@ -592,11 +592,11 @@ TAO_OperationDef_i::exceptions_i (TAO_ENV_SINGLE_ARG_DECL ) CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (def_kind, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); retval[i] = CORBA_ExceptionDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -605,18 +605,18 @@ TAO_OperationDef_i::exceptions_i (TAO_ENV_SINGLE_ARG_DECL ) void TAO_OperationDef_i::exceptions (const CORBA_ExceptionDefSeq &exceptions - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->exceptions_i (exceptions - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_OperationDef_i::exceptions_i (const CORBA_ExceptionDefSeq &exceptions - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->remove_section (this->section_key_, @@ -638,7 +638,7 @@ TAO_OperationDef_i::exceptions_i (const CORBA_ExceptionDefSeq &exceptions { PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (exceptions[i] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var type_path = @@ -655,15 +655,15 @@ TAO_OperationDef_i::exceptions_i (const CORBA_ExceptionDefSeq &exceptions CORBA_OperationDescription TAO_OperationDef_i::make_description ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA_OperationDescription od; - od.name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER); + od.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (od); - od.id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER); + od.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (od); ACE_TString container_id; @@ -673,21 +673,21 @@ TAO_OperationDef_i::make_description ( od.defined_in = container_id.c_str (); - od.version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER); + od.version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (od); - od.result = this->result_i (TAO_ENV_SINGLE_ARG_PARAMETER); + od.result = this->result_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (od); - od.mode = this->mode_i (TAO_ENV_SINGLE_ARG_PARAMETER); + od.mode = this->mode_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (od); - CORBA_ContextIdSeq_var cid_seq = this->contexts_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_ContextIdSeq_var cid_seq = this->contexts_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (od); od.contexts = cid_seq.in (); - CORBA_ParDescriptionSeq_var pd_seq = this->params_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_ParDescriptionSeq_var pd_seq = this->params_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (od); od.parameters = pd_seq.in (); @@ -771,7 +771,7 @@ TAO_OperationDef_i::make_description ( TAO_ExceptionDef_i impl (this->repo_, type_key); - od.exceptions[i].type = impl.type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + od.exceptions[i].type = impl.type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (od); } } diff --git a/TAO/orbsvcs/IFR_Service/OperationDef_i.h b/TAO/orbsvcs/IFR_Service/OperationDef_i.h index 165d3a23d39..e01332200fa 100644 --- a/TAO/orbsvcs/IFR_Service/OperationDef_i.h +++ b/TAO/orbsvcs/IFR_Service/OperationDef_i.h @@ -51,145 +51,145 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA::TypeCode_ptr result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr result_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_IDLType_ptr result_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_IDLType_ptr result_def_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void result_def ( CORBA_IDLType_ptr result_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result_def_i ( CORBA_IDLType_ptr result_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_ParDescriptionSeq *params ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_ParDescriptionSeq *params_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void params ( const CORBA_ParDescriptionSeq ¶ms - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void params_i ( const CORBA_ParDescriptionSeq ¶ms - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::OperationMode mode ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::OperationMode mode_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void mode ( CORBA::OperationMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void mode_i ( CORBA::OperationMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_ContextIdSeq *contexts ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_ContextIdSeq *contexts_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void contexts ( const CORBA_ContextIdSeq &contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void contexts_i ( const CORBA_ContextIdSeq &contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_ExceptionDefSeq *exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_ExceptionDefSeq *exceptions_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void exceptions ( const CORBA_ExceptionDefSeq &exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void exceptions_i ( const CORBA_ExceptionDefSeq &exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_OperationDescription make_description ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Common code for InterfaceDef to call in diff --git a/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.cpp b/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.cpp index f293fdee802..e52de82784f 100644 --- a/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.cpp @@ -20,39 +20,39 @@ TAO_PrimaryKeyDef_i::~TAO_PrimaryKeyDef_i (void) } CORBA::DefinitionKind -TAO_PrimaryKeyDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_PrimaryKeyDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_PrimaryKey; } void -TAO_PrimaryKeyDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_PrimaryKeyDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_PrimaryKeyDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_PrimaryKeyDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA_Contained::Description * -TAO_PrimaryKeyDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) +TAO_PrimaryKeyDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_PrimaryKeyDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_PrimaryKeyDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -61,18 +61,18 @@ TAO_PrimaryKeyDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SIN CORBA::Boolean TAO_PrimaryKeyDef_i::is_a (const char *primary_key_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); return this->is_a_i (primary_key_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Boolean TAO_PrimaryKeyDef_i::is_a_i (const char * /* primary_key_id */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ ) + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -80,16 +80,16 @@ TAO_PrimaryKeyDef_i::is_a_i (const char * /* primary_key_id */ } CORBA_ValueDef_ptr -TAO_PrimaryKeyDef_i::primary_key (TAO_ENV_SINGLE_ARG_DECL) +TAO_PrimaryKeyDef_i::primary_key (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA_ValueDef::_nil ()); - return this->primary_key_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->primary_key_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_ValueDef_ptr -TAO_PrimaryKeyDef_i::primary_key_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_PrimaryKeyDef_i::primary_key_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO diff --git a/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.h b/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.h index 4c937962cf7..4e5dcaab2bc 100644 --- a/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.h +++ b/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.h @@ -52,53 +52,53 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA::Boolean is_a ( const char *primary_key_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Boolean is_a_i ( const char *primary_key_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_ValueDef_ptr primary_key ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_ValueDef_ptr primary_key_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.cpp b/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.cpp index f6343693d55..6e200e14027 100644 --- a/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.cpp @@ -20,37 +20,37 @@ TAO_PrimitiveDef_i::~TAO_PrimitiveDef_i (void) } CORBA::DefinitionKind -TAO_PrimitiveDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_PrimitiveDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Primitive; } -void -TAO_PrimitiveDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +void +TAO_PrimitiveDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -void -TAO_PrimitiveDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL) +void +TAO_PrimitiveDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW (CORBA::BAD_INV_ORDER (2, CORBA::COMPLETED_NO)); } -CORBA::TypeCode_ptr -TAO_PrimitiveDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +CORBA::TypeCode_ptr +TAO_PrimitiveDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA::TypeCode_ptr -TAO_PrimitiveDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +CORBA::TypeCode_ptr +TAO_PrimitiveDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { u_int pkind = 0; @@ -109,17 +109,17 @@ TAO_PrimitiveDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } } -CORBA::PrimitiveKind -TAO_PrimitiveDef_i::kind (TAO_ENV_SINGLE_ARG_DECL) +CORBA::PrimitiveKind +TAO_PrimitiveDef_i::kind (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::pk_null); - return this->kind_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->kind_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA::PrimitiveKind -TAO_PrimitiveDef_i::kind_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +CORBA::PrimitiveKind +TAO_PrimitiveDef_i::kind_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { u_int pkind = 0; diff --git a/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.h b/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.h index 93bd5663df3..d4cbe2f096c 100644 --- a/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.h +++ b/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.h @@ -50,42 +50,42 @@ public: // Destructor. virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // May not be called on a primitive kind - raises BAD_INV_ORDER. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Must implement this here because it's pure virtual in the // base class. virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::PrimitiveKind kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::PrimitiveKind kind_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/ProvidesDef_i.cpp b/TAO/orbsvcs/IFR_Service/ProvidesDef_i.cpp index 67d87d93f3a..80e73290122 100644 --- a/TAO/orbsvcs/IFR_Service/ProvidesDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/ProvidesDef_i.cpp @@ -20,56 +20,56 @@ TAO_ProvidesDef_i::~TAO_ProvidesDef_i (void) } CORBA::DefinitionKind -TAO_ProvidesDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ProvidesDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Provides; } -void -TAO_ProvidesDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +void +TAO_ProvidesDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -void -TAO_ProvidesDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +void +TAO_ProvidesDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA_Contained::Description * -TAO_ProvidesDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) +TAO_ProvidesDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_ProvidesDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ProvidesDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO return 0; } -CORBA_InterfaceDef_ptr -TAO_ProvidesDef_i::interface_type (TAO_ENV_SINGLE_ARG_DECL) +CORBA_InterfaceDef_ptr +TAO_ProvidesDef_i::interface_type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA_InterfaceDef::_nil ()); - return this->interface_type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->interface_type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_InterfaceDef_ptr -TAO_ProvidesDef_i::interface_type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +CORBA_InterfaceDef_ptr +TAO_ProvidesDef_i::interface_type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO diff --git a/TAO/orbsvcs/IFR_Service/ProvidesDef_i.h b/TAO/orbsvcs/IFR_Service/ProvidesDef_i.h index 519bb360a63..5cd1e50fcbc 100644 --- a/TAO/orbsvcs/IFR_Service/ProvidesDef_i.h +++ b/TAO/orbsvcs/IFR_Service/ProvidesDef_i.h @@ -50,41 +50,41 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_InterfaceDef_ptr interface_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_InterfaceDef_ptr interface_type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/PublishesDef_i.cpp b/TAO/orbsvcs/IFR_Service/PublishesDef_i.cpp index 3010f401007..044d7b67bf3 100644 --- a/TAO/orbsvcs/IFR_Service/PublishesDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/PublishesDef_i.cpp @@ -21,39 +21,39 @@ TAO_PublishesDef_i::~TAO_PublishesDef_i (void) } CORBA::DefinitionKind -TAO_PublishesDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_PublishesDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Publishes; } -void -TAO_PublishesDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +void +TAO_PublishesDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -void -TAO_PublishesDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +void +TAO_PublishesDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA_Contained::Description * -TAO_PublishesDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) +TAO_PublishesDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_PublishesDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_PublishesDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO diff --git a/TAO/orbsvcs/IFR_Service/PublishesDef_i.h b/TAO/orbsvcs/IFR_Service/PublishesDef_i.h index 6e68f4b1f91..b33c970c958 100644 --- a/TAO/orbsvcs/IFR_Service/PublishesDef_i.h +++ b/TAO/orbsvcs/IFR_Service/PublishesDef_i.h @@ -51,30 +51,30 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. diff --git a/TAO/orbsvcs/IFR_Service/Repository_i.cpp b/TAO/orbsvcs/IFR_Service/Repository_i.cpp index f0bddca277e..ffc9f68dac3 100644 --- a/TAO/orbsvcs/IFR_Service/Repository_i.cpp +++ b/TAO/orbsvcs/IFR_Service/Repository_i.cpp @@ -48,14 +48,14 @@ TAO_Repository_i::TAO_Repository_i (CORBA::ORB_ptr orb, // Resolve and narrow the TypeCodeFactory. CORBA::Object_var object = this->orb_->resolve_initial_references ("TypeCodeFactory" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!CORBA::is_nil (object.in ())) { this->tc_factory_ = CORBA::TypeCodeFactory::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (this->tc_factory_.in ())) @@ -215,14 +215,14 @@ TAO_Repository_i::~TAO_Repository_i (void) } CORBA::DefinitionKind -TAO_Repository_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Repository_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Repository; } void -TAO_Repository_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_Repository_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW (CORBA::BAD_INV_ORDER (2, CORBA::COMPLETED_NO)); @@ -230,18 +230,18 @@ TAO_Repository_i::destroy (TAO_ENV_SINGLE_ARG_DECL) CORBA_Contained_ptr TAO_Repository_i::lookup_id (const char *search_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA_Contained::_nil ()); return this->lookup_id_i (search_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_Contained_ptr TAO_Repository_i::lookup_id_i (const char *search_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (ACE_OS::strcmp (search_id, "IDL:omg.org/CORBA/Object:1.0") == 0 @@ -275,30 +275,30 @@ TAO_Repository_i::lookup_id_i (const char *search_id CORBA::Object_var obj = this->servant_factory_->create_objref (def_kind, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_Contained::_nil ()); return CORBA_Contained::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr TAO_Repository_i::get_canonical_typecode (CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); return this->get_canonical_typecode_i (tc - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); switch (kind) @@ -310,37 +310,37 @@ TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ()); case CORBA::tk_array: { - CORBA::ULong length = tc->length (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); - CORBA::TypeCode_var ctype = tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var ctype = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); CORBA::TypeCode_var canon_ctype = this->get_canonical_typecode_i (ctype.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); return this->tc_factory ()->create_array_tc (length, canon_ctype.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } case CORBA::tk_sequence: { - CORBA::ULong length = tc->length (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); - CORBA::TypeCode_var ctype = tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var ctype = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); CORBA::TypeCode_var canon_ctype = this->get_canonical_typecode_i (ctype.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); return this->tc_factory ()->create_sequence_tc (length, canon_ctype.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } case CORBA::tk_alias: case CORBA::tk_objref: @@ -355,7 +355,7 @@ TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc case CORBA::tk_component: case CORBA::tk_home: { - CORBA::String_var id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); ACE_TString path; @@ -381,18 +381,18 @@ TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc TAO_ExceptionDef_i impl (this, key); - return impl.type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return impl.type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } else { TAO_IDLType_i *impl = this->servant_factory ()->create_idltype (key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); auto_ptr safety (impl); - return impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } } } @@ -400,7 +400,7 @@ TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc CORBA_PrimitiveDef_ptr TAO_Repository_i::get_primitive (CORBA::PrimitiveKind kind - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString obj_id ("pkinds\\"); @@ -410,27 +410,27 @@ TAO_Repository_i::get_primitive (CORBA::PrimitiveKind kind CORBA::Object_var obj = this->servant_factory_->create_objref (CORBA::dk_Primitive, obj_id.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_PrimitiveDef::_nil ()); return CORBA_PrimitiveDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_StringDef_ptr TAO_Repository_i::create_string (CORBA::ULong bound - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_StringDef::_nil ()); return this->create_string_i (bound - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_StringDef_ptr TAO_Repository_i::create_string_i (CORBA::ULong bound - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { u_int count = 0; @@ -469,27 +469,27 @@ TAO_Repository_i::create_string_i (CORBA::ULong bound CORBA::Object_var obj = this->servant_factory_->create_objref (CORBA::dk_String, obj_id.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_StringDef::_nil ()); return CORBA_StringDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_WstringDef_ptr TAO_Repository_i::create_wstring (CORBA::ULong bound - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_WstringDef::_nil ()); return this->create_wstring_i (bound - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_WstringDef_ptr TAO_Repository_i::create_wstring_i (CORBA::ULong bound - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { u_int count = 0; @@ -528,35 +528,35 @@ TAO_Repository_i::create_wstring_i (CORBA::ULong bound CORBA::Object_var obj = this->servant_factory_->create_objref (CORBA::dk_Wstring, obj_id.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_WstringDef::_nil ()); return CORBA_WstringDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_SequenceDef_ptr TAO_Repository_i::create_sequence (CORBA::ULong bound, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_SequenceDef::_nil ()); return this->create_sequence_i (bound, element_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_SequenceDef_ptr TAO_Repository_i::create_sequence_i (CORBA::ULong bound, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ObjectId_var oid = this->ir_poa_->reference_to_id (element_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_SequenceDef::_nil ()); CORBA::String_var element_path = @@ -606,35 +606,35 @@ TAO_Repository_i::create_sequence_i (CORBA::ULong bound, CORBA::Object_var obj = this->servant_factory_->create_objref (CORBA::dk_Sequence, obj_id.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_SequenceDef::_nil ()); return CORBA_SequenceDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_ArrayDef_ptr TAO_Repository_i::create_array (CORBA::ULong length, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_ArrayDef::_nil ()); return this->create_array_i (length, element_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_ArrayDef_ptr TAO_Repository_i::create_array_i (CORBA::ULong length, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ObjectId_var oid = this->ir_poa_->reference_to_id (element_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ArrayDef::_nil ()); CORBA::String_var element_path = @@ -684,30 +684,30 @@ TAO_Repository_i::create_array_i (CORBA::ULong length, CORBA::Object_var obj = this->servant_factory_->create_objref (CORBA::dk_Array, obj_id.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ArrayDef::_nil ()); return CORBA_ArrayDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_FixedDef_ptr TAO_Repository_i::create_fixed (CORBA::UShort digits, CORBA::Short scale - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_FixedDef::_nil ()); return this->create_fixed_i (digits, scale - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_FixedDef_ptr TAO_Repository_i::create_fixed_i (CORBA::UShort /* digits */, CORBA::Short /* scale */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA_FixedDef::_nil ()); diff --git a/TAO/orbsvcs/IFR_Service/Repository_i.h b/TAO/orbsvcs/IFR_Service/Repository_i.h index 57afd79f4fc..647a0572d24 100644 --- a/TAO/orbsvcs/IFR_Service/Repository_i.h +++ b/TAO/orbsvcs/IFR_Service/Repository_i.h @@ -58,44 +58,44 @@ public: // Destructor. virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Accessor for the readonly attribute. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // May not be called on a repository - raises BAD_INV_ORDER. virtual CORBA_Contained_ptr lookup_id ( const char *search_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_Contained_ptr lookup_id_i ( const char *search_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr get_canonical_typecode ( CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr get_canonical_typecode_i ( CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::PrimitiveDef_ptr get_primitive ( CORBA::PrimitiveKind kind - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException)); // No locking necessary because the database is not @@ -103,67 +103,67 @@ public: virtual CORBA_StringDef_ptr create_string ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_StringDef_ptr create_string_i ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_WstringDef_ptr create_wstring ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_WstringDef_ptr create_wstring_i ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_SequenceDef_ptr create_sequence ( CORBA::ULong bound, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException)); CORBA_SequenceDef_ptr create_sequence_i ( CORBA::ULong bound, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException)); virtual CORBA_ArrayDef_ptr create_array ( CORBA::ULong length, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_ArrayDef_ptr create_array_i ( CORBA::ULong length, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_FixedDef_ptr create_fixed ( CORBA::UShort digits, CORBA::Short scale - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_FixedDef_ptr create_fixed_i ( CORBA::UShort digits, CORBA::Short scale - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/orbsvcs/IFR_Service/SequenceDef_i.cpp b/TAO/orbsvcs/IFR_Service/SequenceDef_i.cpp index b60466363bc..e84948ad205 100644 --- a/TAO/orbsvcs/IFR_Service/SequenceDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/SequenceDef_i.cpp @@ -22,27 +22,27 @@ TAO_SequenceDef_i::~TAO_SequenceDef_i (void) } CORBA::DefinitionKind -TAO_SequenceDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_SequenceDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Sequence; } void -TAO_SequenceDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_SequenceDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_SequenceDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_SequenceDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Only if it is (w)string, fixed, array or sequence. - this->destroy_element_type (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_element_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_TString name; @@ -56,43 +56,43 @@ TAO_SequenceDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL) } CORBA::TypeCode_ptr -TAO_SequenceDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_SequenceDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_SequenceDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_SequenceDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::TypeCode_var element_typecode = - this->element_type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->element_type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); - CORBA::ULong bound = this->bound_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong bound = this->bound_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); return this->repo_->tc_factory ()->create_sequence_tc ( bound, element_typecode.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA::ULong -TAO_SequenceDef_i::bound (TAO_ENV_SINGLE_ARG_DECL) +TAO_SequenceDef_i::bound (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->bound_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->bound_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::ULong -TAO_SequenceDef_i::bound_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_SequenceDef_i::bound_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { u_int bound = 0; @@ -105,18 +105,18 @@ TAO_SequenceDef_i::bound_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_SequenceDef_i::bound (CORBA::ULong bound - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->bound_i (bound - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_SequenceDef_i::bound_i (CORBA::ULong bound - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->set_integer_value (this->section_key_, @@ -125,16 +125,16 @@ TAO_SequenceDef_i::bound_i (CORBA::ULong bound } CORBA::TypeCode_ptr -TAO_SequenceDef_i::element_type (TAO_ENV_SINGLE_ARG_DECL) +TAO_SequenceDef_i::element_type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->element_type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->element_type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_SequenceDef_i::element_type_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_SequenceDef_i::element_type_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString element_path; @@ -150,25 +150,25 @@ TAO_SequenceDef_i::element_type_i (TAO_ENV_SINGLE_ARG_DECL) TAO_IDLType_i *impl = this->repo_->servant_factory ()->create_idltype (element_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); auto_ptr safety (impl); - return impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_IDLType_ptr -TAO_SequenceDef_i::element_type_def (TAO_ENV_SINGLE_ARG_DECL) +TAO_SequenceDef_i::element_type_def (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ()); - return this->element_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->element_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_IDLType_ptr -TAO_SequenceDef_i::element_type_def_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_SequenceDef_i::element_type_def_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString element_path; @@ -193,35 +193,35 @@ TAO_SequenceDef_i::element_type_def_i (TAO_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (def_kind, element_path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_IDLType::_nil ()); return CORBA_IDLType::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_SequenceDef_i::element_type_def (CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->element_type_def_i (element_type_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_SequenceDef_i::element_type_def_i (CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->destroy_element_type (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_element_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (element_type_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var element_path = @@ -234,7 +234,7 @@ TAO_SequenceDef_i::element_type_def_i (CORBA_IDLType_ptr element_type_def void TAO_SequenceDef_i::destroy_element_type ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString element_path; @@ -269,12 +269,12 @@ TAO_SequenceDef_i::destroy_element_type ( { TAO_IDLType_i *impl = this->repo_->servant_factory ()->create_idltype (element_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; auto_ptr safety (impl); - impl->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + impl->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; break; diff --git a/TAO/orbsvcs/IFR_Service/SequenceDef_i.h b/TAO/orbsvcs/IFR_Service/SequenceDef_i.h index 061e91adc6e..7ec49a80cad 100644 --- a/TAO/orbsvcs/IFR_Service/SequenceDef_i.h +++ b/TAO/orbsvcs/IFR_Service/SequenceDef_i.h @@ -50,91 +50,91 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA::ULong bound ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::ULong bound_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void bound ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void bound_i ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr element_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr element_type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_IDLType_ptr element_type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_IDLType_ptr element_type_def_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void element_type_def ( CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void element_type_def_i ( CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: void destroy_element_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Destroys an anonymous non-primitive element type. diff --git a/TAO/orbsvcs/IFR_Service/Servant_Factory.cpp b/TAO/orbsvcs/IFR_Service/Servant_Factory.cpp index 7b168fb9cb0..64cd9fb8ff7 100644 --- a/TAO/orbsvcs/IFR_Service/Servant_Factory.cpp +++ b/TAO/orbsvcs/IFR_Service/Servant_Factory.cpp @@ -15,7 +15,7 @@ IFR_Servant_Factory::IFR_Servant_Factory (TAO_Repository_i *repo) TAO_IDLType_i * IFR_Servant_Factory::create_idltype ( ACE_Configuration_Section_Key servant_key - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { u_int def_kind = 0; @@ -231,7 +231,7 @@ IFR_Servant_Factory::create_idltype ( TAO_Contained_i * IFR_Servant_Factory::create_contained ( ACE_Configuration_Section_Key servant_key - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { u_int def_kind = 0; @@ -513,7 +513,7 @@ IFR_Servant_Factory::create_contained ( TAO_Container_i * IFR_Servant_Factory::create_container ( ACE_Configuration_Section_Key servant_key - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { u_int def_kind = 0; @@ -642,7 +642,7 @@ PortableServer::Servant IFR_Servant_Factory::create_tie ( ACE_Configuration_Section_Key servant_key, PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { u_int def_kind = 0; @@ -1370,7 +1370,7 @@ IFR_Servant_Factory::create_tie ( CORBA::Object_ptr IFR_Servant_Factory::create_objref (CORBA::DefinitionKind def_kind, const char *obj_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { PortableServer::ObjectId_var oid = PortableServer::string_to_ObjectId (obj_id); @@ -1488,5 +1488,5 @@ IFR_Servant_Factory::create_objref (CORBA::DefinitionKind def_kind, return this->repo_->ir_poa ()->create_reference_with_id (oid.in (), repo_id.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/IFR_Service/Servant_Factory.h b/TAO/orbsvcs/IFR_Service/Servant_Factory.h index 8c2657f65d3..dd9b29d1934 100644 --- a/TAO/orbsvcs/IFR_Service/Servant_Factory.h +++ b/TAO/orbsvcs/IFR_Service/Servant_Factory.h @@ -47,28 +47,28 @@ public: // constructor TAO_IDLType_i *create_idltype (ACE_Configuration_Section_Key key - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // For internal use - faster than creating an object reference and // sending a request, and can call utility functions not in IDL. TAO_Contained_i *create_contained (ACE_Configuration_Section_Key key - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // For internal use - faster than creating an object reference and // sending a request, and can call utility functions not in IDL. TAO_Container_i *create_container (ACE_Configuration_Section_Key key - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // For internal use - faster than creating an object reference and // sending a request, and can call utility functions not in IDL. PortableServer::Servant create_tie (ACE_Configuration_Section_Key key, PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Used by the servant locator to create a servant. CORBA::Object_ptr create_objref (CORBA::DefinitionKind def_kind, const char *obj_id - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Used to create return values. private: TAO_Repository_i *repo_; diff --git a/TAO/orbsvcs/IFR_Service/Servant_Locator.cpp b/TAO/orbsvcs/IFR_Service/Servant_Locator.cpp index effbe438f55..4065aead98c 100644 --- a/TAO/orbsvcs/IFR_Service/Servant_Locator.cpp +++ b/TAO/orbsvcs/IFR_Service/Servant_Locator.cpp @@ -17,7 +17,7 @@ IFR_ServantLocator::preinvoke ( PortableServer::POA_ptr poa, const char * /* operation */, PortableServer::ServantLocator::Cookie &cookie - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)) @@ -41,7 +41,7 @@ IFR_ServantLocator::preinvoke ( PortableServer::Servant servant = this->repo_->servant_factory ()->create_tie (servant_key, poa - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); cookie = servant; @@ -56,7 +56,7 @@ IFR_ServantLocator::postinvoke ( const char * /* operation */, PortableServer::ServantLocator::Cookie /* cookie */, PortableServer::Servant servant - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/orbsvcs/IFR_Service/Servant_Locator.h b/TAO/orbsvcs/IFR_Service/Servant_Locator.h index 51c681a1501..9a2293854b9 100644 --- a/TAO/orbsvcs/IFR_Service/Servant_Locator.h +++ b/TAO/orbsvcs/IFR_Service/Servant_Locator.h @@ -45,7 +45,7 @@ public: PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie &the_cookie - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)); @@ -58,7 +58,7 @@ public: const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)); // This method is invoked whenever an IR object servant completes a diff --git a/TAO/orbsvcs/IFR_Service/StringDef_i.cpp b/TAO/orbsvcs/IFR_Service/StringDef_i.cpp index c84ee3c3fa5..b536f8981f5 100644 --- a/TAO/orbsvcs/IFR_Service/StringDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/StringDef_i.cpp @@ -18,23 +18,23 @@ TAO_StringDef_i::~TAO_StringDef_i (void) } CORBA::DefinitionKind -TAO_StringDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_StringDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_String; } void -TAO_StringDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_StringDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_StringDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_StringDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString name; @@ -48,38 +48,38 @@ TAO_StringDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } CORBA::TypeCode_ptr -TAO_StringDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_StringDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_StringDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_StringDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::ULong bound = this->bound_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong bound = this->bound_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); return this->repo_->tc_factory ()->create_string_tc ( bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA::ULong -TAO_StringDef_i::bound (TAO_ENV_SINGLE_ARG_DECL) +TAO_StringDef_i::bound (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->bound_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->bound_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::ULong -TAO_StringDef_i::bound_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_StringDef_i::bound_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { u_int retval = 0; @@ -92,18 +92,18 @@ TAO_StringDef_i::bound_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_StringDef_i::bound (CORBA::ULong bound - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->bound_i (bound - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_StringDef_i::bound_i (CORBA::ULong bound - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->set_integer_value (this->section_key_, diff --git a/TAO/orbsvcs/IFR_Service/StringDef_i.h b/TAO/orbsvcs/IFR_Service/StringDef_i.h index 4ed4bb83f14..6bc502446e3 100644 --- a/TAO/orbsvcs/IFR_Service/StringDef_i.h +++ b/TAO/orbsvcs/IFR_Service/StringDef_i.h @@ -51,53 +51,53 @@ public: // Destructor. virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA::ULong bound ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::ULong bound_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void bound ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void bound_i ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/StructDef_i.cpp b/TAO/orbsvcs/IFR_Service/StructDef_i.cpp index acb2883004c..08dfaa51490 100644 --- a/TAO/orbsvcs/IFR_Service/StructDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/StructDef_i.cpp @@ -23,45 +23,45 @@ TAO_StructDef_i::~TAO_StructDef_i (void) } CORBA::DefinitionKind -TAO_StructDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_StructDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Struct; } void -TAO_StructDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_StructDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_StructDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_StructDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Destroy our members. - TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Destroy ourself. - TAO_Contained_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Contained_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } CORBA::TypeCode_ptr -TAO_StructDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_StructDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_StructDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_StructDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString id; @@ -74,26 +74,26 @@ TAO_StructDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) "name", name); - CORBA_StructMemberSeq_var members = this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_StructMemberSeq_var members = this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); return this->repo_->tc_factory ()->create_struct_tc (id.c_str (), name.c_str (), members.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_StructMemberSeq * -TAO_StructDef_i::members (TAO_ENV_SINGLE_ARG_DECL) +TAO_StructDef_i::members (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_StructMemberSeq * -TAO_StructDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_StructDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Unbounded_Queue kind_queue; @@ -187,11 +187,11 @@ TAO_StructDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL) obj = this->repo_->servant_factory ()->create_objref (kind, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); retval[k].type_def = CORBA_IDLType::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); this->repo_->config ()->expand_path (this->repo_->root_key (), @@ -201,12 +201,12 @@ TAO_StructDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL) impl = this->repo_->servant_factory ()->create_idltype (member_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); auto_ptr safety (impl); - retval[k].type = impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + retval[k].type = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -215,22 +215,22 @@ TAO_StructDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL) void TAO_StructDef_i::members (const CORBA_StructMemberSeq &members - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->members_i (members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_StructDef_i::members_i (const CORBA_StructMemberSeq &members - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Destroy our old members, both refs and defns. - TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::ULong count = members.length (); @@ -260,7 +260,7 @@ TAO_StructDef_i::members_i (const CORBA_StructMemberSeq &members PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var path = diff --git a/TAO/orbsvcs/IFR_Service/StructDef_i.h b/TAO/orbsvcs/IFR_Service/StructDef_i.h index 0249cafeadc..cf3836abc29 100644 --- a/TAO/orbsvcs/IFR_Service/StructDef_i.h +++ b/TAO/orbsvcs/IFR_Service/StructDef_i.h @@ -52,53 +52,53 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry and its contents. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA_StructMemberSeq *members ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_StructMemberSeq *members_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void members ( const CORBA_StructMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void members_i ( const CORBA_StructMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/TypedefDef_i.cpp b/TAO/orbsvcs/IFR_Service/TypedefDef_i.cpp index 859c5fa8359..8884a883e9f 100644 --- a/TAO/orbsvcs/IFR_Service/TypedefDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/TypedefDef_i.cpp @@ -21,16 +21,16 @@ TAO_TypedefDef_i::~TAO_TypedefDef_i (void) } CORBA_Contained::Description * -TAO_TypedefDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) +TAO_TypedefDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_TypedefDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_TypedefDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA_Contained::Description *desc_ptr = 0; @@ -41,15 +41,15 @@ TAO_TypedefDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) CORBA_Contained::Description_var retval = desc_ptr; - retval->kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA_TypeDescription td; ACE_CHECK_RETURN (0); - td.name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER); + td.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER); - td.id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER); + td.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_TString container_id; @@ -60,10 +60,10 @@ TAO_TypedefDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) td.defined_in = container_id.c_str (); - td.version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER); + td.version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - td.type = this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + td.type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); retval->value <<= td; diff --git a/TAO/orbsvcs/IFR_Service/TypedefDef_i.h b/TAO/orbsvcs/IFR_Service/TypedefDef_i.h index 40e966cded2..cf1a24a8eec 100644 --- a/TAO/orbsvcs/IFR_Service/TypedefDef_i.h +++ b/TAO/orbsvcs/IFR_Service/TypedefDef_i.h @@ -34,7 +34,7 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -class TAO_TypedefDef_i : public virtual TAO_Contained_i, +class TAO_TypedefDef_i : public virtual TAO_Contained_i, public virtual TAO_IDLType_i { // = TITLE @@ -53,13 +53,13 @@ public: // Destructor virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. diff --git a/TAO/orbsvcs/IFR_Service/UnionDef_i.cpp b/TAO/orbsvcs/IFR_Service/UnionDef_i.cpp index 4ca5f622103..097f7fc1cbb 100644 --- a/TAO/orbsvcs/IFR_Service/UnionDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/UnionDef_i.cpp @@ -23,45 +23,45 @@ TAO_UnionDef_i::~TAO_UnionDef_i (void) } CORBA::DefinitionKind -TAO_UnionDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_UnionDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Union; } void -TAO_UnionDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_UnionDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_UnionDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_UnionDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Destroy our members. - TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Destroy ourself. - TAO_Contained_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Contained_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } CORBA::TypeCode_ptr -TAO_UnionDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_UnionDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_UnionDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_UnionDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString id; @@ -74,30 +74,30 @@ TAO_UnionDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) "name", name); - CORBA::TypeCode_var tc = this->discriminator_type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var tc = this->discriminator_type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); - CORBA_UnionMemberSeq_var members = this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_UnionMemberSeq_var members = this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); return this->repo_->tc_factory ()->create_union_tc (id.c_str (), name.c_str (), tc.in (), members.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_UnionDef_i::discriminator_type (TAO_ENV_SINGLE_ARG_DECL) +TAO_UnionDef_i::discriminator_type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->discriminator_type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->discriminator_type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_UnionDef_i::discriminator_type_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_UnionDef_i::discriminator_type_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString disc_path; @@ -113,24 +113,24 @@ TAO_UnionDef_i::discriminator_type_i (TAO_ENV_SINGLE_ARG_DECL) TAO_IDLType_i *impl = this->repo_->servant_factory ()->create_idltype (disc_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); auto_ptr safety (impl); - return impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_IDLType_ptr -TAO_UnionDef_i::discriminator_type_def (TAO_ENV_SINGLE_ARG_DECL) +TAO_UnionDef_i::discriminator_type_def (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ()); - return this->discriminator_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->discriminator_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_IDLType_ptr -TAO_UnionDef_i::discriminator_type_def_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_UnionDef_i::discriminator_type_def_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString disc_path; @@ -155,36 +155,36 @@ TAO_UnionDef_i::discriminator_type_def_i (TAO_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (def_kind, disc_path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_IDLType::_nil ()); return CORBA_IDLType::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_UnionDef_i::discriminator_type_def ( CORBA_IDLType_ptr discriminator_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->discriminator_type_def_i (discriminator_type_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_UnionDef_i::discriminator_type_def_i ( CORBA_IDLType_ptr discriminator_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (discriminator_type_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var disc_path = @@ -196,16 +196,16 @@ TAO_UnionDef_i::discriminator_type_def_i ( } CORBA_UnionMemberSeq * -TAO_UnionDef_i::members (TAO_ENV_SINGLE_ARG_DECL) +TAO_UnionDef_i::members (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_UnionMemberSeq * -TAO_UnionDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_UnionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Unbounded_Queue key_queue; @@ -281,7 +281,7 @@ TAO_UnionDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL) this->fetch_label (next_key, retval[k] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); this->repo_->config ()->get_string_value (next_key, @@ -303,21 +303,21 @@ TAO_UnionDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL) obj = this->repo_->servant_factory ()->create_objref (def_kind, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); retval[k].type_def = CORBA_IDLType::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); impl = this->repo_->servant_factory ()->create_idltype (entry_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); auto_ptr safety (impl); - retval[k].type = impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + retval[k].type = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -326,22 +326,22 @@ TAO_UnionDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL) void TAO_UnionDef_i::members (const CORBA_UnionMemberSeq &members - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->members_i (members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_UnionDef_i::members_i (const CORBA_UnionMemberSeq &members - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Destroy our old members, both refs and defns. - TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_TString section_name; @@ -375,7 +375,7 @@ TAO_UnionDef_i::members_i (const CORBA_UnionMemberSeq &members PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var member_path = @@ -387,14 +387,14 @@ TAO_UnionDef_i::members_i (const CORBA_UnionMemberSeq &members this->store_label (member_key, members[i].label - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } } void TAO_UnionDef_i::fetch_label (const ACE_Configuration_Section_Key member_key, CORBA_UnionMember &member - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Configuration::VALUETYPE vt; @@ -414,10 +414,10 @@ TAO_UnionDef_i::fetch_label (const ACE_Configuration_Section_Key member_key, "label", value); - CORBA::TypeCode_var tc = this->discriminator_type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var tc = this->discriminator_type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; switch (kind) diff --git a/TAO/orbsvcs/IFR_Service/UnionDef_i.h b/TAO/orbsvcs/IFR_Service/UnionDef_i.h index ea97eaae096..d9377b0c8ed 100644 --- a/TAO/orbsvcs/IFR_Service/UnionDef_i.h +++ b/TAO/orbsvcs/IFR_Service/UnionDef_i.h @@ -52,85 +52,85 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry and its contents. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr discriminator_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr discriminator_type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_IDLType_ptr discriminator_type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_IDLType_ptr discriminator_type_def_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void discriminator_type_def ( CORBA_IDLType_ptr discriminator_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void discriminator_type_def_i ( CORBA_IDLType_ptr discriminator_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_UnionMemberSeq *members ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_UnionMemberSeq *members_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void members ( const CORBA_UnionMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void members_i ( const CORBA_UnionMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -138,7 +138,7 @@ private: void fetch_label ( const ACE_Configuration_Section_Key member_key, CORBA_UnionMember &member - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Used by members() to get each member's label value. diff --git a/TAO/orbsvcs/IFR_Service/UsesDef_i.cpp b/TAO/orbsvcs/IFR_Service/UsesDef_i.cpp index e36bdaa2ee9..65e7d8ca51f 100644 --- a/TAO/orbsvcs/IFR_Service/UsesDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/UsesDef_i.cpp @@ -18,73 +18,73 @@ TAO_UsesDef_i::~TAO_UsesDef_i (void) } CORBA::DefinitionKind -TAO_UsesDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_UsesDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Uses; } -void -TAO_UsesDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +void +TAO_UsesDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -void -TAO_UsesDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +void +TAO_UsesDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA_Contained::Description * -TAO_UsesDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) +TAO_UsesDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_UsesDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_UsesDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO return 0; } -CORBA_InterfaceDef_ptr -TAO_UsesDef_i::interface_type (TAO_ENV_SINGLE_ARG_DECL) +CORBA_InterfaceDef_ptr +TAO_UsesDef_i::interface_type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA_InterfaceDef::_nil ()); - return this->interface_type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->interface_type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_InterfaceDef_ptr -TAO_UsesDef_i::interface_type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +CORBA_InterfaceDef_ptr +TAO_UsesDef_i::interface_type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO return 0; } -CORBA::Boolean -TAO_UsesDef_i::is_multiple (TAO_ENV_SINGLE_ARG_DECL) +CORBA::Boolean +TAO_UsesDef_i::is_multiple (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->is_multiple_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->is_multiple_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA::Boolean -TAO_UsesDef_i::is_multiple_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +CORBA::Boolean +TAO_UsesDef_i::is_multiple_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO diff --git a/TAO/orbsvcs/IFR_Service/UsesDef_i.h b/TAO/orbsvcs/IFR_Service/UsesDef_i.h index fae4dae86f8..e032dbf7bc9 100644 --- a/TAO/orbsvcs/IFR_Service/UsesDef_i.h +++ b/TAO/orbsvcs/IFR_Service/UsesDef_i.h @@ -50,51 +50,51 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_InterfaceDef_ptr interface_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_InterfaceDef_ptr interface_type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean is_multiple ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Boolean is_multiple_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.cpp b/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.cpp index 802bef26eca..97b29fd2fe3 100644 --- a/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.cpp @@ -24,23 +24,23 @@ TAO_ValueBoxDef_i::~TAO_ValueBoxDef_i (void) } CORBA::DefinitionKind -TAO_ValueBoxDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ValueBoxDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_ValueBox; } CORBA::TypeCode_ptr -TAO_ValueBoxDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueBoxDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_ValueBoxDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueBoxDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString id; @@ -66,31 +66,31 @@ TAO_ValueBoxDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) TAO_IDLType_i *impl = this->repo_->servant_factory ()->create_idltype (boxed_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); auto_ptr safety (impl); - CORBA::TypeCode_var tc = impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var tc = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); return this->repo_->tc_factory ()->create_value_box_tc (id.c_str (), name.c_str (), tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_IDLType_ptr -TAO_ValueBoxDef_i::original_type_def (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueBoxDef_i::original_type_def (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ()); - return this->original_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->original_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_IDLType_ptr -TAO_ValueBoxDef_i::original_type_def_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueBoxDef_i::original_type_def_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString boxed_type; @@ -115,32 +115,32 @@ TAO_ValueBoxDef_i::original_type_def_i (TAO_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (def_kind, boxed_type.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_IDLType::_nil ()); return CORBA_IDLType::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ValueBoxDef_i::original_type_def (CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->original_type_def_i (original_type_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ValueBoxDef_i::original_type_def_i (CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (original_type_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var boxed_type = diff --git a/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.h b/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.h index f477053a276..c7b649671fb 100644 --- a/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.h +++ b/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.h @@ -51,42 +51,42 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA_IDLType_ptr original_type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_IDLType_ptr original_type_def_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void original_type_def ( CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void original_type_def_i ( CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/ValueDef_i.cpp b/TAO/orbsvcs/IFR_Service/ValueDef_i.cpp index 1c41ea260f4..147d7cac989 100644 --- a/TAO/orbsvcs/IFR_Service/ValueDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/ValueDef_i.cpp @@ -20,39 +20,39 @@ TAO_ValueDef_i::~TAO_ValueDef_i (void) } CORBA::DefinitionKind -TAO_ValueDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ValueDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Value; } void -TAO_ValueDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_ValueDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ValueDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA_Contained::Description * -TAO_ValueDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_ValueDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ValueDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -60,16 +60,16 @@ TAO_ValueDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_A } CORBA::TypeCode_ptr -TAO_ValueDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_ValueDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ValueDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -77,16 +77,16 @@ TAO_ValueDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_P } CORBA_InterfaceDefSeq * -TAO_ValueDef_i::supported_interfaces (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueDef_i::supported_interfaces (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->supported_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->supported_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_InterfaceDefSeq * -TAO_ValueDef_i::supported_interfaces_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ValueDef_i::supported_interfaces_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -96,20 +96,20 @@ TAO_ValueDef_i::supported_interfaces_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ void TAO_ValueDef_i::supported_interfaces ( const CORBA_InterfaceDefSeq &supported_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->supported_interfaces_i (supported_interfaces - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ValueDef_i::supported_interfaces_i ( const CORBA_InterfaceDefSeq & /* supported_interfaces */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -117,16 +117,16 @@ TAO_ValueDef_i::supported_interfaces_i ( } CORBA_InitializerSeq * -TAO_ValueDef_i::initializers (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueDef_i::initializers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->initializers_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->initializers_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_InitializerSeq * -TAO_ValueDef_i::initializers_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ValueDef_i::initializers_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -135,34 +135,34 @@ TAO_ValueDef_i::initializers_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SING void TAO_ValueDef_i::initializers (const CORBA_InitializerSeq &initializers - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->initializers_i (initializers - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ValueDef_i::initializers_i (const CORBA_InitializerSeq & /* initializers */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA_ValueDef_ptr -TAO_ValueDef_i::base_value (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueDef_i::base_value (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA_ValueDef::_nil ()); - return this->base_value_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->base_value_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_ValueDef_ptr -TAO_ValueDef_i::base_value_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ValueDef_i::base_value_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -171,34 +171,34 @@ TAO_ValueDef_i::base_value_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE void TAO_ValueDef_i::base_value (CORBA_ValueDef_ptr base_value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->base_value_i (base_value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ValueDef_i::base_value_i (CORBA_ValueDef_ptr /* base_value */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA_ValueDefSeq * -TAO_ValueDef_i::abstract_base_values (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueDef_i::abstract_base_values (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->abstract_base_values_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->abstract_base_values_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_ValueDefSeq * -TAO_ValueDef_i::abstract_base_values_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ValueDef_i::abstract_base_values_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -208,20 +208,20 @@ TAO_ValueDef_i::abstract_base_values_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ void TAO_ValueDef_i::abstract_base_values ( const CORBA_ValueDefSeq &abstract_base_values - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->abstract_base_values_i (abstract_base_values - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ValueDef_i::abstract_base_values_i ( const CORBA_ValueDefSeq & /* abstract_base_values */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -229,16 +229,16 @@ TAO_ValueDef_i::abstract_base_values_i ( } CORBA::Boolean -TAO_ValueDef_i::is_abstract (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueDef_i::is_abstract (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->is_abstract_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->is_abstract_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::Boolean -TAO_ValueDef_i::is_abstract_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ValueDef_i::is_abstract_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -247,34 +247,34 @@ TAO_ValueDef_i::is_abstract_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGL void TAO_ValueDef_i::is_abstract (CORBA::Boolean is_abstract - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->is_abstract (is_abstract - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ValueDef_i::is_abstract_i (CORBA::Boolean /* is_abstract */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA::Boolean -TAO_ValueDef_i::is_custom (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueDef_i::is_custom (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->is_custom_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->is_custom_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::Boolean -TAO_ValueDef_i::is_custom_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ValueDef_i::is_custom_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -283,34 +283,34 @@ TAO_ValueDef_i::is_custom_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ void TAO_ValueDef_i::is_custom (CORBA::Boolean is_custom - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->is_custom_i (is_custom - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ValueDef_i::is_custom_i (CORBA::Boolean /* is_custom */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA::Boolean -TAO_ValueDef_i::is_truncatable (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueDef_i::is_truncatable (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->is_truncatable_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->is_truncatable_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::Boolean -TAO_ValueDef_i::is_truncatable_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ValueDef_i::is_truncatable_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -319,18 +319,18 @@ TAO_ValueDef_i::is_truncatable_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SI void TAO_ValueDef_i::is_truncatable (CORBA::Boolean is_truncatable - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->is_truncatable_i (is_truncatable - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ValueDef_i::is_truncatable_i (CORBA::Boolean /* is_truncatable */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -338,18 +338,18 @@ TAO_ValueDef_i::is_truncatable_i (CORBA::Boolean /* is_truncatable */ CORBA::Boolean TAO_ValueDef_i::is_a (const char *id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); return this->is_a_i (id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Boolean TAO_ValueDef_i::is_a_i (const char *id - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { if (ACE_OS::strcmp (id, "IDL:omg.org/CORBA/ValueBase:1.0") == 0) @@ -362,16 +362,16 @@ TAO_ValueDef_i::is_a_i (const char *id } CORBA_ValueDef::FullValueDescription * -TAO_ValueDef_i::describe_value (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueDef_i::describe_value (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_value_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_value_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_ValueDef::FullValueDescription * -TAO_ValueDef_i::describe_value_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -384,7 +384,7 @@ TAO_ValueDef_i::create_value_member (const char *id, const char *version, CORBA_IDLType_ptr type, CORBA::Visibility access - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_ValueMemberDef::_nil ()); @@ -394,7 +394,7 @@ TAO_ValueDef_i::create_value_member (const char *id, version, type, access - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_ValueMemberDef_ptr @@ -403,7 +403,7 @@ TAO_ValueDef_i::create_value_member_i (const char * /* id */, const char * /* version */, CORBA_IDLType_ptr /* type */, CORBA::Visibility /* access */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -417,7 +417,7 @@ TAO_ValueDef_i::create_attribute ( const char *version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -428,7 +428,7 @@ TAO_ValueDef_i::create_attribute ( version, type, mode - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_AttributeDef_ptr @@ -438,7 +438,7 @@ TAO_ValueDef_i::create_attribute_i ( const char * /* version */, CORBA_IDLType_ptr /* type */, CORBA::AttributeMode /* mode */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -456,7 +456,7 @@ TAO_ValueDef_i::create_operation ( const CORBA_ParDescriptionSeq ¶ms, const CORBA_ExceptionDefSeq &exceptions, const CORBA_ContextIdSeq &contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -470,7 +470,7 @@ TAO_ValueDef_i::create_operation ( params, exceptions, contexts - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_OperationDef_ptr @@ -483,7 +483,7 @@ TAO_ValueDef_i::create_operation_i ( const CORBA_ParDescriptionSeq & /* params */, const CORBA_ExceptionDefSeq & /* exceptions */, const CORBA_ContextIdSeq & /* contexts */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/orbsvcs/IFR_Service/ValueDef_i.h b/TAO/orbsvcs/IFR_Service/ValueDef_i.h index 4bd20588fd8..4675e1b9908 100644 --- a/TAO/orbsvcs/IFR_Service/ValueDef_i.h +++ b/TAO/orbsvcs/IFR_Service/ValueDef_i.h @@ -53,219 +53,219 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA_InterfaceDefSeq *supported_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_InterfaceDefSeq *supported_interfaces_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void supported_interfaces ( const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void supported_interfaces_i ( const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_InitializerSeq *initializers ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_InitializerSeq *initializers_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void initializers ( const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void initializers_i ( const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_ValueDef_ptr base_value ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_ValueDef_ptr base_value_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void base_value ( CORBA_ValueDef_ptr base_value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void base_value_i ( CORBA_ValueDef_ptr base_value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_ValueDefSeq *abstract_base_values ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_ValueDefSeq *abstract_base_values_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void abstract_base_values ( const CORBA_ValueDefSeq & abstract_base_values - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void abstract_base_values_i ( const CORBA_ValueDefSeq & abstract_base_values - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean is_abstract ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Boolean is_abstract_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void is_abstract ( CORBA::Boolean is_abstract - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void is_abstract_i ( CORBA::Boolean is_abstract - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean is_custom ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Boolean is_custom_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void is_custom ( CORBA::Boolean is_custom - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void is_custom_i ( CORBA::Boolean is_custom - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean is_truncatable ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Boolean is_truncatable_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void is_truncatable ( CORBA::Boolean is_truncatable - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void is_truncatable_i ( CORBA::Boolean is_truncatable - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean is_a ( const char *id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Boolean is_a_i ( const char *id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_ValueDef::FullValueDescription *describe_value ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_ValueDef::FullValueDescription *describe_value_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -275,7 +275,7 @@ public: const char *version, CORBA_IDLType_ptr type, CORBA::Visibility access - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -285,7 +285,7 @@ public: const char *version, CORBA_IDLType_ptr type, CORBA::Visibility access - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -295,7 +295,7 @@ public: const char *version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -305,7 +305,7 @@ public: const char *version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -318,7 +318,7 @@ public: const CORBA_ParDescriptionSeq ¶ms, const CORBA_ExceptionDefSeq &exceptions, const CORBA_ContextIdSeq &contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -331,7 +331,7 @@ public: const CORBA_ParDescriptionSeq ¶ms, const CORBA_ExceptionDefSeq &exceptions, const CORBA_ContextIdSeq &contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.cpp b/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.cpp index e99f4fcd66e..8e6b0912a21 100644 --- a/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.cpp @@ -20,39 +20,39 @@ TAO_ValueMemberDef_i::~TAO_ValueMemberDef_i (void) } CORBA::DefinitionKind -TAO_ValueMemberDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ValueMemberDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_ValueMember; } void -TAO_ValueMemberDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueMemberDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_ValueMemberDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ValueMemberDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA_Contained::Description * -TAO_ValueMemberDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueMemberDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_ValueMemberDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ValueMemberDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -60,16 +60,16 @@ TAO_ValueMemberDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SI } CORBA::TypeCode_ptr -TAO_ValueMemberDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueMemberDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_ValueMemberDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ValueMemberDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -77,16 +77,16 @@ TAO_ValueMemberDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE } CORBA_IDLType_ptr -TAO_ValueMemberDef_i::type_def (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueMemberDef_i::type_def (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ()); - return this->type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_IDLType_ptr -TAO_ValueMemberDef_i::type_def_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ValueMemberDef_i::type_def_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -95,34 +95,34 @@ TAO_ValueMemberDef_i::type_def_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SI void TAO_ValueMemberDef_i::type_def (CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->type_def_i (type_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ValueMemberDef_i::type_def_i (CORBA_IDLType_ptr /* type_def */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA::Visibility -TAO_ValueMemberDef_i::access (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueMemberDef_i::access (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->access_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->access_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::Visibility -TAO_ValueMemberDef_i::access_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ ) +TAO_ValueMemberDef_i::access_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -131,18 +131,18 @@ TAO_ValueMemberDef_i::access_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SING void TAO_ValueMemberDef_i::access (CORBA::Visibility access - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->access (access - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ValueMemberDef_i::access_i (CORBA::Visibility /* access */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ ) + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO diff --git a/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.h b/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.h index 3fdd11ea192..796ef9110cc 100644 --- a/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.h +++ b/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.h @@ -50,85 +50,85 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_IDLType_ptr type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_IDLType_ptr type_def_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void type_def ( CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void type_def_i ( CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Visibility access ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Visibility access_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void access ( CORBA::Visibility access - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void access_i ( CORBA::Visibility access - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/WstringDef_i.cpp b/TAO/orbsvcs/IFR_Service/WstringDef_i.cpp index 96e5401bc90..2b0ad879c71 100644 --- a/TAO/orbsvcs/IFR_Service/WstringDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/WstringDef_i.cpp @@ -20,23 +20,23 @@ TAO_WstringDef_i::~TAO_WstringDef_i (void) } CORBA::DefinitionKind -TAO_WstringDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_WstringDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Wstring; } void -TAO_WstringDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_WstringDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_WstringDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_WstringDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString name; @@ -50,36 +50,36 @@ TAO_WstringDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } CORBA::TypeCode_ptr -TAO_WstringDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_WstringDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_WstringDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_WstringDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::ULong bound = this->bound_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong bound = this->bound_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); return this->repo_->tc_factory ()->create_wstring_tc (bound - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::ULong -TAO_WstringDef_i::bound (TAO_ENV_SINGLE_ARG_DECL) +TAO_WstringDef_i::bound (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->bound_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->bound_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::ULong -TAO_WstringDef_i::bound_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_WstringDef_i::bound_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { u_int retval = 0; @@ -92,18 +92,18 @@ TAO_WstringDef_i::bound_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_WstringDef_i::bound (CORBA::ULong bound - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->bound_i (bound - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_WstringDef_i::bound_i (CORBA::ULong bound - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->set_integer_value (this->section_key_, diff --git a/TAO/orbsvcs/IFR_Service/WstringDef_i.h b/TAO/orbsvcs/IFR_Service/WstringDef_i.h index 80c3387cfb0..6e9eeae7bc1 100644 --- a/TAO/orbsvcs/IFR_Service/WstringDef_i.h +++ b/TAO/orbsvcs/IFR_Service/WstringDef_i.h @@ -51,53 +51,53 @@ public: // Destructor. virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's virtual function. virtual CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's virtual function. virtual CORBA::ULong bound ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::ULong bound_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void bound ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void bound_i ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/be_produce.cpp b/TAO/orbsvcs/IFR_Service/be_produce.cpp index 4733035164f..db50274b7e9 100644 --- a/TAO/orbsvcs/IFR_Service/be_produce.cpp +++ b/TAO/orbsvcs/IFR_Service/be_produce.cpp @@ -93,22 +93,22 @@ BE_cleanup (void) idl_global = 0; // Remove the holding scope entry from the repository. - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA_Contained_var result = be_global->repository ()->lookup_id (be_global->holding_scope_name () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!CORBA::is_nil (result.in ())) { CORBA_ModuleDef_var scope = CORBA_ModuleDef::_narrow (result.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - scope->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + scope->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -140,18 +140,18 @@ TAO_IFR_BE_Export int BE_ifr_init (int &ac, char *av[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { be_global->orb (CORBA::ORB_init (ac, av, 0 - TAO_ENV_ARG_PARAMETER)); + ACE_ENV_ARG_PARAMETER)); ACE_TRY_CHECK; CORBA::Object_var object = be_global->orb ()->resolve_initial_references ("InterfaceRepository" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (object.in ())) @@ -165,7 +165,7 @@ BE_ifr_init (int &ac, } CORBA_Repository_var repo = CORBA_Repository::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (repo.in ())) @@ -193,14 +193,14 @@ BE_ifr_init (int &ac, } void -BE_create_holding_scope (TAO_ENV_SINGLE_ARG_DECL) +BE_create_holding_scope (ACE_ENV_SINGLE_ARG_DECL) { CORBA_ModuleDef_ptr scope = CORBA_ModuleDef::_nil (); // If we are multi-threaded, it may already be created. CORBA_Contained_var result = be_global->repository ()->lookup_id (be_global->holding_scope_name () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (result.in ())) @@ -210,14 +210,14 @@ BE_create_holding_scope (TAO_ENV_SINGLE_ARG_DECL) be_global->holding_scope_name (), be_global->holding_scope_name (), "1.0" - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; } else { scope = CORBA_ModuleDef::_narrow (result.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -228,10 +228,10 @@ BE_create_holding_scope (TAO_ENV_SINGLE_ARG_DECL) TAO_IFR_BE_Export void BE_produce (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - BE_create_holding_scope (TAO_ENV_SINGLE_ARG_PARAMETER); + BE_create_holding_scope (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get the root node. diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp index 55409c8385a..fa2892b2395 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp @@ -75,13 +75,13 @@ ifr_adding_visitor::visit_scope (UTL_Scope *node) int ifr_adding_visitor::visit_predefined_type (AST_PredefinedType *node) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { this->ir_current_ = be_global->repository ()->get_primitive ( this->predefined_type_to_pkind (node) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; } @@ -107,14 +107,14 @@ ifr_adding_visitor::visit_module (AST_Module *node) CORBA_Container_var new_def; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // If this module been opened before, it will already be in // the repository. CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (prev_def.in ())) @@ -128,7 +128,7 @@ ifr_adding_visitor::visit_module (AST_Module *node) node->repoID (), node->local_name ()->get_string (), node->version () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; } @@ -145,7 +145,7 @@ ifr_adding_visitor::visit_module (AST_Module *node) } else { - CORBA::DefinitionKind kind = prev_def->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::DefinitionKind kind = prev_def->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // If the line below is true, we are clobbering a previous @@ -154,7 +154,7 @@ ifr_adding_visitor::visit_module (AST_Module *node) // original entry, create the new one, and let the user beware. if (kind != CORBA::dk_Module) { - prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // This call will take the brach where prev_def.in() is 0. @@ -164,7 +164,7 @@ ifr_adding_visitor::visit_module (AST_Module *node) { new_def = CORBA_Container::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -230,20 +230,20 @@ ifr_adding_visitor::visit_interface (AST_Interface *node) return this->visit_valuetype (node); } - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Is this interface already in the respository? CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If not, create a new entry. if (CORBA::is_nil (prev_def.in ())) { int status = this->create_interface_def (node - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return status; @@ -273,38 +273,38 @@ ifr_adding_visitor::visit_interface (AST_Interface *node) // previous entry, forward declared or not. if (node->ifr_fwd_added () == 0) { - CORBA::DefinitionKind kind = - prev_def->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::DefinitionKind kind = + prev_def->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (kind == CORBA::dk_Interface) { CORBA::InterfaceDef_var iface = CORBA::InterfaceDef::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::ContainedSeq_var contents = + CORBA::ContainedSeq_var contents = iface->contents (CORBA::dk_all, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ULong length = contents->length (); for (CORBA::ULong i = 0; i < length; ++i) { - contents[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + contents[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } else { - prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; int status = this->create_interface_def (node - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return status; @@ -325,7 +325,7 @@ ifr_adding_visitor::visit_interface (AST_Interface *node) { result = be_global->repository ()->lookup_id (parents[i]->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If one of our interface's parents is not in the repository, @@ -337,14 +337,14 @@ ifr_adding_visitor::visit_interface (AST_Interface *node) { this->ir_current_ = CORBA_IDLType::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK return 0; } bases[i] = CORBA_InterfaceDef::_narrow (result.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (bases[i].in ())) @@ -362,11 +362,11 @@ ifr_adding_visitor::visit_interface (AST_Interface *node) CORBA_InterfaceDef_var extant_def = CORBA_InterfaceDef::_narrow (prev_def. in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; extant_def->base_interfaces (bases - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK node->ifr_added (1); @@ -429,7 +429,7 @@ ifr_adding_visitor::visit_interface (AST_Interface *node) // defined/not added - takes the other branch. // defined/added - we're ok. this->ir_current_ = CORBA_IDLType::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -456,13 +456,13 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node) AST_Interface *i = node->full_definition (); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Is this interface already in the respository? CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (i->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (prev_def.in ())) @@ -487,7 +487,7 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node) i->local_name ()->get_string (), i->version (), bases - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } else @@ -498,7 +498,7 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node) i->local_name ()->get_string (), i->version (), bases - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -553,12 +553,12 @@ ifr_adding_visitor::visit_structure (AST_Structure *node) return 0; } - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (prev_def.in ())) @@ -584,7 +584,7 @@ ifr_adding_visitor::visit_structure (AST_Structure *node) // original entry, create the new one, and let the user beware. if (node->ifr_added () == 0) { - prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; return this->visit_structure (node); @@ -592,7 +592,7 @@ ifr_adding_visitor::visit_structure (AST_Structure *node) this->ir_current_ = CORBA_IDLType::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -632,13 +632,13 @@ ifr_adding_visitor::visit_enum (AST_Enum *node) return 0; } - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Is this enum already in the respository? CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If not, create a new entry. @@ -674,7 +674,7 @@ ifr_adding_visitor::visit_enum (AST_Enum *node) node->local_name ()->get_string (), node->version (), members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; } @@ -699,7 +699,7 @@ ifr_adding_visitor::visit_enum (AST_Enum *node) // original entry, create the new one, and let the user beware. if (node->ifr_added () == 0) { - prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; return this->visit_enum (node); @@ -709,7 +709,7 @@ ifr_adding_visitor::visit_enum (AST_Enum *node) // the current IR object holder. this->ir_current_ = CORBA_EnumDef::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -768,14 +768,14 @@ ifr_adding_visitor::visit_field (AST_Field *node) int ifr_adding_visitor::visit_attribute (AST_Attribute *node) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { AST_Type *type = node->field_type (); // Updates ir_current_. this->get_referenced_type (type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::AttributeMode mode = @@ -787,7 +787,7 @@ ifr_adding_visitor::visit_attribute (AST_Attribute *node) { CORBA_InterfaceDef_var iface = CORBA_InterfaceDef::_narrow (current_scope - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA_AttributeDef_var new_def = @@ -796,7 +796,7 @@ ifr_adding_visitor::visit_attribute (AST_Attribute *node) node->version (), this->ir_current_.in (), mode - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else @@ -830,12 +830,12 @@ ifr_adding_visitor::visit_union (AST_Union *node) return 0; } - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (prev_def.in ())) @@ -861,7 +861,7 @@ ifr_adding_visitor::visit_union (AST_Union *node) // original entry, create the new one, and let the user beware. if (node->ifr_added () == 0) { - prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; return this->visit_union (node); @@ -869,7 +869,7 @@ ifr_adding_visitor::visit_union (AST_Union *node) this->ir_current_ = CORBA_UnionDef::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -895,12 +895,12 @@ ifr_adding_visitor::visit_constant (AST_Constant *node) const char *id = node->repoID (); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Nothing prevents this constant's repo id from already being @@ -916,7 +916,7 @@ ifr_adding_visitor::visit_constant (AST_Constant *node) // original entry, create the new one, and let the user beware. if (node->ifr_added () == 0) { - prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } else @@ -933,7 +933,7 @@ ifr_adding_visitor::visit_constant (AST_Constant *node) CORBA_IDLType_var idl_type = be_global->repository ()->get_primitive (pkind - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Any any; @@ -952,7 +952,7 @@ ifr_adding_visitor::visit_constant (AST_Constant *node) node->version (), idl_type.in (), any - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; } @@ -982,11 +982,11 @@ ifr_adding_visitor::visit_constant (AST_Constant *node) int ifr_adding_visitor::visit_array (AST_Array *node) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { this->element_type (node->base_type () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AST_Expression **dims = node->dims (); @@ -997,7 +997,7 @@ ifr_adding_visitor::visit_array (AST_Array *node) be_global->repository ()->create_array ( dims[i - 1]->ev ()->u.ulval, this->ir_current_.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; } @@ -1017,18 +1017,18 @@ ifr_adding_visitor::visit_array (AST_Array *node) int ifr_adding_visitor::visit_sequence (AST_Sequence *node) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { this->element_type (node->base_type () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->ir_current_ = be_global->repository ()->create_sequence ( node->max_size ()->ev ()->u.ulval, this->ir_current_.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; } @@ -1053,20 +1053,20 @@ ifr_adding_visitor::visit_string (AST_String *node) CORBA::ULong bound = ACE_static_cast (CORBA::ULong, ev->u.ulval); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { if (node->node_type () == AST_Decl::NT_string) { this->ir_current_ = be_global->repository ()->create_string (bound - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } else { this->ir_current_ = be_global->repository ()->create_wstring (bound - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_TRY_CHECK; @@ -1091,20 +1091,20 @@ ifr_adding_visitor::visit_typedef (AST_Typedef *node) return 0; } - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Is this typedef already in the respository? CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If not, create a new entry. if (CORBA::is_nil (prev_def.in ())) { this->element_type (node->base_type () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA_Container_ptr current_scope = CORBA_Container::_nil (); @@ -1117,7 +1117,7 @@ ifr_adding_visitor::visit_typedef (AST_Typedef *node) node->local_name ()->get_string (), node->version (), this->ir_current_.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; } @@ -1142,7 +1142,7 @@ ifr_adding_visitor::visit_typedef (AST_Typedef *node) // original entry, create the new one, and let the user beware. if (node->ifr_added () == 0) { - prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // This call will take the other branch. @@ -1151,7 +1151,7 @@ ifr_adding_visitor::visit_typedef (AST_Typedef *node) this->ir_current_ = CORBA_TypedefDef::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -1170,12 +1170,12 @@ ifr_adding_visitor::visit_typedef (AST_Typedef *node) int ifr_adding_visitor::visit_root (AST_Root *node) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA_Container_var new_scope = CORBA_Container::_narrow (be_global->repository () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (be_global->ifr_scopes ().push (new_scope.in ()) != 0) @@ -1233,12 +1233,12 @@ ifr_adding_visitor::visit_native (AST_Native *node) return 0; } - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (prev_def.in ())) @@ -1252,7 +1252,7 @@ ifr_adding_visitor::visit_native (AST_Native *node) node->repoID (), node->local_name ()->get_string (), node->version () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; } @@ -1277,7 +1277,7 @@ ifr_adding_visitor::visit_native (AST_Native *node) // original entry, create the new one, and let the user beware. if (node->ifr_added () == 0) { - prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // This call will take the other branch. @@ -1286,7 +1286,7 @@ ifr_adding_visitor::visit_native (AST_Native *node) this->ir_current_ = CORBA_NativeDef::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -1481,7 +1481,7 @@ ifr_adding_visitor::load_any (AST_Expression::AST_ExprValue *ev, void ifr_adding_visitor::element_type (AST_Type *base_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (base_type->anonymous ()) { @@ -1498,7 +1498,7 @@ ifr_adding_visitor::element_type (AST_Type *base_type { CORBA_Contained_var contained = be_global->repository ()->lookup_id (base_type->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (contained.in ())) @@ -1511,14 +1511,14 @@ ifr_adding_visitor::element_type (AST_Type *base_type } this->ir_current_ = CORBA_IDLType::_narrow (contained.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } int ifr_adding_visitor::create_interface_def (AST_Interface *node - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::ULong n_parents = ACE_static_cast (CORBA::ULong, node->n_inherits ()); @@ -1548,11 +1548,11 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node result = be_global->repository ()->lookup_id (parents[i]->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); bases[i] = CORBA_InterfaceDef::_narrow (result.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (bases[i].in ())) @@ -1582,7 +1582,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node node->local_name ()->get_string (), node->version (), bases - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } else @@ -1593,7 +1593,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node node->local_name ()->get_string (), node->version (), bases - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1604,7 +1604,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node // Push the new IR object onto the scope stack. CORBA_Container_var new_scope = CORBA_Container::_narrow (new_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (be_global->ifr_scopes ().push (new_scope.in ()) != 0) @@ -1672,7 +1672,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node void ifr_adding_visitor::get_referenced_type (AST_Type *node - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { switch (node->node_type ()) { @@ -1701,12 +1701,12 @@ ifr_adding_visitor::get_referenced_type (AST_Type *node { CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->ir_current_ = CORBA_IDLType::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; break; } diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h index 8aad716a169..e007e6fc60a 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h @@ -117,16 +117,16 @@ protected: // Determine the primitive type and insert into the Any. void element_type (AST_Type *base_type - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Creates or looks up the element type of an array or sequence, // and stores the result in ir_current_. int create_interface_def (AST_Interface *node - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Common code factored out of visit_interface(). void get_referenced_type (AST_Type *node - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Utility method to update ir_current_ for struct members, union // members, operation parameters and operation return types. diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp index 935b4629b9b..8cf19deac77 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp @@ -36,7 +36,7 @@ ifr_adding_visitor_exception::visit_scope (UTL_Scope *node) AST_Field **f = 0; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Visit each field. @@ -77,7 +77,7 @@ ifr_adding_visitor_exception::visit_scope (UTL_Scope *node) else { // Updates ir_current_. - this->get_referenced_type (ft TAO_ENV_ARG_PARAMETER); + this->get_referenced_type (ft ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -110,13 +110,13 @@ ifr_adding_visitor_exception::visit_scope (UTL_Scope *node) int ifr_adding_visitor_exception::visit_structure (AST_Structure *node) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Is this union already in the respository? CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If not, create a new entry. @@ -135,7 +135,7 @@ ifr_adding_visitor_exception::visit_structure (AST_Structure *node) CORBA_Contained_ptr tmp = CORBA_Contained::_narrow (visitor.ir_current () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Since the enclosing ExceptionDef hasn't been created @@ -155,7 +155,7 @@ ifr_adding_visitor_exception::visit_structure (AST_Structure *node) // original entry, create the new one, and let the user beware. if (node->ifr_added () == 0) { - prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // This call will take the other branch. @@ -164,7 +164,7 @@ ifr_adding_visitor_exception::visit_structure (AST_Structure *node) this->ir_current_ = CORBA_IDLType::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -185,12 +185,12 @@ ifr_adding_visitor_exception::visit_structure (AST_Structure *node) int ifr_adding_visitor_exception::visit_exception (AST_Exception *node) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!CORBA::is_nil (prev_def.in ())) @@ -201,7 +201,7 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node) // original entry, create the new one, and let the user beware. if (node->ifr_added () == 0) { - prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // This call will create a new EnumDef entry. @@ -245,7 +245,7 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node) node->local_name ()->get_string (), node->version (), this->members_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -257,23 +257,23 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node) CORBA_Container_var new_container = CORBA_Container::_narrow (new_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (size_t i = 0; i < size; ++i) { this->move_queue_.dequeue_head (traveller); - CORBA::String_var name = traveller->name (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var name = traveller->name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::String_var version = traveller->version (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var version = traveller->version (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; traveller->move (new_container.in (), name.in (), version.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -297,13 +297,13 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node) int ifr_adding_visitor_exception::visit_enum (AST_Enum *node) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Is this enum already in the respository? CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If not, create a new entry. @@ -334,13 +334,13 @@ ifr_adding_visitor_exception::visit_enum (AST_Enum *node) node->local_name ()->get_string (), node->version (), members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; CORBA_Contained_ptr tmp = CORBA_Contained::_narrow (this->ir_current_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->move_queue_.enqueue_tail (tmp); @@ -355,7 +355,7 @@ ifr_adding_visitor_exception::visit_enum (AST_Enum *node) // original entry, create the new one, and let the user beware. if (node->ifr_added () == 0) { - prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // This call will take the other branch. @@ -364,7 +364,7 @@ ifr_adding_visitor_exception::visit_enum (AST_Enum *node) this->ir_current_ = CORBA_IDLType::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -385,13 +385,13 @@ ifr_adding_visitor_exception::visit_enum (AST_Enum *node) int ifr_adding_visitor_exception::visit_union (AST_Union *node) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Is this union already in the respository? CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If not, create a new entry. @@ -410,7 +410,7 @@ ifr_adding_visitor_exception::visit_union (AST_Union *node) CORBA_Contained_ptr tmp = CORBA_Contained::_narrow (visitor.ir_current () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Since the enclosing ExceptionDef hasn't been created @@ -430,7 +430,7 @@ ifr_adding_visitor_exception::visit_union (AST_Union *node) // original entry, create the new one, and let the user beware. if (node->ifr_added () == 0) { - prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // This call will take the other branch. @@ -439,7 +439,7 @@ ifr_adding_visitor_exception::visit_union (AST_Union *node) this->ir_current_ = CORBA_IDLType::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp index d2da1df4f3a..cef132718d0 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp @@ -20,7 +20,7 @@ ifr_adding_visitor_operation::~ifr_adding_visitor_operation (void) int ifr_adding_visitor_operation::visit_operation (AST_Operation *node) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // If this operation is already in the repository (for example, if @@ -30,7 +30,7 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node) CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!CORBA::is_nil (prev_def.in ())) @@ -88,11 +88,11 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node) prev_def = be_global->repository ()->lookup_id (ex->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; exceptions[i++] = CORBA_ExceptionDef::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ex_iter.next (); @@ -134,7 +134,7 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node) // Updates ir_current_. this->get_referenced_type (return_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Is the operation oneway? @@ -150,7 +150,7 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node) { CORBA_InterfaceDef_var iface = CORBA_InterfaceDef::_narrow (current_scope - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA_OperationDef_var new_def = @@ -162,7 +162,7 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node) this->params_, exceptions, contexts - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else @@ -199,12 +199,12 @@ ifr_adding_visitor_operation::visit_argument (AST_Argument *node) AST_Type *arg_type = node->field_type (); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Updates ir_current_. this->get_referenced_type (arg_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->params_[this->index_].type_def = diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp index 33ac960b3ee..af1db91e347 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp @@ -39,7 +39,7 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node) AST_Field **f = 0; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Visit each field. @@ -90,7 +90,7 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node) CORBA_Contained_ptr tmp = CORBA_Contained::_narrow (visitor.ir_current () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->move_queue_.enqueue_tail (tmp); @@ -114,7 +114,7 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node) { // Updates ir_current_. this->get_referenced_type (ft - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -147,12 +147,12 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node) int ifr_adding_visitor_structure::visit_structure (AST_Structure *node) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (prev_def.in ())) @@ -177,7 +177,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node) node->local_name ()->get_string (), node->version (), this->members_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } else @@ -202,7 +202,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node) node->local_name ()->get_string (), node->version (), this->members_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -216,24 +216,24 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node) CORBA_Container_var new_container = CORBA_Container::_narrow (this->ir_current_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (size_t i = 0; i < size; ++i) { this->move_queue_.dequeue_head (traveller); - CORBA::String_var name = traveller->name (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var name = traveller->name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var version = - traveller->version (TAO_ENV_SINGLE_ARG_PARAMETER); + traveller->version (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; traveller->move (new_container.in (), name.in (), version.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -248,7 +248,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node) // original entry, create the new one, and let the user beware. if (node->ifr_added () == 0) { - prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // This call will take the other branch. @@ -257,7 +257,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node) this->ir_current_ = CORBA_IDLType::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -278,13 +278,13 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node) int ifr_adding_visitor_structure::visit_enum (AST_Enum *node) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Is this enum already in the respository? CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If not, create a new entry. @@ -315,13 +315,13 @@ ifr_adding_visitor_structure::visit_enum (AST_Enum *node) node->local_name ()->get_string (), node->version (), members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; CORBA_Contained_ptr tmp = CORBA_Contained::_narrow (this->ir_current_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Since the enclosing StructDef hasn't been created @@ -340,7 +340,7 @@ ifr_adding_visitor_structure::visit_enum (AST_Enum *node) // original entry, create the new one, and let the user beware. if (node->ifr_added () == 0) { - prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // This call will take the other branch. @@ -349,7 +349,7 @@ ifr_adding_visitor_structure::visit_enum (AST_Enum *node) this->ir_current_ = CORBA_IDLType::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -370,13 +370,13 @@ ifr_adding_visitor_structure::visit_enum (AST_Enum *node) int ifr_adding_visitor_structure::visit_union (AST_Union *node) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Is this union already in the respository? CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If not, create a new entry. @@ -395,7 +395,7 @@ ifr_adding_visitor_structure::visit_union (AST_Union *node) CORBA_Contained_ptr tmp = CORBA_Contained::_narrow (visitor.ir_current () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Since the enclosing StructDef hasn't been created @@ -415,7 +415,7 @@ ifr_adding_visitor_structure::visit_union (AST_Union *node) // original entry, create the new one, and let the user beware. if (node->ifr_added () == 0) { - prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // This call will take the other branch. @@ -424,7 +424,7 @@ ifr_adding_visitor_structure::visit_union (AST_Union *node) this->ir_current_ = CORBA_IDLType::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp index 3a312f7b533..7646cc4d171 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp @@ -42,7 +42,7 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node) // Index into members_. CORBA::ULong index = 0; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Visit each field. @@ -93,7 +93,7 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node) CORBA_Contained_ptr tmp = CORBA_Contained::_narrow (visitor.ir_current () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->move_queue_.enqueue_tail (tmp); @@ -117,7 +117,7 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node) { // Updates ir_current_. this->get_referenced_type (ft - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -202,13 +202,13 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node) int ifr_adding_visitor_union::visit_structure (AST_Structure *node) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Is this struct already in the respository? CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If not, create a new entry. @@ -227,7 +227,7 @@ ifr_adding_visitor_union::visit_structure (AST_Structure *node) CORBA_Contained_ptr tmp = CORBA_Contained::_narrow (visitor.ir_current () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Since the enclosing UnionDef hasn't been created @@ -247,7 +247,7 @@ ifr_adding_visitor_union::visit_structure (AST_Structure *node) // original entry, create the new one, and let the user beware. if (node->ifr_added () == 0) { - prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // This call will take the other branch. @@ -256,7 +256,7 @@ ifr_adding_visitor_union::visit_structure (AST_Structure *node) this->ir_current_ = CORBA_IDLType::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -277,13 +277,13 @@ ifr_adding_visitor_union::visit_structure (AST_Structure *node) int ifr_adding_visitor_union::visit_enum (AST_Enum *node) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Is this enum already in the respository? CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If not, create a new entry. @@ -312,13 +312,13 @@ ifr_adding_visitor_union::visit_enum (AST_Enum *node) node->local_name ()->get_string (), node->version (), members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; CORBA_Contained_ptr tmp = CORBA_Contained::_narrow (this->ir_current_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Since the enclosing UnionDef hasn't been created @@ -337,7 +337,7 @@ ifr_adding_visitor_union::visit_enum (AST_Enum *node) // original entry, create the new one, and let the user beware. if (node->ifr_added () == 0) { - prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // This call will take the other branch. @@ -346,7 +346,7 @@ ifr_adding_visitor_union::visit_enum (AST_Enum *node) this->ir_current_ = CORBA_IDLType::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -367,12 +367,12 @@ ifr_adding_visitor_union::visit_enum (AST_Enum *node) int ifr_adding_visitor_union::visit_union (AST_Union *node) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (prev_def.in ())) @@ -387,7 +387,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node) { CORBA_Contained_var disc_def = be_global->repository ()->lookup_id (disc_type->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (disc_def.in ())) @@ -404,10 +404,10 @@ ifr_adding_visitor_union::visit_union (AST_Union *node) CORBA_IDLType_var idl_def = CORBA_IDLType::_narrow (disc_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->disc_tc_ = idl_def->type (TAO_ENV_SINGLE_ARG_PARAMETER); + this->disc_tc_ = idl_def->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -443,7 +443,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node) node->version (), this->ir_current_.in (), this->members_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } else @@ -469,7 +469,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node) node->version (), this->ir_current_.in (), this->members_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -483,24 +483,24 @@ ifr_adding_visitor_union::visit_union (AST_Union *node) CORBA_Container_var new_container = CORBA_Container::_narrow (this->ir_current_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (size_t i = 0; i < size; ++i) { this->move_queue_.dequeue_head (traveller); - CORBA::String_var name = traveller->name (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var name = traveller->name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var version = - traveller->version (TAO_ENV_SINGLE_ARG_PARAMETER); + traveller->version (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; traveller->move (new_container.in (), name.in (), version.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -515,7 +515,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node) // original entry, create the new one, and let the user beware. if (node->ifr_added () == 0) { - prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // This call will take the other branch. @@ -524,7 +524,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node) this->ir_current_ = CORBA_IDLType::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp index 8baa46d085f..e4dd26f498d 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp @@ -26,7 +26,7 @@ ifr_removing_visitor::visit_scope (UTL_Scope *node) AST_Decl *d = 0; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Continue until each element is visited. @@ -54,7 +54,7 @@ ifr_removing_visitor::visit_scope (UTL_Scope *node) CORBA_Contained_var top_level = be_global->repository ()->lookup_id (d->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!CORBA::is_nil (top_level.in ())) @@ -62,7 +62,7 @@ ifr_removing_visitor::visit_scope (UTL_Scope *node) // All we have to do is call destroy() on each IR object // in the global scope, because destroy() works on all // the contents recursively. - top_level->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + top_level->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp index d09725910c3..fd33d0a8f7e 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp @@ -23,7 +23,7 @@ CORBA::Boolean ImR_Adapter_Activator::unknown_adapter ( PortableServer::POA_ptr parent, const char *name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -38,41 +38,41 @@ ImR_Adapter_Activator::unknown_adapter ( exception_message = "While PortableServer::POA::create_servant_retention_policy"; policies[0] = parent->create_servant_retention_policy - (PortableServer::NON_RETAIN TAO_ENV_ARG_PARAMETER); + (PortableServer::NON_RETAIN ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Request Processing Policy exception_message = "While PortableServer::POA::create_request_processing_policy"; policies[1] = parent->create_request_processing_policy - (PortableServer::USE_SERVANT_MANAGER TAO_ENV_ARG_PARAMETER); + (PortableServer::USE_SERVANT_MANAGER ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - parent->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + parent->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; exception_message = "While create_POA"; PortableServer::POA_var child = parent->create_POA (name, poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; exception_message = "While unknown_adapter::policy->destroy"; for (CORBA::ULong i = 0; i < policies.length (); ++i) { CORBA::Policy_ptr policy = policies[i]; - policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } exception_message = "While child->the_activator"; - child->the_activator (this TAO_ENV_ARG_PARAMETER); + child->the_activator (this ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; exception_message = "While unknown_adapter, set_servant_manager"; - child->set_servant_manager(this->servant_locator_ TAO_ENV_ARG_PARAMETER); + child->set_servant_manager(this->servant_locator_ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h index 5d04049f033..62757907e07 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h +++ b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h @@ -36,7 +36,7 @@ public: virtual CORBA::Boolean unknown_adapter ( PortableServer::POA_ptr parent, const char *name - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp index 58513682945..ad8be8e9524 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp @@ -31,11 +31,11 @@ ImR_Forwarder::ImR_Forwarder (ImplRepo_i *imr_impl) ACE_TRY_NEW_ENV { CORBA::Object_var tmp = - orb->resolve_initial_references ("POACurrent" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("POACurrent" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->poa_current_var_ = - PortableServer::Current::_narrow (tmp.in () TAO_ENV_ARG_PARAMETER); + PortableServer::Current::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -65,7 +65,7 @@ ImR_Forwarder::preinvoke (const PortableServer::ObjectId &, PortableServer::POA_ptr poa, const char *, PortableServer::ServantLocator::Cookie & - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)) { CORBA::ORB_var orb = OPTIONS::instance ()->orb (); @@ -79,7 +79,7 @@ ImR_Forwarder::preinvoke (const PortableServer::ObjectId &, ior = this->imr_impl_->activate_server_i (poa->the_name (), 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Add the key @@ -99,7 +99,7 @@ ImR_Forwarder::preinvoke (const PortableServer::ObjectId &, if (OPTIONS::instance()->debug () >= 2) ACE_DEBUG ((LM_DEBUG, "Forwarding to %s\n", ior.c_str ())); - forward_obj = orb->string_to_object (ior.c_str () TAO_ENV_ARG_PARAMETER); + forward_obj = orb->string_to_object (ior.c_str () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -136,7 +136,7 @@ ImR_Forwarder::postinvoke (const PortableServer::ObjectId &, const char * , PortableServer::ServantLocator::Cookie , PortableServer::Servant servant - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { delete servant; diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.h b/TAO/orbsvcs/ImplRepo_Service/Forwarder.h index a95348523b6..0bab6ef87d5 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.h +++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.h @@ -39,7 +39,7 @@ public: PortableServer::POA_ptr poa, const char * operation, PortableServer::ServantLocator::Cookie &cookie - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)); /// Called after the invocation finishes. @@ -48,7 +48,7 @@ public: const char * operation, PortableServer::ServantLocator::Cookie cookie, PortableServer::Servant servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo.cpp b/TAO/orbsvcs/ImplRepo_Service/ImplRepo.cpp index 6edb2e11821..b5a26810c3d 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo.cpp @@ -13,7 +13,7 @@ run_standalone (void) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - int status = server.init (TAO_ENV_SINGLE_ARG_PARAMETER); + int status = server.init (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (status == -1) @@ -22,10 +22,10 @@ run_standalone (void) } else { - server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - status = server.fini (TAO_ENV_SINGLE_ARG_PARAMETER); + status = server.fini (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (status == -1) diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp index 98bedf49b8e..9f21638073d 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp @@ -46,7 +46,7 @@ ImplRepo_i::ImplRepo_i (void) char * ImplRepo_i::find_ior (const ACE_CString &object_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound)) { ACE_TString endpoint; @@ -68,7 +68,7 @@ ImplRepo_i::find_ior (const ACE_CString &object_name ACE_TRY { endpoint = this->activate_server_i (poa_name.c_str (), 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -97,21 +97,21 @@ ImplRepo_i::find_ior (const ACE_CString &object_name void ImplRepo_i::activate_server (const char *server - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::Administration::NotFound, ImplementationRepository::Administration::CannotActivate)) { // Since this is called through the Admin interface, we should ignore some // of the activation modes. Also ignore the return value. - this->activate_server_i (server, 0 TAO_ENV_ARG_PARAMETER); + this->activate_server_i (server, 0 ACE_ENV_ARG_PARAMETER); } ACE_TString ImplRepo_i::activate_server_i (const char *server, const int check_startup - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::Administration::NotFound, ImplementationRepository::Administration::CannotActivate)) @@ -158,11 +158,11 @@ ImplRepo_i::activate_server_i (const char *server, ACE_TRY { CORBA::Object_var object = - orb->string_to_object (server_object_ior.c_str () TAO_ENV_ARG_PARAMETER); + orb->string_to_object (server_object_ior.c_str () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ImplementationRepository::ServerObject_var server_object = - ImplementationRepository::ServerObject::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + ImplementationRepository::ServerObject::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server_object.in ())) @@ -174,7 +174,7 @@ ImplRepo_i::activate_server_i (const char *server, } // Check to see if we can ping it - server_object->ping (TAO_ENV_SINGLE_ARG_PARAMETER); + server_object->ping (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -229,7 +229,7 @@ ImplRepo_i::activate_server_i (const char *server, void ImplRepo_i::start_server_i (const char *server - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::Administration::NotFound, ImplementationRepository::Administration::CannotActivate)) @@ -399,7 +399,7 @@ ImplRepo_i::ready_check (const char *server) ACE_TString ping_object_ior, location; ImplementationRepository::ServerObject_var ping_object; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; // is the end of the window where we can get a response before // timing out @@ -428,12 +428,12 @@ ImplRepo_i::ready_check (const char *server) ACE_TRY_EX (ping1) { CORBA::Object_var object = - orb->string_to_object (ping_object_ior.c_str () TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ping_object_ior.c_str () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (ping1); ping_object = ImplementationRepository::ServerObject::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (ping1); if (CORBA::is_nil (ping_object.in ())) @@ -471,7 +471,7 @@ ImplRepo_i::ready_check (const char *server) if (OPTIONS::instance()->debug () >= 2) ACE_DEBUG ((LM_DEBUG, "Pinging Server...\n")); - ping_object->ping (TAO_ENV_SINGLE_ARG_PARAMETER); + ping_object->ping (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX (ping2); if (OPTIONS::instance()->debug () >= 2) @@ -504,7 +504,7 @@ ImplRepo_i::ready_check (const char *server) void ImplRepo_i::register_server (const char *server, const ImplementationRepository::StartupOptions &options - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::Administration::AlreadyRegistered)) { @@ -576,7 +576,7 @@ ImplRepo_i::register_server (const char *server, void ImplRepo_i::reregister_server (const char *server, const ImplementationRepository::StartupOptions &options - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (OPTIONS::instance ()->readonly ()) @@ -628,7 +628,7 @@ ImplRepo_i::reregister_server (const char *server, void ImplRepo_i::remove_server (const char *server - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::Administration::NotFound)) { @@ -658,7 +658,7 @@ char * ImplRepo_i::server_is_running (const char *server, const char *location, ImplementationRepository::ServerObject_ptr server_object - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::Administration::NotFound)) { @@ -673,7 +673,7 @@ ImplRepo_i::server_is_running (const char *server, // Get the stringified server_object_ior ACE_TCHAR *server_object_ior = orb->object_to_string (server_object - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (this->repository_.update (server, location, server_object_ior) == 0) @@ -720,7 +720,7 @@ ImplRepo_i::server_is_running (const char *server, if (profile) { - new_location = profile->to_string (TAO_ENV_SINGLE_ARG_PARAMETER); + new_location = profile->to_string (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); } else @@ -751,7 +751,7 @@ ImplRepo_i::server_is_running (const char *server, void ImplRepo_i::server_is_shutting_down (const char *server - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::Administration::NotFound)) { @@ -774,18 +774,18 @@ ImplRepo_i::server_is_shutting_down (const char *server int -ImplRepo_i::init (TAO_ENV_SINGLE_ARG_DECL) +ImplRepo_i::init (ACE_ENV_SINGLE_ARG_DECL) { CORBA::ORB_var orb = OPTIONS::instance ()->orb (); ACE_TRY { CORBA::Object_var table_object = - orb->resolve_initial_references ("IORTable" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; IORTable::Table_var adapter = - IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER); + IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (adapter.in ())) { @@ -793,12 +793,12 @@ ImplRepo_i::init (TAO_ENV_SINGLE_ARG_DECL) } else { - adapter->set_locator (this->locator_.in () TAO_ENV_ARG_PARAMETER); + adapter->set_locator (this->locator_.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } CORBA::Object_var root_poa_object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (root_poa_object.in ())) @@ -808,11 +808,11 @@ ImplRepo_i::init (TAO_ENV_SINGLE_ARG_DECL) // Get the POA object. this->root_poa_ = PortableServer::POA::_narrow (root_poa_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - this->root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyList policies (2); @@ -821,20 +821,20 @@ ImplRepo_i::init (TAO_ENV_SINGLE_ARG_DECL) // Id Assignment policy policies[0] = this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Lifespan policy policies[1] = this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->imr_poa_ = this->root_poa_->create_POA ("ImplRepoService", poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // Warning! If create_POA fails, then the policies won't be // destroyed and there will be hell to pay in memory leaks! @@ -844,7 +844,7 @@ ImplRepo_i::init (TAO_ENV_SINGLE_ARG_DECL) for (CORBA::ULong i = 0; i < policies.length (); ++i) { CORBA::Policy_ptr policy = policies[i]; - policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -857,23 +857,23 @@ ImplRepo_i::init (TAO_ENV_SINGLE_ARG_DECL) this->imr_poa_->activate_object_with_id (imr_id.in (), this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the IMR object CORBA::Object_var imr_obj = - this->imr_poa_->id_to_reference (imr_id.in () TAO_ENV_ARG_PARAMETER); + this->imr_poa_->id_to_reference (imr_id.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // And its string this->imr_ior_ = - orb->object_to_string (imr_obj.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (imr_obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Register with INS. adapter->bind ("ImplRepoService", this->imr_ior_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (OPTIONS::instance ()->debug () >= 2) @@ -896,7 +896,7 @@ ImplRepo_i::init (TAO_ENV_SINGLE_ARG_DECL) // Register the Adapter_Activator reference to be the RootPOA's // Adapter Activator. - this->root_poa_->the_activator (this->activator_ TAO_ENV_ARG_PARAMETER); + this->root_poa_->the_activator (this->activator_ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get reactor instance from TAO. @@ -1025,18 +1025,18 @@ ImplRepo_i::setup_multicast (ACE_Reactor *reactor) int -ImplRepo_i::fini (TAO_ENV_SINGLE_ARG_DECL) +ImplRepo_i::fini (ACE_ENV_SINGLE_ARG_DECL) { CORBA::ORB_var orb = OPTIONS::instance ()->orb (); ACE_TRY { CORBA::Object_var table_object = - orb->resolve_initial_references ("IORTable" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; IORTable::Table_var adapter = - IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER); + IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (adapter.in ())) { @@ -1045,14 +1045,14 @@ ImplRepo_i::fini (TAO_ENV_SINGLE_ARG_DECL) else { adapter->set_locator (IORTable::Locator::_nil () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } - this->imr_poa_->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + this->imr_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->root_poa_->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -1066,13 +1066,13 @@ ImplRepo_i::fini (TAO_ENV_SINGLE_ARG_DECL) } int -ImplRepo_i::run (TAO_ENV_SINGLE_ARG_DECL) +ImplRepo_i::run (ACE_ENV_SINGLE_ARG_DECL) { CORBA::ORB_var orb = OPTIONS::instance ()->orb (); PortableServer::POAManager_var poa_manager = - this->imr_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->imr_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Get a new iterator @@ -1108,7 +1108,7 @@ ImplRepo_i::run (TAO_ENV_SINGLE_ARG_DECL) { if (activation == ImplementationRepository::AUTO_START) this->activate_server (server_entry->ext_id_.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -1126,7 +1126,7 @@ ImplRepo_i::run (TAO_ENV_SINGLE_ARG_DECL) } - orb->run (0 TAO_ENV_ARG_PARAMETER); + orb->run (0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -1158,7 +1158,7 @@ ImplRepo_i::~ImplRepo_i (void) void ImplRepo_i::find (const char *server, ImplementationRepository::ServerInformation_out info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::Administration::NotFound)) { @@ -1202,7 +1202,7 @@ void ImplRepo_i::list (CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, ImplementationRepository::ServerInformationIterator_out server_iterator - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Initialize the out variables, so if we return early, they will @@ -1285,9 +1285,9 @@ ImplRepo_i::list (CORBA::ULong how_many, ACE_TRY { PortableServer::ObjectId_var id = - this->root_poa_->activate_object (imr_iter TAO_ENV_ARG_PARAMETER); + this->root_poa_->activate_object (imr_iter ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - server_iterator = imr_iter->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + server_iterator = imr_iter->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -1306,7 +1306,7 @@ ImplRepo_i::list (CORBA::ULong how_many, */ void ImplRepo_i::shutdown_server (const char *server - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::Administration::NotFound)) { @@ -1332,12 +1332,12 @@ ImplRepo_i::shutdown_server (const char *server ACE_TRY { CORBA::Object_var object = - orb->string_to_object (server_object_ior.c_str () TAO_ENV_ARG_PARAMETER); + orb->string_to_object (server_object_ior.c_str () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ImplementationRepository::ServerObject_var server_object = ImplementationRepository::ServerObject::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server_object.in ())) @@ -1349,7 +1349,7 @@ ImplRepo_i::shutdown_server (const char *server } // Call shutdown - server_object->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server_object->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Remove running info from repository diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h index bbc674f5454..7975ab0fd73 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h +++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h @@ -40,7 +40,7 @@ public: /// IOR_LookupTable_Callback method. Will return an IOR char *find_ior (const ACE_CString &object_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound)); // = Interface methods @@ -48,7 +48,7 @@ public: /// Starts up the server if not already running. virtual void activate_server ( const char *server - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, ImplementationRepository::Administration::NotFound, @@ -60,7 +60,7 @@ public: virtual void register_server ( const char *server, const ImplementationRepository::StartupOptions &options - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, ImplementationRepository::Administration::AlreadyRegistered @@ -70,20 +70,20 @@ public: virtual void reregister_server ( const char *server, const ImplementationRepository::StartupOptions &options - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC ((CORBA::SystemException)); /// Removes the server from the repository. virtual void remove_server ( const char *server - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::Administration::NotFound)); /// Attempts to gracefully shut down the server, virtual void shutdown_server ( const char *server - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::Administration::NotFound)); @@ -93,14 +93,14 @@ public: const char *server, const char *location, ImplementationRepository::ServerObject_ptr server_object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::Administration::NotFound)); /// What the server should call before it shuts down. virtual void server_is_shutting_down ( const char *server - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::Administration::NotFound)); @@ -108,7 +108,7 @@ public: virtual void find ( const char *server, ImplementationRepository::ServerInformation_out info - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::Administration::NotFound)); @@ -118,17 +118,17 @@ public: CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, ImplementationRepository::ServerInformationIterator_out server_iterator - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC ((CORBA::SystemException)); /// Initialize the Server state - parsing arguments and waiting. - int init (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + int init (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Cleans up any state created by init (). - int fini (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + int fini (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Runs the orb. - int run (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + int run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); private: /// Implementation of activate_server. is a flag to check @@ -136,7 +136,7 @@ private: ACE_TString activate_server_i ( const char *server, const int check_startup - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, ImplementationRepository::Administration::NotFound, @@ -146,7 +146,7 @@ private: /// This method starts the server process. void start_server_i ( const char *server - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, ImplementationRepository::Administration::NotFound, diff --git a/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp b/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp index 3792e57cdca..7f89237359f 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp @@ -37,7 +37,7 @@ ImR_Iterator::~ImR_Iterator () CORBA::Boolean ImR_Iterator::next_n (CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_NEW_THROW_EX (server_list, @@ -95,7 +95,7 @@ ImR_Iterator::next_n (CORBA::ULong how_many, // Destroys the iterator. void -ImR_Iterator::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ImR_Iterator::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/ImplRepo_Service/Iterator.h b/TAO/orbsvcs/ImplRepo_Service/Iterator.h index bd71a088a57..295d45020fc 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Iterator.h +++ b/TAO/orbsvcs/ImplRepo_Service/Iterator.h @@ -41,12 +41,12 @@ public: virtual CORBA::Boolean next_n ( CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC ((CORBA::SystemException)); /// Destroys the iterator. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator.cpp index dc20a2d05a5..701a2f0665e 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Locator.cpp @@ -20,11 +20,11 @@ ImR_Locator::ImR_Locator (ImplRepo_i *repo) char * ImR_Locator::locate (const char *object_key - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound)) { ACE_CString key (object_key); - return this->repo_->find_ior (key TAO_ENV_ARG_PARAMETER); + return this->repo_->find_ior (key ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator.h b/TAO/orbsvcs/ImplRepo_Service/Locator.h index 3e022341c1e..b0e724a9b24 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator.h +++ b/TAO/orbsvcs/ImplRepo_Service/Locator.h @@ -43,7 +43,7 @@ public: /// Locate the appropriate IOR. char * locate (const char *object_key - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound)); private: diff --git a/TAO/orbsvcs/ImplRepo_Service/NT_Service.cpp b/TAO/orbsvcs/ImplRepo_Service/NT_Service.cpp index 4d8c96055aa..246b02179ed 100644 --- a/TAO/orbsvcs/ImplRepo_Service/NT_Service.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/NT_Service.cpp @@ -79,7 +79,7 @@ ImR_NT_Service::svc (void) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - status = server.init (TAO_ENV_SINGLE_ARG_PARAMETER); + status = server.init (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (status == -1) @@ -89,10 +89,10 @@ ImR_NT_Service::svc (void) else { report_status (SERVICE_RUNNING); - server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - status = server.fini (TAO_ENV_SINGLE_ARG_PARAMETER); + status = server.fini (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (status == -1) diff --git a/TAO/orbsvcs/ImplRepo_Service/Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Options.cpp index 3e4b9bfbf9d..969df4d9eac 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Options.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Options.cpp @@ -250,7 +250,7 @@ Options::init (int argc, ACE_TCHAR *argv[]) this->orb_ = CORBA::ORB_init (orb_argc, orb_args.argv (), 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp index 95436d37a0d..6ef4001910f 100644 --- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp @@ -55,14 +55,14 @@ TAO_IMR_i::init (int argc, char **argv) const char *exception_message = "Null Message"; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Retrieve the ORB. this->orb_ = CORBA::ORB_init (this->argc_, this->argv_, "internet" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse command line and verify parameters. @@ -72,7 +72,7 @@ TAO_IMR_i::init (int argc, char **argv) // Get the ImplRepo object CORBA::Object_var implrepo_object = - orb_->resolve_initial_references ("ImplRepoService" TAO_ENV_ARG_PARAMETER); + orb_->resolve_initial_references ("ImplRepoService" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (implrepo_object.in ())) @@ -85,7 +85,7 @@ TAO_IMR_i::init (int argc, char **argv) exception_message = "While narrowing ImplRepo"; this->implrepo_ = ImplementationRepository::Administration::_narrow - (implrepo_object.in() TAO_ENV_ARG_PARAMETER); + (implrepo_object.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->op_->set_imr (this->implrepo_.in ()); @@ -615,11 +615,11 @@ TAO_IMR_Op_Update::parse (int argc, ACE_TCHAR **argv) int TAO_IMR_Op_Activate::run (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { this->implrepo_->activate_server - (this->server_name_.c_str () TAO_ENV_ARG_PARAMETER); + (this->server_name_.c_str () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Successfully Activated server <%s>\n", this->server_name_.c_str ())); @@ -657,11 +657,11 @@ TAO_IMR_Op_Add::run (void) startup_options.working_directory = CORBA::string_dup (this->working_dir_.c_str ()); startup_options.activation = this->activation_; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { this->implrepo_->register_server - (this->server_name_.c_str (), startup_options TAO_ENV_ARG_PARAMETER); + (this->server_name_.c_str (), startup_options ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Successfully registered server <%s>\n", this->server_name_.c_str ())); @@ -693,10 +693,10 @@ TAO_IMR_Op_Autostart::run (void) ImplementationRepository::ServerInformationList_var server_list; ImplementationRepository::ServerInformationIterator_var server_iter; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->implrepo_->list (0, server_list, server_iter TAO_ENV_ARG_PARAMETER); + this->implrepo_->list (0, server_list, server_iter ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Check for more to be displayed @@ -708,7 +708,7 @@ TAO_IMR_Op_Autostart::run (void) { flag = server_iter->next_n (IR_LIST_CHUNK, server_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (size_t i = 0; i < server_list->length (); i++) @@ -716,7 +716,7 @@ TAO_IMR_Op_Autostart::run (void) ACE_TRY_EX (inside) { this->implrepo_->activate_server (server_list[i].server.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (inside); } ACE_CATCHANY @@ -761,7 +761,7 @@ TAO_IMR_Op_IOR::run (void) } CORBA::String_var imr_str = - this->implrepo_->_stubobj ()->profile_in_use ()->to_string (TAO_ENV_SINGLE_ARG_PARAMETER); + this->implrepo_->_stubobj ()->profile_in_use ()->to_string (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Search for "corbaloc:" alone, without the protocol. This code @@ -830,7 +830,7 @@ TAO_IMR_Op_List::run (void) ImplementationRepository::ServerInformationList_var server_list; ImplementationRepository::ServerInformationIterator_var server_iter; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // If there is a server name, list only that server. Otherwise, look @@ -838,7 +838,7 @@ TAO_IMR_Op_List::run (void) if (this->server_name_.length () == 0) { this->implrepo_->list - (IR_LIST_CHUNK, server_list, server_iter TAO_ENV_ARG_PARAMETER); + (IR_LIST_CHUNK, server_list, server_iter ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (size_t i = 0; i < server_list->length (); i++) @@ -852,7 +852,7 @@ TAO_IMR_Op_List::run (void) while (flag) { flag = server_iter->next_n - (IR_LIST_CHUNK, server_list TAO_ENV_ARG_PARAMETER); + (IR_LIST_CHUNK, server_list ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (size_t i = 0; i < server_list->length (); i++) @@ -868,7 +868,7 @@ TAO_IMR_Op_List::run (void) ImplementationRepository::ServerInformation_var server_information; this->implrepo_->find - (this->server_name_.c_str (), server_information TAO_ENV_ARG_PARAMETER); + (this->server_name_.c_str (), server_information ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Display verbosely @@ -895,11 +895,11 @@ TAO_IMR_Op_List::run (void) int TAO_IMR_Op_Remove::run (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { this->implrepo_->remove_server - (this->server_name_.c_str () TAO_ENV_ARG_PARAMETER); + (this->server_name_.c_str () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Successfully removed server <%s>\n", this->server_name_.c_str ())); @@ -928,11 +928,11 @@ TAO_IMR_Op_Remove::run (void) int TAO_IMR_Op_Shutdown::run (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { this->implrepo_->shutdown_server - (this->server_name_.c_str () TAO_ENV_ARG_PARAMETER); + (this->server_name_.c_str () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Successfully shut down server <%s>\n", this->server_name_.c_str ())); @@ -958,11 +958,11 @@ TAO_IMR_Op_Update::run (void) { ImplementationRepository::ServerInformation_var server_information; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { this->implrepo_->find - (this->server_name_.c_str (), server_information TAO_ENV_ARG_PARAMETER); + (this->server_name_.c_str (), server_information ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Conditionally update the startup options @@ -981,7 +981,7 @@ TAO_IMR_Op_Update::run (void) this->implrepo_->reregister_server (this->server_name_.c_str (), server_information->startup - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->display_server_information (server_information.in ()); diff --git a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp index ba2e7bf843c..796712d4f5f 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp +++ b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp @@ -27,7 +27,7 @@ Criteria_Evaluator::~Criteria_Evaluator () } LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * -Criteria_Evaluator::getInitialization (TAO_ENV_SINGLE_ARG_DECL) +Criteria_Evaluator::getInitialization (ACE_ENV_SINGLE_ARG_DECL) { LifeCycleService::Criteria_Evaluator::SeqNamedValuePair *sequence_ptr = 0; @@ -45,7 +45,7 @@ Criteria_Evaluator::getInitialization (TAO_ENV_SINGLE_ARG_DECL) } char * -Criteria_Evaluator::getFilter (TAO_ENV_SINGLE_ARG_DECL) +Criteria_Evaluator::getFilter (ACE_ENV_SINGLE_ARG_DECL) { const char* string; CORBA::Any value; diff --git a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h index 13569acd21f..d170b8fdca1 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h +++ b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h @@ -28,16 +28,16 @@ public: Criteria_Evaluator (const CosLifeCycle::Criteria &criteria); ~Criteria_Evaluator (void); - LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getInitialization (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getInitialization (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); - char * getFilter (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + char * getFilter (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); - LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getLogicalLocation (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getLogicalLocation (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return 0; } - char * getPreferences (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + char * getPreferences (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return 0; } diff --git a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp index c7aaac86248..8d2448ba833 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp +++ b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp @@ -47,7 +47,7 @@ Factory_Trader::Factory_Trader (int debug_level) // Set the service type repository support_Attributes_ptr_->type_repos - (this->repository_._this (TAO_ENV_SINGLE_ARG_PARAMETER)); + (this->repository_._this (ACE_ENV_SINGLE_ARG_PARAMETER)); ACE_TRY_CHECK; // Add the "Factory" type to the repository @@ -102,7 +102,7 @@ Factory_Trader::add_type () GENERIC_FACTORY_INTERFACE_REPOSITORY_ID, propStructSeq, superTypeSeq - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -147,7 +147,7 @@ Factory_Trader::_cxx_export (const char * name, register_ptr->_cxx_export (CORBA::Object::_duplicate (object_ptr), CORBA::string_dup("GenericFactory"), propertySeq - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -192,7 +192,7 @@ Factory_Trader::query (const char* constraint) CosTrading::OfferSeq_out(offerSeq_ptr), // results CosTrading::OfferIterator_out(offerIterator_ptr), // more results CosTrading::PolicyNameSeq_out(policyNameSeq_ptr) // Policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp index 61bdbefd797..c2459100086 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp @@ -31,7 +31,7 @@ Life_Cycle_Service_Server::~Life_Cycle_Service_Server (void) CosNaming::Name generic_Factory_Name (2); generic_Factory_Name.length (2); generic_Factory_Name[0].id = CORBA::string_dup ("LifeCycle_Service"); - this->namingContext_var_->unbind (generic_Factory_Name TAO_ENV_ARG_PARAMETER); + this->namingContext_var_->unbind (generic_Factory_Name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -44,13 +44,13 @@ Life_Cycle_Service_Server::~Life_Cycle_Service_Server (void) int Life_Cycle_Service_Server::init (int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { int retval = 0; retval = this->orb_manager_.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (retval == -1) @@ -61,7 +61,7 @@ Life_Cycle_Service_Server::init (int argc, // Activate the POA manager - retval = this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER); + retval = this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (retval == -1) @@ -82,7 +82,7 @@ Life_Cycle_Service_Server::init (int argc, // Activate the object. CORBA::String_var str = this->orb_manager_.activate (this->life_Cycle_Service_i_ptr_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (this->debug_level_ >= 2) @@ -97,7 +97,7 @@ Life_Cycle_Service_Server::init (int argc, // Get the Naming Service object reference. CORBA::Object_var namingObj_var = - orb_manager_.orb()->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); + orb_manager_.orb()->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (namingObj_var.in ())) @@ -106,7 +106,7 @@ Life_Cycle_Service_Server::init (int argc, // Narrow the object reference to a Naming Context. namingContext_var_ = CosNaming::NamingContext::_narrow (namingObj_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -122,12 +122,12 @@ Life_Cycle_Service_Server::init (int argc, life_Cycle_Service_Name.length (1); life_Cycle_Service_Name[0].id = CORBA::string_dup ("Life_Cycle_Service"); - CORBA::Object_ptr tmp = this->life_Cycle_Service_i_ptr_->_this(TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Object_ptr tmp = this->life_Cycle_Service_i_ptr_->_this(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; namingContext_var_->bind (life_Cycle_Service_Name, tmp - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->debug_level_ >= 2) @@ -145,13 +145,13 @@ Life_Cycle_Service_Server::init (int argc, int -Life_Cycle_Service_Server::run (TAO_ENV_SINGLE_ARG_DECL) +Life_Cycle_Service_Server::run (ACE_ENV_SINGLE_ARG_DECL) { if (this->debug_level_ >= 1) ACE_DEBUG ((LM_DEBUG, "\nLifeCycle Service: Life_Cycle_Service_Server is running\n")); - orb_manager_.orb()->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb_manager_.orb()->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -202,14 +202,14 @@ main (int argc, char *argv []) { int check = life_Cycle_Service_Server.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (check) return 1; else { - life_Cycle_Service_Server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + life_Cycle_Service_Server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK } } diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h index 371e2a98c26..80efaaf5bd3 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h @@ -39,10 +39,10 @@ public: int init (int argc, char *argv[] - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize the Server state - parsing arguments and ... - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the orb. u_int parse_args (void); diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp index 854b21687a2..61e19fe726e 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp @@ -35,7 +35,7 @@ Life_Cycle_Service_i::~Life_Cycle_Service_i (void) CORBA::Boolean Life_Cycle_Service_i::supports (const CosLifeCycle::Key & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; @@ -44,7 +44,7 @@ Life_Cycle_Service_i::supports (const CosLifeCycle::Key & CORBA::Object_ptr Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key, const CosLifeCycle::Criteria &the_criteria - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosLifeCycle::NoFactory, CosLifeCycle::InvalidCriteria, @@ -64,7 +64,7 @@ Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key, if (this->debug_level_ >= 2) ACE_DEBUG ((LM_DEBUG, "Life_Cycle_Service_i:create_object: getFilter will be called.\n")); - char* filter = criteria_Evaluator.getFilter (TAO_ENV_SINGLE_ARG_PARAMETER); + char* filter = criteria_Evaluator.getFilter (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (this->debug_level_ >= 2) @@ -97,7 +97,7 @@ Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key, { genericFactory_var = CosLifeCycle::GenericFactory::_narrow (genericFactoryObj_ptr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // ACE_TRY_CHECK; } ACE_CATCHANY @@ -120,7 +120,7 @@ Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key, // Now retrieve the Object obj ref corresponding to the key. CORBA::Object_var object_var = genericFactory_var->create_object (factory_key, the_criteria - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (this->debug_level_ >= 2) @@ -150,7 +150,7 @@ Life_Cycle_Service_i::register_factory (const char * name, const char * location, const char * description, CORBA::Object_ptr object - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException)) { if (factory_trader_ptr_ == 0) diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h index dc0cbb4c0f6..2997da242a5 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h @@ -30,14 +30,14 @@ public: ~Life_Cycle_Service_i (void); CORBA::Boolean supports (const CosLifeCycle::Key &factory_key - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns true if the Generic Factory is able to forward a request // for creating an object described by the . CORBA::Object_ptr create_object (const CosLifeCycle::Key &factory_key, const CosLifeCycle::Criteria &the_criteria - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosLifeCycle::NoFactory, CosLifeCycle::InvalidCriteria, @@ -50,7 +50,7 @@ public: const char * location, const char * description, CORBA::Object_ptr object - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException)); // Registers a factory with specified properties diff --git a/TAO/orbsvcs/LoadBalancer/LoadBalancer.cpp b/TAO/orbsvcs/LoadBalancer/LoadBalancer.cpp index 1ca665677c6..86dd1465a60 100644 --- a/TAO/orbsvcs/LoadBalancer/LoadBalancer.cpp +++ b/TAO/orbsvcs/LoadBalancer/LoadBalancer.cpp @@ -24,7 +24,7 @@ TAO_LoadBalancer::~TAO_LoadBalancer (void) void TAO_LoadBalancer::parse_args (int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_Get_Opt get_opts (argc, argv, "i:o:s:h"); @@ -65,31 +65,31 @@ TAO_LoadBalancer::parse_args (int argc, void TAO_LoadBalancer::init (int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->orb_ = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER); + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Get the POA from the ORB. CORBA::Object_var poa = - this->orb_->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Get the POA object. this->root_poa_ = PortableServer::POA::_narrow (poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Get the POA_Manager. PortableServer::POAManager_var poa_manager = - this->root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Check the non-ORB arguments. - this->parse_args (argc, argv TAO_ENV_ARG_PARAMETER); + this->parse_args (argc, argv ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Initialize the LoadBalancer servant. @@ -104,11 +104,11 @@ TAO_LoadBalancer::init (int argc, this->root_poa_.in ())); CORBA::Object_var obj = - this->balancer_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->balancer_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::String_var str = - this->orb_->object_to_string (obj.in () TAO_ENV_ARG_PARAMETER); + this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; FILE *lb_ior = ACE_OS::fopen (this->load_balancer_file_, "w"); @@ -129,7 +129,7 @@ TAO_LoadBalancer::usage (const char *cmd) const } void -TAO_LoadBalancer::run (TAO_ENV_SINGLE_ARG_DECL) +TAO_LoadBalancer::run (ACE_ENV_SINGLE_ARG_DECL) { - this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/LoadBalancer/LoadBalancer.h b/TAO/orbsvcs/LoadBalancer/LoadBalancer.h index 4c0b97a425c..d64eb3388df 100644 --- a/TAO/orbsvcs/LoadBalancer/LoadBalancer.h +++ b/TAO/orbsvcs/LoadBalancer/LoadBalancer.h @@ -39,15 +39,15 @@ public: // Destructor. void init (int argc, char *argv[] - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize the service - void run (TAO_ENV_SINGLE_ARG_DECL); + void run (ACE_ENV_SINGLE_ARG_DECL); // Run the TAO_Loadbalancer. protected: void parse_args (int argc, char *argv[] - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // parses the arguments. void usage (const char *msg) const; diff --git a/TAO/orbsvcs/LoadBalancer/LoadBalancer_Service.cpp b/TAO/orbsvcs/LoadBalancer/LoadBalancer_Service.cpp index bc77f0cb4e0..75537c32ca5 100644 --- a/TAO/orbsvcs/LoadBalancer/LoadBalancer_Service.cpp +++ b/TAO/orbsvcs/LoadBalancer/LoadBalancer_Service.cpp @@ -10,15 +10,15 @@ int main (int argc, char *argv[]) { // @@ Ossama: i'm not sure what the LoadBalancer class buys you. - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { TAO_LoadBalancer balancer; - balancer.init (argc, argv TAO_ENV_ARG_PARAMETER); + balancer.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - balancer.run (TAO_ENV_SINGLE_ARG_PARAMETER); + balancer.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/Logging_Service/Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Logging_Service.cpp index 576e9eaef6f..95baa3d07b1 100644 --- a/TAO/orbsvcs/Logging_Service/Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/Logging_Service.cpp @@ -17,58 +17,58 @@ Logging_Service::~Logging_Service (void) void Logging_Service::init_ORB (int& argc, char *argv [] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Object_var poa_object = this->orb_->resolve_initial_references("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->poa_ = PortableServer::POA::_narrow (poa_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::POAManager_var poa_manager = - this->poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void Logging_Service::startup (int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "\nStarting up the Telecom Log Service...\n")); // initalize the ORB. this->init_ORB (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Resolve the naming service. - this->resolve_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER); + this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Activate the basic log factory // CORBA::Object_var obj = DsLogAdmin::BasicLogFactory_var obj = this->basic_log_factory_.activate (this->poa_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (obj.in ())); CORBA::String_var str = - this->orb_->object_to_string (obj.in () TAO_ENV_ARG_PARAMETER); + this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -83,7 +83,7 @@ Logging_Service::startup (int argc, char *argv[] this->naming_->rebind (name, obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -92,11 +92,11 @@ Logging_Service::startup (int argc, char *argv[] } void -Logging_Service::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL) +Logging_Service::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL) { CORBA::Object_var naming_obj = this->orb_->resolve_initial_references ("NameService" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Need to check return value for errors. @@ -105,7 +105,7 @@ Logging_Service::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL) this->naming_ = CosNaming::NamingContext::_narrow (naming_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -114,10 +114,10 @@ Logging_Service::run (void) { ACE_DEBUG ((LM_DEBUG, "%s: Running the Telecom Log Service\n", __FILE__)); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -130,17 +130,17 @@ Logging_Service::run (void) } void -Logging_Service::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL) { // Deactivate. PortableServer::ObjectId_var oid = this->poa_->servant_to_id (&this->basic_log_factory_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // deactivate from the poa. this->poa_->deactivate_object (oid.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Unbind from the naming service. @@ -149,7 +149,7 @@ Logging_Service::shutdown (TAO_ENV_SINGLE_ARG_DECL) name[0].id = CORBA::string_dup (this->basic_log_factory_name_); this->naming_->unbind (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // shutdown the ORB. if (!CORBA::is_nil (this->orb_.in ())) @@ -165,7 +165,7 @@ main (int argc, char *argv[]) { service.startup (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (service.run () == -1) diff --git a/TAO/orbsvcs/Logging_Service/Logging_Service.h b/TAO/orbsvcs/Logging_Service/Logging_Service.h index d81f88a429b..b2cdd7d7b2e 100644 --- a/TAO/orbsvcs/Logging_Service/Logging_Service.h +++ b/TAO/orbsvcs/Logging_Service/Logging_Service.h @@ -40,7 +40,7 @@ class Logging_Service // Parses the command line arguments. void startup (int argc, char *argv[] - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initializes the Telecom Log Service. // Returns 0 on success, -1 on error. @@ -48,16 +48,16 @@ class Logging_Service // run the Telecom Log Service. // Returns 0 on success, -1 on error. - void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Shutdown the Telecom Log Service. // Returns 0 on success, -1 on error. protected: void init_ORB (int& argc, char *argv [] - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // initialize the ORB. - void resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL); + void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL); // Resolve the naming service. // = Data members diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp index 0103758770f..cf629267ac2 100644 --- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp +++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp @@ -137,7 +137,7 @@ TAO_NT_Naming_Service::svc (void) ACE_TRY { report_status (SERVICE_RUNNING); - naming_service.run (TAO_ENV_SINGLE_ARG_PARAMETER); + naming_service.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp index 6086e92078e..6883aebbb5d 100644 --- a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp +++ b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp @@ -17,7 +17,7 @@ main (int argc, char *argv[]) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - naming_service.run (TAO_ENV_SINGLE_ARG_PARAMETER); + naming_service.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp index 65af71103f4..8ecfdfb5cd6 100644 --- a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp +++ b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp @@ -28,7 +28,7 @@ TAO_Naming_Service::init (int argc, { int result; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { this->argc_ = argc; @@ -36,7 +36,7 @@ TAO_Naming_Service::init (int argc, // Initialize the ORB this->orb_ = - CORBA::ORB_init (this->argc_, this->argv_, 0 TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (this->argc_, this->argv_, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse the args for '-t' option. If '-t' option is passed, do @@ -109,17 +109,17 @@ TAO_Naming_Service::parse_args (int argc, // Run the ORB event loop. int -TAO_Naming_Service::run (TAO_ENV_SINGLE_ARG_DECL) +TAO_Naming_Service::run (ACE_ENV_SINGLE_ARG_DECL) { if (time_ == 0) { - this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } else { ACE_Time_Value tv (time_); - this->orb_->run (tv TAO_ENV_ARG_PARAMETER); + this->orb_->run (tv ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.h b/TAO/orbsvcs/Naming_Service/Naming_Service.h index b7d9970a70c..d3f71c2cfee 100644 --- a/TAO/orbsvcs/Naming_Service/Naming_Service.h +++ b/TAO/orbsvcs/Naming_Service/Naming_Service.h @@ -42,7 +42,7 @@ public: virtual int init (int argc, char *argv[]); // Initialize the Naming Service with the arguments. - int run (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + int run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Run the TAO_Naming_Service. virtual ~TAO_Naming_Service (void); diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp index abac02b1c31..301728ccddd 100644 --- a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp +++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp @@ -136,7 +136,7 @@ TAO_NT_Notify_Service::svc (void) ACE_TRY { report_status (SERVICE_RUNNING); - notify_service.run (TAO_ENV_SINGLE_ARG_PARAMETER); + notify_service.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/Notify_Service/Notify_Server.cpp b/TAO/orbsvcs/Notify_Service/Notify_Server.cpp index 3b413207337..ecf14ca8a25 100644 --- a/TAO/orbsvcs/Notify_Service/Notify_Server.cpp +++ b/TAO/orbsvcs/Notify_Service/Notify_Server.cpp @@ -22,7 +22,7 @@ main (int argc, char *argv[]) ACE_DECLARE_NEW_CORBA_ENV; - if (notify_service.init (argc, argv TAO_ENV_ARG_PARAMETER) == -1) + if (notify_service.init (argc, argv ACE_ENV_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, "Failed to start the Notification Service.\n"), 1); @@ -30,12 +30,12 @@ main (int argc, char *argv[]) ACE_TRY { notify_service.run (); - notify_service.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + notify_service.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY { - notify_service.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + notify_service.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Failed to start the Notification Service\n"); return 1; diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp index 07f46e9c588..9c47f82307a 100644 --- a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp +++ b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp @@ -31,17 +31,17 @@ TAO_Notify_Service::~TAO_Notify_Service (void) int TAO_Notify_Service::init_ORB (int& argc, char *argv [] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::Object_var poa_obj = this->orb_->resolve_initial_references("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (poa_obj.in ())) @@ -51,14 +51,14 @@ TAO_Notify_Service::init_ORB (int& argc, char *argv [] this->poa_ = PortableServer::POA::_narrow (poa_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); PortableServer::POAManager_var poa_manager = - this->poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -66,11 +66,11 @@ TAO_Notify_Service::init_ORB (int& argc, char *argv [] int TAO_Notify_Service::init (int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // initalize the ORB. if (this->init_ORB (argc, argv - TAO_ENV_ARG_PARAMETER) != 0) + ACE_ENV_ARG_PARAMETER) != 0) return -1; ACE_CHECK_RETURN (-1); @@ -92,7 +92,7 @@ TAO_Notify_Service::init (int argc, char *argv[] if (this->use_name_svc_) { // Resolve the naming service. - int ns_ret = this->resolve_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER); + int ns_ret = this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (ns_ret != 0) @@ -105,14 +105,14 @@ TAO_Notify_Service::init (int argc, char *argv[] // Activate the factory this->notify_factory_ = TAO_Notify_EventChannelFactory_i::create (this->poa_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_ASSERT (!CORBA::is_nil (this->notify_factory_.in ())); // Write IOR to a file, if asked. CORBA::String_var str = - this->orb_->object_to_string (this->notify_factory_.in () TAO_ENV_ARG_PARAMETER); + this->orb_->object_to_string (this->notify_factory_.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (this->ior_output_file_) @@ -133,11 +133,11 @@ TAO_Notify_Service::init (int argc, char *argv[] { CORBA::Object_var table_object = this->orb_->resolve_initial_references ("IORTable" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); IORTable::Table_var adapter = - IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER); + IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (adapter.in ())) { @@ -147,10 +147,10 @@ TAO_Notify_Service::init (int argc, char *argv[] { CORBA::String_var ior = this->orb_->object_to_string (this->notify_factory_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); adapter->bind (this->notify_factory_name_.c_str (), ior.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } } @@ -163,13 +163,13 @@ TAO_Notify_Service::init (int argc, char *argv[] CosNaming::Name_var name = this->naming_->to_name (this->notify_factory_name_.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->naming_->rebind (name.in (), this->notify_factory_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, @@ -188,16 +188,16 @@ TAO_Notify_Service::init (int argc, char *argv[] this->notify_factory_->create_channel (initial_qos, initial_admin, id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); name = this->naming_->to_name ( this->notify_channel_name_.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->naming_->rebind (name.in (), ec.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, @@ -211,11 +211,11 @@ TAO_Notify_Service::init (int argc, char *argv[] } int -TAO_Notify_Service::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Service::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL) { CORBA::Object_var naming_obj = this->orb_->resolve_initial_references ("NameService" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Need to check return value for errors. @@ -226,7 +226,7 @@ TAO_Notify_Service::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL) this->naming_ = CosNaming::NamingContextExt::_narrow (naming_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -245,10 +245,10 @@ TAO_Notify_Service::run () return 0; } - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -261,17 +261,17 @@ TAO_Notify_Service::run () } void -TAO_Notify_Service::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL) { // Deactivate. PortableServer::ObjectId_var oid = this->poa_->reference_to_id (this->notify_factory_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // deactivate from the poa. this->poa_->deactivate_object (oid.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (this->use_name_svc_) @@ -279,11 +279,11 @@ TAO_Notify_Service::shutdown (TAO_ENV_SINGLE_ARG_DECL) // Unbind from the naming service. CosNaming::Name_var name = this->naming_->to_name (this->notify_factory_name_.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->naming_->unbind (name.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -393,10 +393,10 @@ Worker::orb (CORBA::ORB_ptr orb) int Worker::svc (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.h b/TAO/orbsvcs/Notify_Service/Notify_Service.h index 21f74537880..e1b92cda4b1 100644 --- a/TAO/orbsvcs/Notify_Service/Notify_Service.h +++ b/TAO/orbsvcs/Notify_Service/Notify_Service.h @@ -65,7 +65,7 @@ class TAO_Notify_Service // Destructor. int init (int argc, char *argv[] - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initializes the Service. // Returns 0 on success, -1 on error. @@ -73,7 +73,7 @@ class TAO_Notify_Service // run the Service. // Returns 0 on success, -1 on error. - void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Shutdown the Service. // Returns 0 on success, -1 on error. @@ -81,10 +81,10 @@ class TAO_Notify_Service // protected: int init_ORB (int& argc, char *argv [] - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // initialize the ORB. - int resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL); + int resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL); // Resolve the naming service. int parse_args (int argc, char *argv []); diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp index 6e83f3f5cdd..8ed17ee846f 100644 --- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp +++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp @@ -51,7 +51,7 @@ TAO_Scheduling_Service::init (int argc, char *argv[]) ACE_TRY_NEW_ENV { // Initialize ORB manager. - this->orb_manager_.init (argc, argv TAO_ENV_ARG_PARAMETER); + this->orb_manager_.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; orb = this->orb_manager_.orb (); @@ -60,7 +60,7 @@ TAO_Scheduling_Service::init (int argc, char *argv[]) poa_manager = this->orb_manager_.poa_manager (); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Check the non-ORB arguments. this needs to come before we @@ -104,7 +104,7 @@ TAO_Scheduling_Service::init (int argc, char *argv[]) // Locate the naming service. CORBA::Object_var naming_obj = - orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (naming_obj.in ())) @@ -112,15 +112,15 @@ TAO_Scheduling_Service::init (int argc, char *argv[]) " (%P|%t) Unable to locate the Naming Service.\n"), -1); CosNaming::NamingContext_var naming_context = - CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER); + CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecScheduler::Scheduler_var scheduler = - this->scheduler_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->scheduler_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var scheduler_ior_string = - orb->object_to_string (scheduler.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (scheduler.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "The scheduler IOR is <%s>\n", @@ -130,7 +130,7 @@ TAO_Scheduling_Service::init (int argc, char *argv[]) CosNaming::Name schedule_name (1); schedule_name.length (1); schedule_name[0].id = CORBA::string_dup (this->service_name_); - naming_context->rebind (schedule_name, scheduler.in () TAO_ENV_ARG_PARAMETER); + naming_context->rebind (schedule_name, scheduler.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->ior_file_name_ != 0) @@ -171,10 +171,10 @@ TAO_Scheduling_Service::init (int argc, char *argv[]) // Runs the TAO_Scheduling_Service. int -TAO_Scheduling_Service::run (TAO_ENV_SINGLE_ARG_DECL) +TAO_Scheduling_Service::run (ACE_ENV_SINGLE_ARG_DECL) { // Run the ORB manager. - return this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER); } @@ -284,7 +284,7 @@ int main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "%s; running scheduling service\n", __FILE__)); - scheduling_service.run (TAO_ENV_SINGLE_ARG_PARAMETER); + scheduling_service.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h index f741fb60e6b..0450f6e9c4f 100644 --- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h +++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h @@ -51,7 +51,7 @@ public: int init (int argc, char *argv[]); // Initialize the Scheduling Service with the arguments. - int run (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + int run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Run the TAO_Scheduling_Service. ~TAO_Scheduling_Service (void); diff --git a/TAO/orbsvcs/TAO_Service/TAO_Service.cpp b/TAO/orbsvcs/TAO_Service/TAO_Service.cpp index fab82fed608..0f64c4f7e6e 100644 --- a/TAO/orbsvcs/TAO_Service/TAO_Service.cpp +++ b/TAO/orbsvcs/TAO_Service/TAO_Service.cpp @@ -32,12 +32,12 @@ extern "C" void handler (int) int main (int argc, ACE_TCHAR *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGHUP); @@ -46,7 +46,7 @@ main (int argc, ACE_TCHAR *argv[]) { ACE_Time_Value tv (5, 0); - orb->perform_work (tv TAO_ENV_ARG_PARAMETER); + orb->perform_work (tv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.cpp b/TAO/orbsvcs/Time_Service/Clerk_i.cpp index 90b5568f2b6..49abf595824 100644 --- a/TAO/orbsvcs/Time_Service/Clerk_i.cpp +++ b/TAO/orbsvcs/Time_Service/Clerk_i.cpp @@ -53,7 +53,7 @@ Clerk_i::read_ior (const char *filename) int result = 0; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { for (char *str = ACE_OS::strtok (data, "\n"); @@ -66,7 +66,7 @@ Clerk_i::read_ior (const char *filename) CORBA::Object_var objref = this->orb_->string_to_object (str - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Return if the server reference is nil. @@ -80,7 +80,7 @@ Clerk_i::read_ior (const char *filename) CosTime::TimeService_ptr server = CosTime::TimeService::_narrow (objref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->insert_server (server); @@ -170,7 +170,7 @@ Clerk_i::parse_args (void) int Clerk_i::get_first_IOR (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { char host_name[MAXHOSTNAMELEN]; @@ -188,13 +188,13 @@ Clerk_i::get_first_IOR (void) // Resolve name. CORBA::Object_var temp_object = this->my_name_server_->resolve (server_context_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosNaming::NamingContext_var server_context = CosNaming::NamingContext::_narrow (temp_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server_context.in ())) @@ -213,12 +213,12 @@ Clerk_i::get_first_IOR (void) temp_object = server_context->resolve (server_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosTime::TimeService_var obj = CosTime::TimeService::_narrow (temp_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (obj.in ())) @@ -257,7 +257,7 @@ int Clerk_i::next_n_IORs (CosNaming::BindingIterator_var iter, CosNaming::NamingContext_var server_context) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CosNaming::Binding_var binding; @@ -265,7 +265,7 @@ Clerk_i::next_n_IORs (CosNaming::BindingIterator_var iter, if (!CORBA::is_nil (iter.in ())) { while (iter->next_one (binding.out () - TAO_ENV_ARG_PARAMETER)) + ACE_ENV_ARG_PARAMETER)) { ACE_TRY_CHECK; @@ -279,12 +279,12 @@ Clerk_i::next_n_IORs (CosNaming::BindingIterator_var iter, CORBA::Object_var temp_object = server_context->resolve (server_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosTime::TimeService_ptr server = CosTime::TimeService::_narrow (temp_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->insert_server (server); @@ -311,7 +311,7 @@ Clerk_i::next_n_IORs (CosNaming::BindingIterator_var iter, int Clerk_i::init_naming_service (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -319,7 +319,7 @@ Clerk_i::init_naming_service (void) this->orb_manager_.init_child_poa (this->argc_, this->argv_, "my_child_poa" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_ptr child_poa @@ -350,7 +350,7 @@ Clerk_i::init_naming_service (void) int Clerk_i::create_clerk (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -369,7 +369,7 @@ Clerk_i::create_clerk (void) // Convert the clerk reference to a string. CORBA::String_var objref_clerk = this->orb_->object_to_string (this->time_service_clerk_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Print the clerk IOR on the console. @@ -405,11 +405,11 @@ Clerk_i::create_clerk (void) int Clerk_i::if_first_clerk (CosNaming::Name clerk_context_name) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { this->my_name_server_->resolve - (clerk_context_name TAO_ENV_ARG_PARAMETER); + (clerk_context_name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::UserException, userex) @@ -427,7 +427,7 @@ Clerk_i::if_first_clerk (CosNaming::Name clerk_context_name) int Clerk_i::register_clerk (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Bind the Clerk in its appropriate Context. @@ -440,12 +440,12 @@ Clerk_i::register_clerk (void) if (if_first_clerk (clerk_context_name)) { - clerk_context = this->my_name_server_->new_context (TAO_ENV_SINGLE_ARG_PARAMETER); + clerk_context = this->my_name_server_->new_context (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->my_name_server_->rebind_context (clerk_context_name, clerk_context.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -467,7 +467,7 @@ Clerk_i::register_clerk (void) this->my_name_server_->rebind (clerk_name, this->time_service_clerk_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -486,7 +486,7 @@ Clerk_i::register_clerk (void) int Clerk_i::init (int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -503,14 +503,14 @@ Clerk_i::init (int argc, this->orb_manager_.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->orb_manager_.init_child_poa (argc, argv, "child_poa" - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "init_child_poa"), @@ -570,12 +570,12 @@ Clerk_i::init (int argc, } int -Clerk_i::run (TAO_ENV_SINGLE_ARG_DECL) +Clerk_i::run (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { // Run the main event loop for the ORB. - int r = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER); + int r = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (r == -1) diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.h b/TAO/orbsvcs/Time_Service/Clerk_i.h index d8ca7098d1a..50a7e0557da 100644 --- a/TAO/orbsvcs/Time_Service/Clerk_i.h +++ b/TAO/orbsvcs/Time_Service/Clerk_i.h @@ -52,10 +52,10 @@ public: int init (int argc, char *argv[] - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize the Clerk state - parsing arguments and waiting. - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the orb. private: diff --git a/TAO/orbsvcs/Time_Service/Server_i.cpp b/TAO/orbsvcs/Time_Service/Server_i.cpp index 07976f5ee95..c085b065d48 100644 --- a/TAO/orbsvcs/Time_Service/Server_i.cpp +++ b/TAO/orbsvcs/Time_Service/Server_i.cpp @@ -63,7 +63,7 @@ Server_i::parse_args (void) // with it. int -Server_i::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) +Server_i::init_naming_service (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { @@ -71,7 +71,7 @@ Server_i::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) this->orb_manager_.init_child_poa (this->argc_, this->argv_, "child_poa" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_ptr child_poa @@ -105,7 +105,7 @@ Server_i::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) int Server_i::create_server (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -118,7 +118,7 @@ Server_i::create_server (void) CORBA::String_var server_str = this->orb_manager_.activate_under_child_poa ("server", this->time_service_server_impl_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = @@ -126,10 +126,10 @@ Server_i::create_server (void) CORBA::Object_var server_ref = this->orb_manager_.child_poa ()->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); this->time_service_server_ = CosTime::TimeService::_narrow (server_ref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -141,7 +141,7 @@ Server_i::create_server (void) CORBA::String_var objref_server = this->orb_->object_to_string (server_ref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // Print the server IOR on the console. ACE_DEBUG ((LM_DEBUG, @@ -178,11 +178,11 @@ Server_i::create_server (void) int Server_i::if_first_server (CosNaming::Name &server_context_name) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { this->my_name_server_->resolve - (server_context_name TAO_ENV_ARG_PARAMETER); + (server_context_name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::UserException, userex) @@ -200,7 +200,7 @@ Server_i::if_first_server (CosNaming::Name &server_context_name) int Server_i::register_server (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CosNaming::Name server_context_name; @@ -216,13 +216,13 @@ Server_i::register_server (void) { // Get context. server_context = - this->my_name_server_->new_context (TAO_ENV_SINGLE_ARG_PARAMETER); + this->my_name_server_->new_context (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Bind. this->my_name_server_->rebind_context (server_context_name, server_context.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -242,7 +242,7 @@ Server_i::register_server (void) this->my_name_server_->rebind (server_name, this->time_service_server_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -267,7 +267,7 @@ Server_i::register_server (void) int Server_i::init (int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->argc_ = argc; this->argv_ = argv; @@ -281,7 +281,7 @@ Server_i::init (int argc, if (this->orb_manager_.init_child_poa (argc, argv, "time_server" - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "init_child_poa"), @@ -289,7 +289,7 @@ Server_i::init (int argc, ACE_TRY_CHECK; // Activate the POA Manager. - this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; int result = this->parse_args (); @@ -301,7 +301,7 @@ Server_i::init (int argc, this->orb_ = this->orb_manager_.orb (); // Use the Naming Service Register the above implementation with the Naming Service. - this->init_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER); + this->init_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -326,9 +326,9 @@ Server_i::init (int argc, // Run the event loop for ORB. int -Server_i::run (TAO_ENV_SINGLE_ARG_DECL) +Server_i::run (ACE_ENV_SINGLE_ARG_DECL) { - int retval = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER); + int retval = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (retval == -1) diff --git a/TAO/orbsvcs/Time_Service/Server_i.h b/TAO/orbsvcs/Time_Service/Server_i.h index 34c2655d5e8..8241f63960a 100644 --- a/TAO/orbsvcs/Time_Service/Server_i.h +++ b/TAO/orbsvcs/Time_Service/Server_i.h @@ -42,13 +42,13 @@ public: int init (int argc, char *argv[] - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize the Server state. - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the orb. - int init_naming_service (TAO_ENV_SINGLE_ARG_DECL); + int init_naming_service (ACE_ENV_SINGLE_ARG_DECL); // Initialises the name server. int create_server (void); diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp index 4e85190ecb0..62d14c1746a 100644 --- a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp +++ b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp @@ -14,16 +14,16 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "[SERVER] Process/Thread Id : (%P/%t) Time Service clerk\n")); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - int r = clerk.init (argc, argv TAO_ENV_ARG_PARAMETER); + int r = clerk.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (r == -1) return 1; else { - clerk.run (TAO_ENV_SINGLE_ARG_PARAMETER); + clerk.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp b/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp index 852dead7510..f61746d627e 100644 --- a/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp +++ b/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp @@ -14,17 +14,17 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "[SERVER] Process/Thread Id : (%P/%t) Time Service server\n")); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - int r = server.init (argc, argv TAO_ENV_ARG_PARAMETER); + int r = server.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (r == -1) return 1; else { - server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/orbsvcs/Trading_Service/Trading_Server.cpp b/TAO/orbsvcs/Trading_Service/Trading_Server.cpp index 309df532cb9..dba75d7f6f0 100644 --- a/TAO/orbsvcs/Trading_Service/Trading_Server.cpp +++ b/TAO/orbsvcs/Trading_Service/Trading_Server.cpp @@ -12,12 +12,12 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { int check = - trader.init (argc, argv TAO_ENV_ARG_PARAMETER); + trader.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (check != -1) { - trader.run (TAO_ENV_SINGLE_ARG_PARAMETER); + trader.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } else diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp index 00edb488e47..d1036faef17 100644 --- a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp +++ b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp @@ -48,7 +48,7 @@ Trading_Service::~Trading_Service (void) int Trading_Service::init (int argc, char *argv[] - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { int result_trader = this->trading_loader_.init (argc, argv); @@ -60,12 +60,12 @@ Trading_Service::init (int argc, } int -Trading_Service::run (TAO_ENV_SINGLE_ARG_DECL) +Trading_Service::run (ACE_ENV_SINGLE_ARG_DECL) { Trading_Shutdown trading_shutdown (*this); int return_value = - this->trading_loader_.run (TAO_ENV_SINGLE_ARG_PARAMETER); + this->trading_loader_.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return return_value; diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.h b/TAO/orbsvcs/Trading_Service/Trading_Service.h index 09cacc2af44..375510aa747 100644 --- a/TAO/orbsvcs/Trading_Service/Trading_Service.h +++ b/TAO/orbsvcs/Trading_Service/Trading_Service.h @@ -62,10 +62,10 @@ public: int init (int argc, char *argv[] - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize the Trading Service with arguments. - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the Trading Service. int shutdown (void); diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp index 4a51dcb8c13..60210ad8515 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp @@ -25,7 +25,7 @@ int TAO_CosEventChannelFactory_i::init (PortableServer::POA_ptr poa, const char* child_poa_name, CosNaming::NamingContext_ptr naming - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Check if we have a parent poa. if (CORBA::is_nil (poa)) @@ -38,12 +38,12 @@ TAO_CosEventChannelFactory_i::init (PortableServer::POA_ptr poa, // to detect duplicates for us. PortableServer::IdUniquenessPolicy_var idpolicy = poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); PortableServer::IdAssignmentPolicy_var assignpolicy = poa->create_id_assignment_policy (PortableServer::USER_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Create a PolicyList @@ -55,7 +55,7 @@ TAO_CosEventChannelFactory_i::init (PortableServer::POA_ptr poa, PortableServer::IdAssignmentPolicy::_duplicate (assignpolicy.in ()); PortableServer::POAManager_ptr manager = - poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // @@ Pradeep : TODO - find a way to destroy the policy_list if we return here. @@ -63,14 +63,14 @@ TAO_CosEventChannelFactory_i::init (PortableServer::POA_ptr poa, this->poa_ = poa->create_POA (child_poa_name, manager, policy_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - idpolicy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + idpolicy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - assignpolicy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + assignpolicy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); //this->poa_ = PortableServer::POA::_duplicate (poa); @@ -81,7 +81,7 @@ TAO_CosEventChannelFactory_i::init (PortableServer::POA_ptr poa, CosEventChannelAdmin::EventChannel_ptr TAO_CosEventChannelFactory_i::create (const char * channel_id, CORBA::Boolean store_in_naming_service - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosEventChannelFactory::DuplicateChannel, @@ -99,7 +99,7 @@ TAO_CosEventChannelFactory_i::create (const char * channel_id, // let all those contained in FactoryEC use the default POA. // We only need the FactoryEC's to be unique! - PortableServer::POA_ptr defPOA = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_ptr defPOA = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; TAO_CEC_EventChannel_Attributes attr (defPOA, defPOA); @@ -112,18 +112,18 @@ TAO_CosEventChannelFactory_i::create (const char * channel_id, auto_ptr ec (impl); - impl->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + impl->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->poa_->activate_object_with_id (oid.in (), ec.get () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ec.release (); CORBA::Object_var obj = - this->poa_->id_to_reference (oid.in () TAO_ENV_ARG_PARAMETER); + this->poa_->id_to_reference (oid.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (store_in_naming_service && @@ -135,7 +135,7 @@ TAO_CosEventChannelFactory_i::create (const char * channel_id, this->naming_->rebind (name, obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -192,7 +192,7 @@ TAO_CosEventChannelFactory_i::destroy ( const char * channel_id, CORBA::Boolean unbind_from_naming_service - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -209,15 +209,15 @@ TAO_CosEventChannelFactory_i::destroy CORBA::Object_var obj = this->poa_->id_to_reference (oid.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosEventChannelAdmin::EventChannel_var fact_ec = CosEventChannelAdmin::EventChannel::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - fact_ec->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + fact_ec->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Remove from the naming service. @@ -229,7 +229,7 @@ TAO_CosEventChannelFactory_i::destroy name[0].id = CORBA::string_dup (channel_id); this->naming_->unbind (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -257,7 +257,7 @@ CosEventChannelAdmin::EventChannel_ptr TAO_CosEventChannelFactory_i::find ( const char * channel_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -275,7 +275,7 @@ TAO_CosEventChannelFactory_i::find CORBA::Object_var obj = this->poa_->id_to_reference (oid.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ec_return = CosEventChannelAdmin::EventChannel::_narrow (obj.in ()); @@ -295,7 +295,7 @@ char* TAO_CosEventChannelFactory_i::find_channel_id ( CosEventChannelAdmin::EventChannel_ptr channel - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -309,7 +309,7 @@ TAO_CosEventChannelFactory_i::find_channel_id { PortableServer::ObjectId_var oid = this->poa_->reference_to_id (channel - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; str_return = PortableServer::ObjectId_to_string (oid.in ()); diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h index c15937667e5..2bb0fcbacf6 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h +++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h @@ -51,7 +51,7 @@ class TAO_CosEventChannelFactory_i : int init (PortableServer::POA_ptr poa, const char* child_poa_name, CosNaming::NamingContext_ptr naming = CosNaming::NamingContext::_nil () - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // This method creates a child poa with as the // parent. It also accepts a Naming_Context which is used to register // the event channels if specified. @@ -66,7 +66,7 @@ class TAO_CosEventChannelFactory_i : // doesn't have to be exposed through the IDL interface. Anyway, // there must be a way to cleanup any resources created by the // factory, and you must avoid CORBA calls in the destructor, - // first because you won't have an TAO_ENV_SINGLE_ARG_PARAMETER and second because + // first because you won't have an ACE_ENV_SINGLE_ARG_PARAMETER and second because // exceptions in destructors are evil. // @@ Pradeep: anyway you can just use exceptions and not return -1? @@ -75,7 +75,7 @@ class TAO_CosEventChannelFactory_i : ( const char * channel_id, CORBA::Boolean store_in_naming_service - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -87,7 +87,7 @@ class TAO_CosEventChannelFactory_i : ( const char * channel_id, CORBA::Boolean unbind_from_naming_service - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -97,7 +97,7 @@ class TAO_CosEventChannelFactory_i : virtual CosEventChannelAdmin::EventChannel_ptr find ( const char * channel_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -107,7 +107,7 @@ class TAO_CosEventChannelFactory_i : virtual char * find_channel_id ( CosEventChannelAdmin::EventChannel_ptr channel - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp index 78916b722b6..08ae963328f 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp +++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp @@ -20,39 +20,39 @@ public: virtual ~FactoryClient (void); // destructor. - void init_ORB (int argc, char *argv [] TAO_ENV_ARG_DECL); + void init_ORB (int argc, char *argv [] ACE_ENV_ARG_DECL); // Initializes the ORB. - void resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL); + void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL); // Try to get hold of a running naming service. - void resolve_factory (TAO_ENV_SINGLE_ARG_DECL); + void resolve_factory (ACE_ENV_SINGLE_ARG_DECL); // Try to resolve the factory from the Naming service. CosEventChannelFactory::ChannelFactory_ptr - create_factory (TAO_ENV_SINGLE_ARG_DECL); + create_factory (ACE_ENV_SINGLE_ARG_DECL); // Create a local Factory and also set the . - virtual void run_test (TAO_ENV_SINGLE_ARG_DECL); + virtual void run_test (ACE_ENV_SINGLE_ARG_DECL); // Runs a couple of tests to check if the factory behaves correctly. protected: CosEventChannelAdmin::EventChannel_ptr create_channel (const char *channel_id, CosEventChannelFactory::ChannelFactory_ptr factory - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Create a channel. void destroy_channel (const char *channel_id - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Destroy the channel. void find_channel (const char* channel_id - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Find a channel. void find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Find a channel. // = Protected Data members. @@ -87,21 +87,21 @@ FactoryClient::~FactoryClient (void) void FactoryClient::init_ORB (int argc, char *argv [] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -FactoryClient::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL) +FactoryClient::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL) { CORBA::Object_var naming_obj = this->orb_->resolve_initial_references ("NameService" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Need to check return value for errors. @@ -109,14 +109,14 @@ FactoryClient::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW (CORBA::UNKNOWN ()); this->naming_context_ = - CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER); + CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->use_naming_service = 1; } void -FactoryClient::resolve_factory (TAO_ENV_SINGLE_ARG_DECL) +FactoryClient::resolve_factory (ACE_ENV_SINGLE_ARG_DECL) { ACE_ASSERT (this->use_naming_service == 1); @@ -126,17 +126,17 @@ FactoryClient::resolve_factory (TAO_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->naming_context_->resolve (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->factory_ = CosEventChannelFactory::ChannelFactory::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } CosEventChannelFactory::ChannelFactory_ptr -FactoryClient::create_factory (TAO_ENV_SINGLE_ARG_DECL) +FactoryClient::create_factory (ACE_ENV_SINGLE_ARG_DECL) { ACE_THROW_RETURN (CORBA::UNKNOWN (), CosEventChannelFactory::ChannelFactory::_nil ()); @@ -145,7 +145,7 @@ FactoryClient::create_factory (TAO_ENV_SINGLE_ARG_DECL) CosEventChannelAdmin::EventChannel_ptr FactoryClient::create_channel (const char *channel_id, CosEventChannelFactory::ChannelFactory_ptr factory - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "Trying to create channel %s\n", channel_id)); @@ -157,7 +157,7 @@ FactoryClient::create_channel (const char *channel_id, { ec = factory->create (channel_id, this->use_naming_service - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_ASSERT (!CORBA::is_nil (ec.in ())); @@ -185,7 +185,7 @@ FactoryClient::create_channel (const char *channel_id, void FactoryClient::destroy_channel (const char *channel_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "Destroying Cos Event Channel \"%s \"\n", @@ -193,13 +193,13 @@ FactoryClient::destroy_channel (const char *channel_id this->factory_->destroy (channel_id, use_naming_service - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void FactoryClient::find_channel (const char* channel_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -209,13 +209,13 @@ FactoryClient::find_channel (const char* channel_id CosEventChannelAdmin::EventChannel_var channel = this->factory_->find (channel_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var str = orb_->object_to_string (channel.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -223,7 +223,7 @@ FactoryClient::find_channel (const char* channel_id str.in ())); this->find_channel_id (channel.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::UserException, ue) @@ -241,11 +241,11 @@ FactoryClient::find_channel (const char* channel_id void FactoryClient::find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::String_var str = orb_->object_to_string (channel - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -254,7 +254,7 @@ FactoryClient::find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel char *channel_id = this->factory_->find_channel_id (channel - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -266,7 +266,7 @@ FactoryClient::find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel */ void -FactoryClient::run_test (TAO_ENV_SINGLE_ARG_DECL) +FactoryClient::run_test (ACE_ENV_SINGLE_ARG_DECL) { ACE_ASSERT (!CORBA::is_nil (this->factory_.in ())); @@ -276,85 +276,85 @@ FactoryClient::run_test (TAO_ENV_SINGLE_ARG_DECL) // create the first cosec cosec[0] = this->create_channel (channel_id[0], this->factory_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // create the second cosec cosec[1] = this->create_channel (channel_id[1], this->factory_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // create the third cosec cosec[2] = this->create_channel (channel_id[2], this->factory_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // see it we can destroy this one.. this->destroy_channel (channel_id[2] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // see if we can find it? this->find_channel_id (cosec[2].in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // see if we can create it again? cosec[2] = this->create_channel (channel_id[2], this->factory_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // try and find a channel that does not exist. this->find_channel ("areyouthere?" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // see if it can detect duplicates. this->create_channel (channel_id[2], this->factory_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // see if it can give us the id? this->find_channel_id (cosec[0].in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->find_channel_id (cosec[1].in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->find_channel_id (cosec[2].in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // check if we can get the channels from the id. this->find_channel (channel_id[0] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->find_channel (channel_id[1] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->find_channel (channel_id[2] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; //destroy them all. this->destroy_channel (channel_id[0] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->destroy_channel (channel_id[1] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->destroy_channel (channel_id[2] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // end of testing. @@ -373,15 +373,15 @@ main (int argc, char *argv []) ft.init_ORB (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_TRY_EX (naming) { - ft.resolve_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER); + ft.resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX (naming); - ft.resolve_factory (TAO_ENV_SINGLE_ARG_PARAMETER); + ft.resolve_factory (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX (naming); } ACE_CATCHANY @@ -391,12 +391,12 @@ main (int argc, char *argv []) ACE_DEBUG ((LM_DEBUG, "Creating a local Factory\n")); // TBD: - ft.create_factory (TAO_ENV_SINGLE_ARG_PARAMETER); + ft.create_factory (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_ENDTRY; - ft.run_test (TAO_ENV_SINGLE_ARG_PARAMETER); + ft.run_test (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::UserException, ue) diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp index 2c80b3a4807..845ee110d77 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp +++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp @@ -52,13 +52,13 @@ FactoryDriver::parse_args (int argc, char *argv []) int FactoryDriver::start (int argc, char *argv []) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { orb_ = CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->parse_args (argc, argv) == -1) @@ -71,7 +71,7 @@ FactoryDriver::start (int argc, char *argv []) CORBA::Object_var poa_object = orb_->resolve_initial_references("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -81,15 +81,15 @@ FactoryDriver::start (int argc, char *argv []) root_poa_ = PortableServer::POA::_narrow (poa_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -106,23 +106,23 @@ FactoryDriver::start (int argc, char *argv []) if (factory_servant_->init (root_poa_.in (), child_poa_name_, context.in () - TAO_ENV_ARG_PARAMETER) != 0) + ACE_ENV_ARG_PARAMETER) != 0) ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) Unable to initialize " "the factory. \n"), 1); // activate the factory in the root poa. - factory_ = factory_servant_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + factory_ = factory_servant_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Give the ownership to the POA. - factory_servant_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + factory_servant_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var str = orb_->object_to_string (factory_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -134,7 +134,7 @@ FactoryDriver::start (int argc, char *argv []) name[0].id = CORBA::string_dup (factoryName_); naming_client_->rebind (name, factory_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp index 6f7ca5248dd..68f393240e7 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp @@ -19,29 +19,29 @@ RtEC_Based_CosEC::~RtEC_Based_CosEC (void) void RtEC_Based_CosEC::init_ORB (int& argc, char *argv [] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Object_var poa_object = this->orb_->resolve_initial_references("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->poa_ = PortableServer::POA::_narrow (poa_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::POAManager_var poa_manager = - this->poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -100,20 +100,20 @@ RtEC_Based_CosEC::parse_args (int argc, char *argv []) void RtEC_Based_CosEC::startup (int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "Starting up the CosEvent Service...\n")); // initalize the ORB. this->init_ORB (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (this->parse_args (argc, argv) == -1) ACE_THROW (CORBA::BAD_PARAM ()); - this->resolve_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER); + this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->init (this->poa_.in (), @@ -121,10 +121,10 @@ RtEC_Based_CosEC::startup (int argc, char *argv[] this->eventTypeIds_, this->eventSourceIds_, this->source_type_pairs_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Register ourselves with the naming service. @@ -132,11 +132,11 @@ RtEC_Based_CosEC::startup (int argc, char *argv[] CORBA::Object_var obj = this->poa_->servant_to_reference (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var str = - this->orb_->object_to_string (obj.in () TAO_ENV_ARG_PARAMETER); + this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -148,7 +148,7 @@ RtEC_Based_CosEC::startup (int argc, char *argv[] this->naming_->rebind (name, obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -157,28 +157,28 @@ RtEC_Based_CosEC::startup (int argc, char *argv[] } POA_RtecEventChannelAdmin::EventChannel_ptr -RtEC_Based_CosEC::create_rtec (TAO_ENV_SINGLE_ARG_DECL) +RtEC_Based_CosEC::create_rtec (ACE_ENV_SINGLE_ARG_DECL) { // see if the user wants a local RtEC.. if (this->remote_rtec_ == 0) - return CosEC_ServantBase::create_rtec (TAO_ENV_SINGLE_ARG_PARAMETER); + return CosEC_ServantBase::create_rtec (ACE_ENV_SINGLE_ARG_PARAMETER); else return 0; } void -RtEC_Based_CosEC::activate_rtec (TAO_ENV_SINGLE_ARG_DECL) +RtEC_Based_CosEC::activate_rtec (ACE_ENV_SINGLE_ARG_DECL) { // see if the user wants to use a local RtEC.. if (this->remote_rtec_ == 0) { - CosEC_ServantBase::activate_rtec (TAO_ENV_SINGLE_ARG_PARAMETER); + CosEC_ServantBase::activate_rtec (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } else { // Try to locate a remote rtec. - this->locate_rtec (TAO_ENV_SINGLE_ARG_PARAMETER); + this->locate_rtec (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Use the return value to check success. @@ -189,18 +189,18 @@ RtEC_Based_CosEC::activate_rtec (TAO_ENV_SINGLE_ARG_DECL) } void -RtEC_Based_CosEC::deactivate_rtec (TAO_ENV_SINGLE_ARG_DECL) +RtEC_Based_CosEC::deactivate_rtec (ACE_ENV_SINGLE_ARG_DECL) { // Check if the local rtec is to be deactivated. if (this->remote_rtec_ == 0) { - CosEC_ServantBase::deactivate_rtec (TAO_ENV_SINGLE_ARG_PARAMETER); + CosEC_ServantBase::deactivate_rtec (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } void -RtEC_Based_CosEC::locate_rtec (TAO_ENV_SINGLE_ARG_DECL) +RtEC_Based_CosEC::locate_rtec (ACE_ENV_SINGLE_ARG_DECL) { CosNaming::Name ref_name (1); ref_name.length (1); @@ -209,21 +209,21 @@ RtEC_Based_CosEC::locate_rtec (TAO_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->naming_->resolve (ref_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->rtec_ = RtecEventChannelAdmin::EventChannel::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -RtEC_Based_CosEC::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL) +RtEC_Based_CosEC::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL) { CORBA::Object_var naming_obj = this->orb_->resolve_initial_references ("NameService" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Need to check return value for errors. @@ -232,7 +232,7 @@ RtEC_Based_CosEC::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL) this->naming_ = CosNaming::NamingContext::_narrow (naming_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -243,7 +243,7 @@ RtEC_Based_CosEC::run (void) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -256,10 +256,10 @@ RtEC_Based_CosEC::run (void) } void -RtEC_Based_CosEC::shutdown (TAO_ENV_SINGLE_ARG_DECL) +RtEC_Based_CosEC::shutdown (ACE_ENV_SINGLE_ARG_DECL) { // Deactivate. - this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Unbind from the naming service. @@ -268,7 +268,7 @@ RtEC_Based_CosEC::shutdown (TAO_ENV_SINGLE_ARG_DECL) name[0].id = CORBA::string_dup (this->service_name); this->naming_->unbind (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // shutdown the ORB. if (!CORBA::is_nil (this->orb_.in ())) @@ -286,7 +286,7 @@ main (int argc, char *argv[]) { service.startup (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (service.run () == -1) diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h index e11b80438af..72f1bd8224f 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h @@ -44,7 +44,7 @@ class RtEC_Based_CosEC : public CosEC_ServantBase // Parses the command line arguments. void startup (int argc, char *argv[] - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initializes the COS Event Service. // Returns 0 on success, -1 on error. @@ -52,30 +52,30 @@ class RtEC_Based_CosEC : public CosEC_ServantBase // run the COS Event Service. // Returns 0 on success, -1 on error. - void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Shutdown the COS Event Service. // Returns 0 on success, -1 on error. protected: // = Methods from CosEC_ServantBase virtual POA_RtecEventChannelAdmin::EventChannel_ptr - create_rtec (TAO_ENV_SINGLE_ARG_DECL); + create_rtec (ACE_ENV_SINGLE_ARG_DECL); // Create a local rtec. - virtual void activate_rtec (TAO_ENV_SINGLE_ARG_DECL); + virtual void activate_rtec (ACE_ENV_SINGLE_ARG_DECL); // Activates the rtec. - virtual void deactivate_rtec (TAO_ENV_SINGLE_ARG_DECL); + virtual void deactivate_rtec (ACE_ENV_SINGLE_ARG_DECL); // Deactivates the rtec. void init_ORB (int& argc, char *argv [] - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // initialize the ORB. - void resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL); + void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL); // Resolve the naming service. - void locate_rtec (TAO_ENV_SINGLE_ARG_DECL); + void locate_rtec (ACE_ENV_SINGLE_ARG_DECL); // Locate a rtec. // = Data members diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp index 87e69d4fa69..926686ed6dc 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp @@ -26,14 +26,14 @@ TAO_CosEC_ConsumerAdmin_i::init (const RtecEventChannelAdmin::ConsumerQOS &consu } CosEventChannelAdmin::ProxyPushSupplier_ptr -TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL) +TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventChannelAdmin::ProxyPushSupplier_ptr proxysupplier_nil = CosEventChannelAdmin::ProxyPushSupplier::_nil (); RtecEventChannelAdmin::ProxyPushSupplier_var rtecproxypushsupplier = - this->rtec_consumeradmin_->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + this->rtec_consumeradmin_->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (proxysupplier_nil); TAO_CosEC_ProxyPushSupplier_i *proxypushsupplier; @@ -47,11 +47,11 @@ TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL) auto_proxysupplier (proxypushsupplier); CosEventChannelAdmin::ProxyPushSupplier_ptr proxy_obj = - auto_proxysupplier.get ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + auto_proxysupplier.get ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (proxysupplier_nil); // give the ownership to the POA. - auto_proxysupplier.get ()->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + auto_proxysupplier.get ()->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (proxysupplier_nil); auto_proxysupplier.release (); @@ -59,7 +59,7 @@ TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL) } CosEventChannelAdmin::ProxyPullSupplier_ptr -TAO_CosEC_ConsumerAdmin_i::obtain_pull_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CosEC_ConsumerAdmin_i::obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO: implement this. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h index d27a0bc2575..1ddebf4484d 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h @@ -55,12 +55,12 @@ public: RtecEventChannelAdmin::ConsumerAdmin_ptr rtec_consumeradmin); virtual CosEventChannelAdmin::ProxyPushSupplier_ptr - obtain_push_supplier(TAO_ENV_SINGLE_ARG_DECL) + obtain_push_supplier(ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns a new ProxyPushSupplier_ptr. virtual CosEventChannelAdmin::ProxyPullSupplier_ptr - obtain_pull_supplier(TAO_ENV_SINGLE_ARG_DECL) + obtain_pull_supplier(ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns a new ProxyPullSupplier_ptr. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp index 5f9be775b2d..69ac811a074 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp @@ -34,7 +34,7 @@ CosEC_ServantBase::init (PortableServer::POA_ptr thispoa, char *, char *, char * - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_ASSERT (!CORBA::is_nil (thispoa)); ACE_ASSERT (!CORBA::is_nil (poa)); @@ -44,11 +44,11 @@ CosEC_ServantBase::init (PortableServer::POA_ptr thispoa, this->poa_ = PortableServer::POA::_duplicate (poa); auto_ptr - auto_rtec_servant_ (this->create_rtec (TAO_ENV_SINGLE_ARG_PARAMETER)); + auto_rtec_servant_ (this->create_rtec (ACE_ENV_SINGLE_ARG_PARAMETER)); ACE_CHECK; auto_ptr - auto_cosec_servant_ (this->create_cosec (TAO_ENV_SINGLE_ARG_PARAMETER)); + auto_cosec_servant_ (this->create_cosec (ACE_ENV_SINGLE_ARG_PARAMETER)); ACE_CHECK; // if all the servants were allocated then set the class pointers. @@ -57,17 +57,17 @@ CosEC_ServantBase::init (PortableServer::POA_ptr thispoa, } int -CosEC_ServantBase::activate (TAO_ENV_SINGLE_ARG_DECL) +CosEC_ServantBase::activate (ACE_ENV_SINGLE_ARG_DECL) { ACE_ASSERT (!CORBA::is_nil (this->poa_.in ())); ACE_ASSERT (!CORBA::is_nil (this->thispoa_.in ())); // Activate the Rtec - this->activate_rtec (TAO_ENV_SINGLE_ARG_PARAMETER); + this->activate_rtec (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Activate the CosEC - int retval = this->activate_cosec (TAO_ENV_SINGLE_ARG_PARAMETER); + int retval = this->activate_cosec (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (retval != 0) return -1; @@ -77,15 +77,15 @@ CosEC_ServantBase::activate (TAO_ENV_SINGLE_ARG_DECL) PortableServer::ObjectId_var oid = this->thispoa_->activate_object (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - this->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::Object_var obj = this->thispoa_->id_to_reference (oid.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; // success. @@ -93,17 +93,17 @@ CosEC_ServantBase::activate (TAO_ENV_SINGLE_ARG_DECL) int CosEC_ServantBase::activate (const char* servant_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_ASSERT (!CORBA::is_nil (this->poa_.in ())); ACE_ASSERT (!CORBA::is_nil (this->thispoa_.in ())); // Activate the Rtec - this->activate_rtec (TAO_ENV_SINGLE_ARG_PARAMETER); + this->activate_rtec (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Activate the CosEC - int retval = this->activate_cosec (TAO_ENV_SINGLE_ARG_PARAMETER); + int retval = this->activate_cosec (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (retval != 0) return -1; @@ -115,35 +115,35 @@ CosEC_ServantBase::activate (const char* servant_id // Note that the POA is this->thispoa_->activate_object_with_id (oid.in (), this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - this->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::Object_var obj = this->thispoa_->id_to_reference (oid.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; // success. } void -CosEC_ServantBase::activate_rtec (TAO_ENV_SINGLE_ARG_DECL) +CosEC_ServantBase::activate_rtec (ACE_ENV_SINGLE_ARG_DECL) { // Activate the Rtec PortableServer::ObjectId_var oid = this->poa_->activate_object (this->rtec_servant_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->rtec_servant_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + this->rtec_servant_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Object_var obj = this->poa_->id_to_reference (oid.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->rtec_ = @@ -151,7 +151,7 @@ CosEC_ServantBase::activate_rtec (TAO_ENV_SINGLE_ARG_DECL) } int -CosEC_ServantBase::activate_cosec (TAO_ENV_SINGLE_ARG_DECL) +CosEC_ServantBase::activate_cosec (ACE_ENV_SINGLE_ARG_DECL) { // Initialize the CosEC servant. RtecBase::handle_t supp_handle = 0; @@ -176,22 +176,22 @@ CosEC_ServantBase::activate_cosec (TAO_ENV_SINGLE_ARG_DECL) if (this->cosec_servant_->init (consumerqos, supplierqos, this->rtec_.in () - TAO_ENV_ARG_PARAMETER) != 0) + ACE_ENV_ARG_PARAMETER) != 0) return -1; ACE_CHECK_RETURN (-1); // Activate the CosEC PortableServer::ObjectId_var oid = this->poa_->activate_object (this->cosec_servant_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - this->cosec_servant_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + this->cosec_servant_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::Object_var obj = this->poa_->id_to_reference (oid.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->cosec_ = @@ -200,84 +200,84 @@ CosEC_ServantBase::activate_cosec (TAO_ENV_SINGLE_ARG_DECL) } void -CosEC_ServantBase::deactivate (TAO_ENV_SINGLE_ARG_DECL) +CosEC_ServantBase::deactivate (ACE_ENV_SINGLE_ARG_DECL) { // Deactivate all those we control... - this->deactivate_rtec (TAO_ENV_SINGLE_ARG_PARAMETER); + this->deactivate_rtec (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->deactivate_cosec (TAO_ENV_SINGLE_ARG_PARAMETER); + this->deactivate_cosec (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Finally we go away.. PortableServer::ObjectId_var oid = this->thispoa_->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // deactivate from the poa. this->thispoa_->deactivate_object (oid.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -CosEC_ServantBase::deactivate_rtec (TAO_ENV_SINGLE_ARG_DECL) +CosEC_ServantBase::deactivate_rtec (ACE_ENV_SINGLE_ARG_DECL) { // Deactivate the rtec. PortableServer::ObjectId_var oid = this->poa_->servant_to_id (this->rtec_servant_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // deactivate from the poa. this->poa_->deactivate_object (oid.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -CosEC_ServantBase::deactivate_cosec (TAO_ENV_SINGLE_ARG_DECL) +CosEC_ServantBase::deactivate_cosec (ACE_ENV_SINGLE_ARG_DECL) { // Deactivate the cosec. PortableServer::ObjectId_var oid = this->poa_->servant_to_id (this->cosec_servant_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // deactivate from the poa. this->poa_->deactivate_object (oid.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } CosEventChannelAdmin::ConsumerAdmin_ptr -CosEC_ServantBase::for_consumers (TAO_ENV_SINGLE_ARG_DECL) +CosEC_ServantBase::for_consumers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->cosec_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->cosec_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); } CosEventChannelAdmin::SupplierAdmin_ptr -CosEC_ServantBase::for_suppliers (TAO_ENV_SINGLE_ARG_DECL) +CosEC_ServantBase::for_suppliers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->cosec_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->cosec_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); } void -CosEC_ServantBase::destroy (TAO_ENV_SINGLE_ARG_DECL) +CosEC_ServantBase::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Deactivate all the contained servants and ourselves. // The poa will "destroy" the ref counted servants. - this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } POA_RtecEventChannelAdmin::EventChannel_ptr -CosEC_ServantBase::create_rtec (TAO_ENV_SINGLE_ARG_DECL) +CosEC_ServantBase::create_rtec (ACE_ENV_SINGLE_ARG_DECL) { // Create the RtEC servant. TAO_EC_Event_Channel_Attributes attr (this->poa_.in (), @@ -292,7 +292,7 @@ CosEC_ServantBase::create_rtec (TAO_ENV_SINGLE_ARG_DECL) } TAO_CosEC_EventChannel_i* -CosEC_ServantBase::create_cosec (TAO_ENV_SINGLE_ARG_DECL) +CosEC_ServantBase::create_cosec (ACE_ENV_SINGLE_ARG_DECL) { // Create the CosEC servant. TAO_CosEC_EventChannel_i* _cosec_servant; diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h index 129acbaee48..2ffedd40fdb 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h @@ -59,54 +59,54 @@ class TAO_RTEC_COSEC_Export CosEC_ServantBase : char *eventTypeIds, char *eventSourceIds, char *source_type_pairs - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // This method creates a local scheduler, rtec and cosec. // The POA specified here is used when is called to // activate the contained servants. // The POA is used to activate this. - int activate (TAO_ENV_SINGLE_ARG_DECL); + int activate (ACE_ENV_SINGLE_ARG_DECL); // Activates the CosEC with and friends with the - int activate (const char* servant_id TAO_ENV_ARG_DECL); + int activate (const char* servant_id ACE_ENV_ARG_DECL); // If the servant_id is not nil then it is used to supply the object id // for servant. - void deactivate (TAO_ENV_SINGLE_ARG_DECL); + void deactivate (ACE_ENV_SINGLE_ARG_DECL); // Deactivates the CosEC and friends with the POA. // = POA_CosEventChannelAdmin::EventChannel methods. - virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (TAO_ENV_SINGLE_ARG_DECL) + virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (TAO_ENV_SINGLE_ARG_DECL) + virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Destroys this Event Channel object. protected: // = RtEC creation, activation and deactivation methods. virtual POA_RtecEventChannelAdmin::EventChannel_ptr - create_rtec (TAO_ENV_SINGLE_ARG_DECL); + create_rtec (ACE_ENV_SINGLE_ARG_DECL); // Create a local rtec. - virtual void activate_rtec (TAO_ENV_SINGLE_ARG_DECL); + virtual void activate_rtec (ACE_ENV_SINGLE_ARG_DECL); // Activates the rtec. - virtual void deactivate_rtec (TAO_ENV_SINGLE_ARG_DECL); + virtual void deactivate_rtec (ACE_ENV_SINGLE_ARG_DECL); // Deactivates the rtec. // = CosEC creation, activation and deactivation methods. TAO_CosEC_EventChannel_i* - create_cosec (TAO_ENV_SINGLE_ARG_DECL); + create_cosec (ACE_ENV_SINGLE_ARG_DECL); // Create a local cosec. - int activate_cosec (TAO_ENV_SINGLE_ARG_DECL); + int activate_cosec (ACE_ENV_SINGLE_ARG_DECL); // Activates the cosec. - void deactivate_cosec (TAO_ENV_SINGLE_ARG_DECL); + void deactivate_cosec (ACE_ENV_SINGLE_ARG_DECL); // Deactivates the cosec. void init_SupplierQOS (RtecBase::handle_t supp_handle, diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp index 5f5cac0743d..3266ded2608 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp @@ -20,7 +20,7 @@ int TAO_CosEC_EventChannel_i::init (const RtecEventChannelAdmin::ConsumerQOS &consumerqos, const RtecEventChannelAdmin::SupplierQOS &supplierqos, RtecEventChannelAdmin::EventChannel_ptr rtec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Allocate the admins.. TAO_CosEC_ConsumerAdmin_i *consumer_; @@ -38,7 +38,7 @@ TAO_CosEC_EventChannel_i::init (const RtecEventChannelAdmin::ConsumerQOS &consum auto_ptr auto_supplier_ (supplier_); RtecEventChannelAdmin::ConsumerAdmin_ptr rtec_consumeradmin = - rtec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + rtec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (auto_consumer_.get ()->init (consumerqos, @@ -46,15 +46,15 @@ TAO_CosEC_EventChannel_i::init (const RtecEventChannelAdmin::ConsumerQOS &consum return -1; this->consumeradmin_ = - auto_consumer_.get ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + auto_consumer_.get ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // give the ownership to the POA. - auto_consumer_.get ()->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + auto_consumer_.get ()->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); RtecEventChannelAdmin::SupplierAdmin_ptr rtec_supplieradmin = - rtec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + rtec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (auto_supplier_.get ()->init (supplierqos, @@ -62,11 +62,11 @@ TAO_CosEC_EventChannel_i::init (const RtecEventChannelAdmin::ConsumerQOS &consum return -1; this->supplieradmin_ = - auto_supplier_.get ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + auto_supplier_.get ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // give the ownership to the POA. - auto_supplier_.get ()->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + auto_supplier_.get ()->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->consumer_admin_ = auto_consumer_.release (); @@ -76,7 +76,7 @@ TAO_CosEC_EventChannel_i::init (const RtecEventChannelAdmin::ConsumerQOS &consum } CosEventChannelAdmin::ConsumerAdmin_ptr -TAO_CosEC_EventChannel_i::for_consumers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CosEC_EventChannel_i::for_consumers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ Pradeep: you must make a copy here, because the caller is @@ -86,7 +86,7 @@ TAO_CosEC_EventChannel_i::for_consumers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } CosEventChannelAdmin::SupplierAdmin_ptr -TAO_CosEC_EventChannel_i::for_suppliers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CosEC_EventChannel_i::for_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ Pradeep: you must make a copy here, because the caller is @@ -96,20 +96,20 @@ TAO_CosEC_EventChannel_i::for_suppliers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } void -TAO_CosEC_EventChannel_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_CosEC_EventChannel_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Deactivate the CosEventChannel PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->supplieradmin_ = CosEventChannelAdmin::SupplierAdmin::_nil (); @@ -117,9 +117,9 @@ TAO_CosEC_EventChannel_i::destroy (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_CosEC_EventChannel_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_CosEC_EventChannel_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) { - this->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h index fb7015ab3bf..8d9855bd4a2 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h @@ -59,25 +59,25 @@ public: int init (const RtecEventChannelAdmin::ConsumerQOS &consumerqos, const RtecEventChannelAdmin::SupplierQOS &supplierqos, RtecEventChannelAdmin::EventChannel_ptr rtec - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Activates the ConsumerAdmin and SupplierAdmin servants. Returns // -1 on error, 0 on success. - virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (TAO_ENV_SINGLE_ARG_DECL) + virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // The for_consumers method will return the same ConsumerAdmin_ptr // everytime its called. - virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (TAO_ENV_SINGLE_ARG_DECL) + virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // The for_suppliers method will return the same SupplierAdmin_ptr // everytime its called. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Destroys this Event Channel object. - void shutdown (TAO_ENV_SINGLE_ARG_DECL); + void shutdown (ACE_ENV_SINGLE_ARG_DECL); // destroys this Event Channel object and s this object. private: diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp index c0f97807d8c..73311b2af45 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp @@ -32,7 +32,7 @@ public: ~TAO_CosEC_PushSupplierWrapper (void); // Destructor. - virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL) + virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Disconnects the push supplier. @@ -64,24 +64,24 @@ TAO_CosEC_PushSupplierWrapper::~TAO_CosEC_PushSupplierWrapper (void) } void -TAO_CosEC_PushSupplierWrapper::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL) +TAO_CosEC_PushSupplierWrapper::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->supplier_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Deactivate the supplier proxy PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // @@ If we keep a list remember to remove this object from the @@ -104,7 +104,7 @@ TAO_CosEC_ProxyPushConsumer_i::~TAO_CosEC_ProxyPushConsumer_i (void) void TAO_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { RtecEventComm::Event buffer[1]; @@ -138,35 +138,35 @@ TAO_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data e.data.any_value = data; this->proxypushconsumer_->push (events - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_CosEC_ProxyPushConsumer_i::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL) +TAO_CosEC_ProxyPushConsumer_i::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->proxypushconsumer_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + this->proxypushconsumer_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Deactivate the ProxyPushConsumer PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_CosEC_ProxyPushConsumer_i::connect_push_supplier (CosEventComm::PushSupplier_ptr push_supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected)) { @@ -184,17 +184,17 @@ TAO_CosEC_ProxyPushConsumer_i::connect_push_supplier (CosEventComm::PushSupplier auto_wrapper (wrapper); RtecEventComm::PushSupplier_ptr rtecpushsupplier - = auto_wrapper.get ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + = auto_wrapper.get ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // give the ownership to the POA. - auto_wrapper.get ()->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + auto_wrapper.get ()->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->proxypushconsumer_->connect_push_supplier (rtecpushsupplier, this->qos_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->wrapper_ = auto_wrapper.release (); diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h index d999ed7ae5f..da757ce5634 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h @@ -62,16 +62,16 @@ public: // Destructor. virtual void push (const CORBA::Any &data - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Suppliers call this method to pass data to connected consumers. - virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL) + virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Disconnects the supplier from the event communication. virtual void connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected)); // Connects a push supplier. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp index f1597deac7c..52c99def13d 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp @@ -32,11 +32,11 @@ public: // Destructor. virtual void push (const RtecEventComm::EventSet & data - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This method is called by the RTEvent Channel to supply data. - virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL) + virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Disconnects the consumer from the event channel. @@ -63,7 +63,7 @@ TAO_CosEC_PushConsumerWrapper::~TAO_CosEC_PushConsumerWrapper () void TAO_CosEC_PushConsumerWrapper::push (const RtecEventComm::EventSet& set - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { for (CORBA::ULong i = 0; @@ -73,7 +73,7 @@ TAO_CosEC_PushConsumerWrapper::push (const RtecEventComm::EventSet& set ACE_TRY { this->consumer_->push (set[i].data.any_value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -85,24 +85,24 @@ TAO_CosEC_PushConsumerWrapper::push (const RtecEventComm::EventSet& set } void -TAO_CosEC_PushConsumerWrapper::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL) +TAO_CosEC_PushConsumerWrapper::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Deactivate the supplier proxy. - this->consumer_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // @@ If we keep a list remember to remove this object from the @@ -125,24 +125,24 @@ TAO_CosEC_ProxyPushSupplier_i::~TAO_CosEC_ProxyPushSupplier_i (void) } void -TAO_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL) +TAO_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->pps_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + this->pps_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Deactivate the supplier proxy PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // @@ If we keep a list remember to remove this object from the @@ -151,7 +151,7 @@ TAO_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL void TAO_CosEC_ProxyPushSupplier_i::connect_push_consumer (CosEventComm::PushConsumer_ptr push_consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected, CosEventChannelAdmin::TypeError)) @@ -172,16 +172,16 @@ TAO_CosEC_ProxyPushSupplier_i::connect_push_consumer (CosEventComm::PushConsumer // @@ This code is not exception safe. RtecEventComm::PushConsumer_ptr rtecpushconsumer = - auto_wrapper.get ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + auto_wrapper.get ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // give the ownership to the POA. - auto_wrapper.get ()->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + auto_wrapper.get ()->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->pps_->connect_push_consumer (rtecpushconsumer, this->qos_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->wrapper_ = auto_wrapper.release (); diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h index bf5a7416264..9fd51f44d7d 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h @@ -54,12 +54,12 @@ public: ~TAO_CosEC_ProxyPushSupplier_i (void); // Destructor. - virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL) + virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Ends the event communication and disposes this object. virtual void connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected, CosEventChannelAdmin::TypeError)); diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp index 688c8982937..c0970fa8404 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp @@ -26,14 +26,14 @@ TAO_CosEC_SupplierAdmin_i::init (const RtecEventChannelAdmin::SupplierQOS &suppl } CosEventChannelAdmin::ProxyPushConsumer_ptr -TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL) +TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventChannelAdmin::ProxyPushConsumer_ptr proxyconsumer_nil = CosEventChannelAdmin::ProxyPushConsumer::_nil (); RtecEventChannelAdmin::ProxyPushConsumer_var rtecproxypushconsumer = - this->rtec_supplieradmin_->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + this->rtec_supplieradmin_->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (proxyconsumer_nil); TAO_CosEC_ProxyPushConsumer_i *proxypushconsumer; @@ -46,11 +46,11 @@ TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL) auto_proxyconsumer (proxypushconsumer); CosEventChannelAdmin::ProxyPushConsumer_ptr proxy_obj = - auto_proxyconsumer.get ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + auto_proxyconsumer.get ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (proxyconsumer_nil); // give the ownership to the POA. - auto_proxyconsumer.get ()->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + auto_proxyconsumer.get ()->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (proxyconsumer_nil); auto_proxyconsumer.release (); @@ -58,7 +58,7 @@ TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL) } CosEventChannelAdmin::ProxyPullConsumer_ptr -TAO_CosEC_SupplierAdmin_i::obtain_pull_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CosEC_SupplierAdmin_i::obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO: implement this. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h index 04ea411c3fc..ae1ed870161 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h @@ -57,12 +57,12 @@ public: // error. virtual CosEventChannelAdmin::ProxyPushConsumer_ptr - obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL) + obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns a new ProxyPushConsumer_ptr. virtual CosEventChannelAdmin::ProxyPullConsumer_ptr - obtain_pull_consumer(TAO_ENV_SINGLE_ARG_DECL) + obtain_pull_consumer(ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns a new ProxyPullConsumer_ptr. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp index 99589e9178e..bd0b2585f86 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp @@ -9,16 +9,16 @@ main (int argc, char *argv []) { Basic basic; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - basic.init (argc, argv TAO_ENV_ARG_PARAMETER); + basic.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - basic.run (TAO_ENV_SINGLE_ARG_PARAMETER); + basic.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - basic.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + basic.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::UserException, ue) @@ -51,28 +51,28 @@ Basic::~Basic (void) void Basic::init (int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->init_ORB (argc, argv TAO_ENV_ARG_PARAMETER); + this->init_ORB (argc, argv ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->init_CosEC (TAO_ENV_SINGLE_ARG_PARAMETER); + this->init_CosEC (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void Basic::init_ORB (int argc, char *argv [] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Object_var poa_object = this->orb_->resolve_initial_references("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -81,19 +81,19 @@ Basic::init_ORB (int argc, char *argv [] root_poa_ = PortableServer::POA::_narrow (poa_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::POAManager_var poa_manager = - root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Basic::init_CosEC (TAO_ENV_SINGLE_ARG_DECL) +Basic::init_CosEC (ACE_ENV_SINGLE_ARG_DECL) { CosEC_ServantBase *ec = 0; @@ -107,10 +107,10 @@ Basic::init_CosEC (TAO_ENV_SINGLE_ARG_DECL) ec->init (this->root_poa_.in(), this->root_poa_.in(), 0,0,0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - int retval = ec->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + int retval = ec->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (retval == -1) @@ -118,17 +118,17 @@ Basic::init_CosEC (TAO_ENV_SINGLE_ARG_DECL) // @@ look for more descriptive exception to throw here CORBA::Object_var obj = - this->root_poa_->servant_to_reference (ec TAO_ENV_ARG_PARAMETER); + this->root_poa_->servant_to_reference (ec ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->cos_ec_ = CosEventChannelAdmin::EventChannel::_narrow (obj._retn () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -Basic::run (TAO_ENV_SINGLE_ARG_DECL) +Basic::run (ACE_ENV_SINGLE_ARG_DECL) { // Create an Any type to pass to the Cos EC. CORBA::Any any; @@ -136,21 +136,21 @@ Basic::run (TAO_ENV_SINGLE_ARG_DECL) this->consumer_.open (this->cos_ec_.in (), this->orb_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->consumer_.connect (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_.connect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_.open (this->cos_ec_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier_.connect (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_.connect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_.send_event (any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // this->orb_->run (); @@ -163,14 +163,14 @@ Basic::run (TAO_ENV_SINGLE_ARG_DECL) } void -Basic::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Basic::shutdown (ACE_ENV_SINGLE_ARG_DECL) { - this->supplier_.close (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_.close (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->consumer_.close (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_.close (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->cos_ec_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->cos_ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h index d504ea9ddc7..df713f5766f 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h @@ -36,23 +36,23 @@ public: ~Basic (void); // Destructor. - void init (int argc, char *argv[] TAO_ENV_ARG_DECL); + void init (int argc, char *argv[] ACE_ENV_ARG_DECL); // Starts up an ORB and the CosEC. // Returns 0 on success, -1 on error. - void run (TAO_ENV_SINGLE_ARG_DECL); + void run (ACE_ENV_SINGLE_ARG_DECL); // Connects a consumer and a supplier to the CosEC and sends 1 event // across. - void shutdown (TAO_ENV_SINGLE_ARG_DECL); + void shutdown (ACE_ENV_SINGLE_ARG_DECL); // Closes down the CosEC. private: - void init_ORB (int argc, char *argv[] TAO_ENV_ARG_DECL); + void init_ORB (int argc, char *argv[] ACE_ENV_ARG_DECL); // initializes the ORB. // Returns 0 on success, -1 on error. - void init_CosEC (TAO_ENV_SINGLE_ARG_DECL); + void init_CosEC (ACE_ENV_SINGLE_ARG_DECL); // initializes the COS EC. // Returns 0 on success, -1 on error. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp index 7b31e7d4f58..03259f3a123 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp @@ -6,20 +6,20 @@ void Consumer::open (CosEventChannelAdmin::EventChannel_ptr event_channel, CORBA::ORB_ptr orb - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->orb_ = orb; // = Connect as a consumer. this->consumer_admin_ = - event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Consumer::close (TAO_ENV_SINGLE_ARG_DECL) +Consumer::close (ACE_ENV_SINGLE_ARG_DECL) { - this->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_admin_ = @@ -27,32 +27,32 @@ Consumer::close (TAO_ENV_SINGLE_ARG_DECL) } void -Consumer::connect (TAO_ENV_SINGLE_ARG_DECL) +Consumer::connect (ACE_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->consumer_admin_.in ())) return; CosEventComm::PushConsumer_var objref = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = - this->consumer_admin_->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_admin_->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_->connect_push_consumer (objref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) +Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->supplier_proxy_.in ()) || CORBA::is_nil (this->consumer_admin_.in ())) return; - this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = @@ -61,7 +61,7 @@ Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) void Consumer::push (const CORBA::Any & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosEventComm::Disconnected @@ -74,7 +74,7 @@ Consumer::push (const CORBA::Any & } void -Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL) +Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -82,15 +82,15 @@ Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL) // Deactivate this object. PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h index 9c66fc562eb..c1ced5cbc08 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h @@ -34,28 +34,28 @@ class Consumer : public POA_CosEventComm::PushConsumer public: void open (CosEventChannelAdmin::EventChannel_ptr event_channel, CORBA::ORB_ptr orb - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // This method connects the consumer to the EC. - void close (TAO_ENV_SINGLE_ARG_DECL); + void close (ACE_ENV_SINGLE_ARG_DECL); // Disconnect from the EC. - void connect (TAO_ENV_SINGLE_ARG_DECL); + void connect (ACE_ENV_SINGLE_ARG_DECL); // Connect the Consumer to the EventChannel. - void disconnect (TAO_ENV_SINGLE_ARG_DECL); + void disconnect (ACE_ENV_SINGLE_ARG_DECL); // Disconnect from the supplier, but do not forget about it or close // it. virtual void push (const CORBA::Any &data - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosEventComm::Disconnected )); // push the event to the consumer. - virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL) + virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp index 3293d16514d..59cfc9cd251 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp @@ -5,18 +5,18 @@ void Supplier::open (CosEventChannelAdmin::EventChannel_ptr event_channel - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // = Connect as a consumer. this->supplier_admin_ = - event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Supplier::close (TAO_ENV_SINGLE_ARG_DECL) +Supplier::close (ACE_ENV_SINGLE_ARG_DECL) { - this->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_admin_ = @@ -24,31 +24,31 @@ Supplier::close (TAO_ENV_SINGLE_ARG_DECL) } void -Supplier::connect (TAO_ENV_SINGLE_ARG_DECL) +Supplier::connect (ACE_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->supplier_admin_.in ())) return; this->consumer_proxy_ = - this->supplier_admin_->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_admin_->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CosEventComm::PushSupplier_var objref = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + CosEventComm::PushSupplier_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_->connect_push_supplier (objref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) +Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->consumer_proxy_.in ()) || CORBA::is_nil (this->supplier_admin_.in ())) return; - this->consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_ = @@ -57,14 +57,14 @@ Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) void Supplier::send_event (const CORBA::Any & data - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->consumer_proxy_->push (data TAO_ENV_ARG_PARAMETER); + this->consumer_proxy_->push (data ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL) +Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -72,15 +72,15 @@ Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL) // Deactivate this object. PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h index 7e96e452ddb..413244fc4f4 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h @@ -32,22 +32,22 @@ class Supplier : public POA_CosEventComm::PushSupplier // the CosEC and sends events to it. public: void open (CosEventChannelAdmin::EventChannel_ptr event_channel - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // This method connects the supplier to the EC. - void close (TAO_ENV_SINGLE_ARG_DECL); + void close (ACE_ENV_SINGLE_ARG_DECL); // Disconnect from the EC. - void connect (TAO_ENV_SINGLE_ARG_DECL); + void connect (ACE_ENV_SINGLE_ARG_DECL); - void disconnect (TAO_ENV_SINGLE_ARG_DECL); + void disconnect (ACE_ENV_SINGLE_ARG_DECL); // Disconnect from the EC, but do not forget about it or close it. void send_event (const CORBA::Any &data - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Send one event. - virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL) + virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp index 8164013dd8b..9cdb697eff1 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp @@ -45,18 +45,18 @@ Consumer::parse_args (int argc, char *argv []) void Consumer::open (CosEventChannelAdmin::EventChannel_ptr event_channel - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // = Connect as a consumer. this->consumer_admin_ = - event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Consumer::close (TAO_ENV_SINGLE_ARG_DECL) +Consumer::close (ACE_ENV_SINGLE_ARG_DECL) { - this->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_admin_ = @@ -64,32 +64,32 @@ Consumer::close (TAO_ENV_SINGLE_ARG_DECL) } void -Consumer::connect (TAO_ENV_SINGLE_ARG_DECL) +Consumer::connect (ACE_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->consumer_admin_.in ())) return; CosEventComm::PushConsumer_var objref = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = - this->consumer_admin_->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_admin_->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_->connect_push_consumer (objref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) +Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->supplier_proxy_.in ()) || CORBA::is_nil (this->consumer_admin_.in ())) return; - this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = @@ -98,7 +98,7 @@ Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) void Consumer::push (const CORBA::Any & - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosEventComm::Disconnected @@ -121,7 +121,7 @@ Consumer::push (const CORBA::Any & "(%P):%s\n", "exiting the consumer.")); - this->close (TAO_ENV_SINGLE_ARG_PARAMETER); + this->close (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->shutdown (); @@ -129,7 +129,7 @@ Consumer::push (const CORBA::Any & } void -Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL) +Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -137,30 +137,30 @@ Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL) // Deactivate this object. PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } int Consumer::init_Consumer (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { this->open (this->cos_ec_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->connect (TAO_ENV_SINGLE_ARG_PARAMETER); + this->connect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h index fdfed82b2b6..ce523fed960 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h @@ -41,28 +41,28 @@ public: // Initialize the Consumer. void open (CosEventChannelAdmin::EventChannel_ptr event_channel - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // This method connects the consumer to the EC. - void close (TAO_ENV_SINGLE_ARG_DECL); + void close (ACE_ENV_SINGLE_ARG_DECL); // Disconnect from the EC. - void connect (TAO_ENV_SINGLE_ARG_DECL); + void connect (ACE_ENV_SINGLE_ARG_DECL); // Connect the Consumer to the EventChannel. - void disconnect (TAO_ENV_SINGLE_ARG_DECL); + void disconnect (ACE_ENV_SINGLE_ARG_DECL); // Disconnect from the supplier, but do not forget about it or close // it. virtual void push (const CORBA::Any &data - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosEventComm::Disconnected )); // push the event to the consumer. - virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL) + virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp index eb1b5231c54..4af0b93b9aa 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp @@ -39,18 +39,18 @@ Multiple::init (int argc, char *argv[]) int Multiple::init_ORB (int argc, char *argv []) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { this->orb_ = CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = this->orb_->resolve_initial_references("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -60,14 +60,14 @@ Multiple::init_ORB (int argc, char *argv []) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -85,7 +85,7 @@ Multiple::init_ORB (int argc, char *argv []) int Multiple::init_CosEC (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialization of the naming service. @@ -102,7 +102,7 @@ Multiple::init_CosEC (void) CORBA::Object_var EC_obj = this->naming_client_->resolve (ec_ref_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // The CORBA::Object_var object is downcast to @@ -110,7 +110,7 @@ Multiple::init_CosEC (void) // using the <_narrow> method. this->cos_ec_ = CosEventChannelAdmin::EventChannel::_narrow (EC_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -128,10 +128,10 @@ Multiple::init_CosEC (void) int Multiple::runORB (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp index 6d0761894f1..10626cc15d6 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp @@ -44,18 +44,18 @@ Supplier::parse_args (int argc, char *argv []) void Supplier::open (CosEventChannelAdmin::EventChannel_ptr event_channel - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // = Connect as a consumer. this->supplier_admin_ = - event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Supplier::close (TAO_ENV_SINGLE_ARG_DECL) +Supplier::close (ACE_ENV_SINGLE_ARG_DECL) { - this->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_admin_ = @@ -63,31 +63,31 @@ Supplier::close (TAO_ENV_SINGLE_ARG_DECL) } void -Supplier::connect (TAO_ENV_SINGLE_ARG_DECL) +Supplier::connect (ACE_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->supplier_admin_.in ())) return; this->consumer_proxy_ = - this->supplier_admin_->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_admin_->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CosEventComm::PushSupplier_var objref = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + CosEventComm::PushSupplier_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_->connect_push_supplier (objref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) +Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->consumer_proxy_.in ()) || CORBA::is_nil (this->supplier_admin_.in ())) return; - this->consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_ = @@ -96,14 +96,14 @@ Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) void Supplier::send_event (const CORBA::Any & data - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->consumer_proxy_->push (data TAO_ENV_ARG_PARAMETER); + this->consumer_proxy_->push (data ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL) +Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -111,23 +111,23 @@ Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL) // Deactivate this object. PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void Supplier::run (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Create an Any type to pass to the Cos EC. @@ -137,10 +137,10 @@ Supplier::run (void) cany >>= any; this->open (this->cos_ec_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->connect (TAO_ENV_SINGLE_ARG_PARAMETER); + this->connect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -152,14 +152,14 @@ Supplier::run (void) count--) { this->send_event (any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_DEBUG ((LM_DEBUG, "(%P):Done!. exiting now..\n")); - this->close (TAO_ENV_SINGLE_ARG_PARAMETER); + this->close (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h index 9de704696bd..29b213cd31f 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h @@ -38,22 +38,22 @@ public: // Constructor. void open (CosEventChannelAdmin::EventChannel_ptr event_channel - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // This method connects the supplier to the EC. - void close (TAO_ENV_SINGLE_ARG_DECL); + void close (ACE_ENV_SINGLE_ARG_DECL); // Disconnect from the EC. - void connect (TAO_ENV_SINGLE_ARG_DECL); + void connect (ACE_ENV_SINGLE_ARG_DECL); - void disconnect (TAO_ENV_SINGLE_ARG_DECL); + void disconnect (ACE_ENV_SINGLE_ARG_DECL); // Disconnect from the EC, but do not forget about it or close it. void send_event (const CORBA::Any &data - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Send one event. - virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL) + virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp index c425e7c6bdb..53f82d338e2 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp @@ -23,12 +23,12 @@ Consumer::Consumer (void) int Consumer::run (int argc, char* argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Do *NOT* make a copy because we don't want the ORB to outlive @@ -43,43 +43,43 @@ Consumer::run (int argc, char* argv[]) } CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the event channel, we could use a naming service, a // command line argument or resolve_initial_references(), but // this is simpler... object = - orb->string_to_object (argv[1] TAO_ENV_ARG_PARAMETER); + orb->string_to_object (argv[1] ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosEventChannelAdmin::EventChannel_var event_channel = CosEventChannelAdmin::EventChannel::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // The canonical protocol to connect to the EC CosEventChannelAdmin::ConsumerAdmin_var consumer_admin = - event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CosEventChannelAdmin::ProxyPushSupplier_var supplier = - consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CosEventComm::PushConsumer_var consumer = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier->connect_push_consumer (consumer.in () TAO_ENV_ARG_PARAMETER); + supplier->connect_push_consumer (consumer.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Wait for events, using work_pending()/perform_work() may help @@ -104,7 +104,7 @@ Consumer::run (int argc, char* argv[]) void Consumer::push (const CORBA::Any & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->event_count_ ++; @@ -117,13 +117,13 @@ Consumer::push (const CORBA::Any & } void -Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL) +Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // In this example we shutdown the ORB when we disconnect from the // EC (or rather the EC disconnects from us), but this doesn't have // to be the case.... - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } // **************************************************************** diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h index 4ef9e96d7ce..7156353e483 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h +++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h @@ -41,9 +41,9 @@ public: // = The CosEventComm::PushConsumer methods virtual void push (const CORBA::Any &event - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The skeleton methods. diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp index 5911a5a7697..3681b6f67d5 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp @@ -15,12 +15,12 @@ main (int argc, char* argv[]) { TAO_CEC_Default_Factory::init_svcs (); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) == -1) @@ -31,30 +31,30 @@ main (int argc, char* argv[]) } CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; TAO_CEC_EventChannel_Attributes attributes (poa.in (), poa.in ()); TAO_CEC_EventChannel ec_impl (attributes); - ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CosEventChannelAdmin::EventChannel_var event_channel = - ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (event_channel.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (event_channel.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp index 63476ce6f9e..96e0ea64204 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp @@ -22,12 +22,12 @@ Supplier::Supplier (void) int Supplier::run (int argc, char* argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (argc <= 1) @@ -38,43 +38,43 @@ Supplier::run (int argc, char* argv[]) } CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the event channel, we could use a naming service, a // command line argument or resolve_initial_references(), but // this is simpler... object = - orb->string_to_object (argv[1] TAO_ENV_ARG_PARAMETER); + orb->string_to_object (argv[1] ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosEventChannelAdmin::EventChannel_var event_channel = CosEventChannelAdmin::EventChannel::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // The canonical protocol to connect to the EC CosEventChannelAdmin::SupplierAdmin_var supplier_admin = - event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CosEventChannelAdmin::ProxyPushConsumer_var consumer = - supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CosEventComm::PushSupplier_var supplier = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - consumer->connect_push_supplier (supplier.in () TAO_ENV_ARG_PARAMETER); + consumer->connect_push_supplier (supplier.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Push the events... @@ -85,28 +85,28 @@ Supplier::run (int argc, char* argv[]) for (int i = 0; i != 2000; ++i) { - consumer->push (event TAO_ENV_ARG_PARAMETER); + consumer->push (event ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::sleep (sleep_time); } // Disconnect from the EC - consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Destroy the EC.... - event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Deactivate this object... PortableServer::ObjectId_var id = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Destroy the POA - poa->destroy (1, 0 TAO_ENV_ARG_PARAMETER); + poa->destroy (1, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -119,7 +119,7 @@ Supplier::run (int argc, char* argv[]) } void -Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h index ba082729cc7..4fdc39bfa08 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h +++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h @@ -40,7 +40,7 @@ public: // = The CosEventComm::PushSupplier methods - virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The skeleton methods. diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp index cc5a8a9014e..d0af444ec99 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp +++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp @@ -28,37 +28,37 @@ FilterClient::~FilterClient () } void -FilterClient::init (int argc, char *argv [] TAO_ENV_ARG_DECL) +FilterClient::init (int argc, char *argv [] ACE_ENV_ARG_DECL) { - init_ORB (argc, argv TAO_ENV_ARG_PARAMETER); + init_ORB (argc, argv ACE_ENV_ARG_PARAMETER); ACE_CHECK; - resolve_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER); + resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - resolve_Notify_factory (TAO_ENV_SINGLE_ARG_PARAMETER); + resolve_Notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_EC (TAO_ENV_SINGLE_ARG_PARAMETER); + create_EC (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_supplieradmin (TAO_ENV_SINGLE_ARG_PARAMETER); + create_supplieradmin (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_consumeradmin (TAO_ENV_SINGLE_ARG_PARAMETER); + create_consumeradmin (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + create_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + create_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -FilterClient::run (TAO_ENV_SINGLE_ARG_DECL) +FilterClient::run (ACE_ENV_SINGLE_ARG_DECL) { - send_events (TAO_ENV_SINGLE_ARG_PARAMETER); + send_events (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (g_result_count != EVENTS_EXPECTED_TO_RECEIVE) @@ -78,17 +78,17 @@ FilterClient::done (void) void FilterClient::init_ORB (int argc, char *argv [] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Object_ptr poa_object = this->orb_->resolve_initial_references("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (poa_object)) @@ -99,23 +99,23 @@ FilterClient::init_ORB (int argc, } this->root_poa_ = PortableServer::POA::_narrow (poa_object - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::POAManager_var poa_manager = - root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -FilterClient::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL) +FilterClient::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL) { CORBA::Object_var naming_obj = this->orb_->resolve_initial_references (NAMING_SERVICE_NAME - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Need to check return value for errors. @@ -123,12 +123,12 @@ FilterClient::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW (CORBA::UNKNOWN ()); this->naming_context_ = - CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER); + CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -FilterClient::resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL) +FilterClient::resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL) { CosNaming::Name name (1); name.length (1); @@ -136,47 +136,47 @@ FilterClient::resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->naming_context_->resolve (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->notify_factory_ = CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -FilterClient::create_EC (TAO_ENV_SINGLE_ARG_DECL) +FilterClient::create_EC (ACE_ENV_SINGLE_ARG_DECL) { CosNotifyChannelAdmin::ChannelID id; ec_ = notify_factory_->create_channel (initial_qos_, initial_admin_, id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (ec_.in ())); } void -FilterClient::create_supplieradmin (TAO_ENV_SINGLE_ARG_DECL) +FilterClient::create_supplieradmin (ACE_ENV_SINGLE_ARG_DECL) { CosNotifyChannelAdmin::AdminID adminid = 0; supplier_admin_ = - ec_->new_for_suppliers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER); + ec_->new_for_suppliers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ())); CosNotifyFilter::FilterFactory_var ffact = - ec_->default_filter_factory (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // setup a filter at the consumer admin CosNotifyFilter::Filter_var sa_filter = - ffact->create_filter (TCL_GRAMMAR TAO_ENV_ARG_PARAMETER); + ffact->create_filter (TCL_GRAMMAR ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (sa_filter.in ())); @@ -187,31 +187,31 @@ FilterClient::create_supplieradmin (TAO_ENV_SINGLE_ARG_DECL) constraint_list[0].event_types.length (0); constraint_list[0].constraint_expr = CORBA::string_dup (SA_FILTER); - sa_filter->add_constraints (constraint_list TAO_ENV_ARG_PARAMETER); + sa_filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER); ACE_CHECK; - supplier_admin_->add_filter (sa_filter.in () TAO_ENV_ARG_PARAMETER); + supplier_admin_->add_filter (sa_filter.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -FilterClient:: create_consumeradmin (TAO_ENV_SINGLE_ARG_DECL) +FilterClient:: create_consumeradmin (ACE_ENV_SINGLE_ARG_DECL) { CosNotifyChannelAdmin::AdminID adminid = 0; consumer_admin_ = - ec_->new_for_consumers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER); + ec_->new_for_consumers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ())); CosNotifyFilter::FilterFactory_var ffact = - ec_->default_filter_factory (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // setup a filter at the consumer admin CosNotifyFilter::Filter_var ca_filter = - ffact->create_filter (TCL_GRAMMAR TAO_ENV_ARG_PARAMETER); + ffact->create_filter (TCL_GRAMMAR ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (ca_filter.in ())); @@ -227,10 +227,10 @@ FilterClient:: create_consumeradmin (TAO_ENV_SINGLE_ARG_DECL) constraint_list[0].event_types.length (0); constraint_list[0].constraint_expr = CORBA::string_dup (CA_FILTER); - ca_filter->add_constraints (constraint_list TAO_ENV_ARG_PARAMETER); + ca_filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER); ACE_CHECK; - consumer_admin_->add_filter (ca_filter.in () TAO_ENV_ARG_PARAMETER); + consumer_admin_->add_filter (ca_filter.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Setup the CA to receive all type of events @@ -242,19 +242,19 @@ FilterClient:: create_consumeradmin (TAO_ENV_SINGLE_ARG_DECL) added[0].domain_name = CORBA::string_dup ("*"); added[0].type_name = CORBA::string_dup ("*"); - this->consumer_admin_->subscription_change (added, removed TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->subscription_change (added, removed ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -FilterClient::create_consumers (TAO_ENV_SINGLE_ARG_DECL) +FilterClient::create_consumers (ACE_ENV_SINGLE_ARG_DECL) { // startup the first consumer. ACE_NEW_THROW_EX (consumer_1, Filter_StructuredPushConsumer (this, "consumer1"), CORBA::NO_MEMORY ()); - consumer_1->connect (consumer_admin_.in () TAO_ENV_ARG_PARAMETER); + consumer_1->connect (consumer_admin_.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; // startup the second consumer. @@ -262,19 +262,19 @@ FilterClient::create_consumers (TAO_ENV_SINGLE_ARG_DECL) Filter_StructuredPushConsumer (this, "consumer2"), CORBA::NO_MEMORY ()); - consumer_2->connect (consumer_admin_.in () TAO_ENV_ARG_PARAMETER); + consumer_2->connect (consumer_admin_.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -FilterClient::create_suppliers (TAO_ENV_SINGLE_ARG_DECL) +FilterClient::create_suppliers (ACE_ENV_SINGLE_ARG_DECL) { // startup the first supplier ACE_NEW_THROW_EX (supplier_1, Filter_StructuredPushSupplier ("supplier1"), CORBA::NO_MEMORY ()); - supplier_1->connect (supplier_admin_.in () TAO_ENV_ARG_PARAMETER); + supplier_1->connect (supplier_admin_.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; // startup the second supplier @@ -282,12 +282,12 @@ FilterClient::create_suppliers (TAO_ENV_SINGLE_ARG_DECL) Filter_StructuredPushSupplier ("supplier2"), CORBA::NO_MEMORY ()); - supplier_2->connect (supplier_admin_.in () TAO_ENV_ARG_PARAMETER); + supplier_2->connect (supplier_admin_.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -FilterClient::send_events (TAO_ENV_SINGLE_ARG_DECL) +FilterClient::send_events (ACE_ENV_SINGLE_ARG_DECL) { // operations: CosNotification::StructuredEvent event; @@ -332,10 +332,10 @@ FilterClient::send_events (TAO_ENV_SINGLE_ARG_DECL) // any event.remainder_of_body <<= (CORBA::Long)i; - supplier_1->send_event (event TAO_ENV_ARG_PARAMETER); + supplier_1->send_event (event ACE_ENV_ARG_PARAMETER); ACE_CHECK; - supplier_2->send_event (event TAO_ENV_ARG_PARAMETER); + supplier_2->send_event (event ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -352,15 +352,15 @@ Filter_StructuredPushConsumer::~Filter_StructuredPushConsumer (void) } void -Filter_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin TAO_ENV_ARG_DECL) +Filter_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL) { // Activate the consumer with the default_POA_ CosNotifyComm::StructuredPushConsumer_var objref = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CosNotifyChannelAdmin::ProxySupplier_var proxysupplier = - consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_ TAO_ENV_ARG_PARAMETER); + consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ())); @@ -368,21 +368,21 @@ Filter_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr // narrow this->proxy_supplier_ = CosNotifyChannelAdmin::StructuredProxyPushSupplier:: - _narrow (proxysupplier.in () TAO_ENV_ARG_PARAMETER); + _narrow (proxysupplier.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ())); proxy_supplier_->connect_structured_push_consumer (objref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -Filter_StructuredPushConsumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) +Filter_StructuredPushConsumer::disconnect (ACE_ENV_SINGLE_ARG_DECL) { this->proxy_supplier_-> - disconnect_structured_push_supplier(TAO_ENV_SINGLE_ARG_PARAMETER); + disconnect_structured_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -390,7 +390,7 @@ void Filter_StructuredPushConsumer::offer_change (const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed*/ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyComm::InvalidEventType @@ -402,7 +402,7 @@ Filter_StructuredPushConsumer::offer_change void Filter_StructuredPushConsumer::push_structured_event (const CosNotification::StructuredEvent & notification - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosEventComm::Disconnected @@ -428,7 +428,7 @@ Filter_StructuredPushConsumer::push_structured_event void Filter_StructuredPushConsumer::disconnect_structured_push_consumer - (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -449,43 +449,43 @@ Filter_StructuredPushSupplier::~Filter_StructuredPushSupplier () } void -Filter_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin TAO_ENV_ARG_DECL) +Filter_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin ACE_ENV_ARG_DECL) { CosNotifyComm::StructuredPushSupplier_var objref = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer = - supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_ TAO_ENV_ARG_PARAMETER); + supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ())); // narrow this->proxy_consumer_ = - CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in () TAO_ENV_ARG_PARAMETER); + CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ())); proxy_consumer_->connect_structured_push_supplier (objref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -Filter_StructuredPushSupplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) +Filter_StructuredPushSupplier::disconnect (ACE_ENV_SINGLE_ARG_DECL) { ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ())); - this->proxy_consumer_->disconnect_structured_push_consumer(TAO_ENV_SINGLE_ARG_PARAMETER); + this->proxy_consumer_->disconnect_structured_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER); } void Filter_StructuredPushSupplier::subscription_change (const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyComm::InvalidEventType @@ -496,20 +496,20 @@ Filter_StructuredPushSupplier::subscription_change void Filter_StructuredPushSupplier::send_event - (const CosNotification::StructuredEvent& event TAO_ENV_ARG_DECL) + (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL) { ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ())); ACE_DEBUG ((LM_DEBUG, "%s is sending an event \n", my_name_.fast_rep ())); - proxy_consumer_->push_structured_event (event TAO_ENV_ARG_PARAMETER); + proxy_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void Filter_StructuredPushSupplier::disconnect_structured_push_supplier - (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.h b/TAO/orbsvcs/examples/Notify/Filter/Filter.h index 6054e2bd1ab..c916d858315 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/Filter.h +++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.h @@ -46,41 +46,41 @@ class FilterClient ~FilterClient (); // Destructor - void init (int argc, char *argv [] TAO_ENV_ARG_DECL); + void init (int argc, char *argv [] ACE_ENV_ARG_DECL); // Init the Client. - void run (TAO_ENV_SINGLE_ARG_DECL); + void run (ACE_ENV_SINGLE_ARG_DECL); // Run the demo. void done (void); // Consumer calls done, We're done. protected: - void init_ORB (int argc, char *argv [] TAO_ENV_ARG_DECL); + void init_ORB (int argc, char *argv [] ACE_ENV_ARG_DECL); // Initializes the ORB. - void resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL); + void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL); // Try to get hold of a running naming service. - void resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL); + void resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL); // Try to resolve the Notify factory from the Naming service. - void create_EC (TAO_ENV_SINGLE_ARG_DECL); + void create_EC (ACE_ENV_SINGLE_ARG_DECL); // Create an EC. - void create_supplieradmin(TAO_ENV_SINGLE_ARG_DECL); + void create_supplieradmin(ACE_ENV_SINGLE_ARG_DECL); // Create the Supplier Admin. - void create_consumeradmin (TAO_ENV_SINGLE_ARG_DECL); + void create_consumeradmin (ACE_ENV_SINGLE_ARG_DECL); // Create the Consumer Admin. - void create_consumers (TAO_ENV_SINGLE_ARG_DECL); + void create_consumers (ACE_ENV_SINGLE_ARG_DECL); // Create and initialize the consumers. - void create_suppliers (TAO_ENV_SINGLE_ARG_DECL); + void create_suppliers (ACE_ENV_SINGLE_ARG_DECL); // create and initialize the suppliers. - void send_events (TAO_ENV_SINGLE_ARG_DECL); + void send_events (ACE_ENV_SINGLE_ARG_DECL); // send the events. // = Data Members @@ -145,11 +145,11 @@ class Filter_StructuredPushConsumer : public POA_CosNotifyComm::StructuredPushCo Filter_StructuredPushConsumer (FilterClient* filter, const char *my_name); // Constructor. - void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin TAO_ENV_ARG_DECL); + void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL); // Connect the Consumer to the EventChannel. // Creates a new proxy supplier and connects to it. - virtual void disconnect (TAO_ENV_SINGLE_ARG_DECL); + virtual void disconnect (ACE_ENV_SINGLE_ARG_DECL); // Disconnect from the supplier. protected: @@ -175,7 +175,7 @@ protected: virtual void offer_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -185,7 +185,7 @@ protected: // = StructuredPushSupplier methods virtual void push_structured_event ( const CosNotification::StructuredEvent & notification - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -193,7 +193,7 @@ protected: )); virtual void disconnect_structured_push_consumer ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -216,15 +216,15 @@ class Filter_StructuredPushSupplier : public POA_CosNotifyComm::StructuredPushSu // Constructor. void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Connect the Supplier to the EventChannel. // Creates a new proxy supplier and connects to it. - void disconnect (TAO_ENV_SINGLE_ARG_DECL); + void disconnect (ACE_ENV_SINGLE_ARG_DECL); // Disconnect from the supplier. virtual void send_event (const CosNotification::StructuredEvent& event - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Send one event. protected: @@ -246,7 +246,7 @@ protected: virtual void subscription_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -255,7 +255,7 @@ protected: // = StructuredPushSupplier method virtual void disconnect_structured_push_supplier ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/orbsvcs/examples/Notify/Filter/main.cpp b/TAO/orbsvcs/examples/Notify/Filter/main.cpp index 3957d8425e5..845f7ab68f7 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/main.cpp +++ b/TAO/orbsvcs/examples/Notify/Filter/main.cpp @@ -11,10 +11,10 @@ main (int argc, char *argv []) ACE_TRY_NEW_ENV { client.init (argc, argv - TAO_ENV_ARG_PARAMETER); //Init the Client + ACE_ENV_ARG_PARAMETER); //Init the Client ACE_TRY_CHECK; - client.run (TAO_ENV_SINGLE_ARG_PARAMETER); + client.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::UserException, ue) diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp index 13af016f3b7..495f573cd08 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp @@ -30,30 +30,30 @@ Subscribe::~Subscribe () } void -Subscribe::init (int argc, char *argv [] TAO_ENV_ARG_DECL) +Subscribe::init (int argc, char *argv [] ACE_ENV_ARG_DECL) { - init_ORB (argc, argv TAO_ENV_ARG_PARAMETER); + init_ORB (argc, argv ACE_ENV_ARG_PARAMETER); ACE_CHECK; - resolve_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER); + resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - resolve_Notify_factory (TAO_ENV_SINGLE_ARG_PARAMETER); + resolve_Notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_EC (TAO_ENV_SINGLE_ARG_PARAMETER); + create_EC (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_supplieradmin (TAO_ENV_SINGLE_ARG_PARAMETER); + create_supplieradmin (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_consumeradmin (TAO_ENV_SINGLE_ARG_PARAMETER); + create_consumeradmin (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + create_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + create_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Subscribe::run (TAO_ENV_SINGLE_ARG_DECL) +Subscribe::run (ACE_ENV_SINGLE_ARG_DECL) { - this->send_events (TAO_ENV_SINGLE_ARG_PARAMETER); + this->send_events (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (g_result_count != EVENT_COUNT) // if we still need to wait for events, run the orb. @@ -73,17 +73,17 @@ Subscribe::done (void) void Subscribe::init_ORB (int argc, char *argv [] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Object_ptr poa_object = this->orb_->resolve_initial_references("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (poa_object)) @@ -93,23 +93,23 @@ Subscribe::init_ORB (int argc, return; } this->root_poa_ = - PortableServer::POA::_narrow (poa_object TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object ACE_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::POAManager_var poa_manager = - root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Subscribe::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL) +Subscribe::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL) { CORBA::Object_var naming_obj = this->orb_->resolve_initial_references (NAMING_SERVICE_NAME - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Need to check return value for errors. @@ -117,12 +117,12 @@ Subscribe::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW (CORBA::UNKNOWN ()); this->naming_context_ = - CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER); + CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -Subscribe::resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL) +Subscribe::resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL) { CosNaming::Name name (1); name.length (1); @@ -130,83 +130,83 @@ Subscribe::resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->naming_context_->resolve (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->notify_factory_ = CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -Subscribe::create_EC (TAO_ENV_SINGLE_ARG_DECL) +Subscribe::create_EC (ACE_ENV_SINGLE_ARG_DECL) { CosNotifyChannelAdmin::ChannelID id; ec_ = notify_factory_->create_channel (initial_qos_, initial_admin_, id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (ec_.in ())); } void -Subscribe::create_supplieradmin (TAO_ENV_SINGLE_ARG_DECL) +Subscribe::create_supplieradmin (ACE_ENV_SINGLE_ARG_DECL) { CosNotifyChannelAdmin::AdminID adminid; supplier_admin_ = - ec_->new_for_suppliers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER); + ec_->new_for_suppliers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ())); } void -Subscribe:: create_consumeradmin (TAO_ENV_SINGLE_ARG_DECL) +Subscribe:: create_consumeradmin (ACE_ENV_SINGLE_ARG_DECL) { CosNotifyChannelAdmin::AdminID adminid; consumer_admin_ = - ec_->new_for_consumers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER); + ec_->new_for_consumers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ())); } void -Subscribe::create_consumers (TAO_ENV_SINGLE_ARG_DECL) +Subscribe::create_consumers (ACE_ENV_SINGLE_ARG_DECL) { consumer_1_ = new Subscribe_StructuredPushConsumer (this); consumer_1_->connect (this->consumer_admin_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; consumer_2_ = new Subscribe_StructuredPushConsumer (this); consumer_2_->connect (this->consumer_admin_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -Subscribe::create_suppliers (TAO_ENV_SINGLE_ARG_DECL) +Subscribe::create_suppliers (ACE_ENV_SINGLE_ARG_DECL) { supplier_1_ = new Subscribe_StructuredPushSupplier (); supplier_1_->connect (this->supplier_admin_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; supplier_2_ = new Subscribe_StructuredPushSupplier (); supplier_2_->connect (this->supplier_admin_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -Subscribe::send_events (TAO_ENV_SINGLE_ARG_DECL) +Subscribe::send_events (ACE_ENV_SINGLE_ARG_DECL) { // Setup the CA to receive event_type : "domain_A", "Type_a" CosNotification::EventTypeSeq added(1); @@ -220,7 +220,7 @@ Subscribe::send_events (TAO_ENV_SINGLE_ARG_DECL) removed[0].domain_name = CORBA::string_dup ("*"); removed[0].type_name = CORBA::string_dup ("*"); - this->consumer_admin_->subscription_change (added, removed TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->subscription_change (added, removed ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Setup the Consumer 1 to receive event_type : "domain_B", "Type_b" @@ -233,7 +233,7 @@ Subscribe::send_events (TAO_ENV_SINGLE_ARG_DECL) removed_1.length (0); this->consumer_1_->get_proxy_supplier ()->subscription_change (added_1, removed_1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Setup the Consumer 2 to receive event_type : "domain_C", "Type_c" @@ -246,7 +246,7 @@ Subscribe::send_events (TAO_ENV_SINGLE_ARG_DECL) removed_2.length (0); this->consumer_2_->get_proxy_supplier ()->subscription_change (added_2, removed_2 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Create the events - one of each type @@ -286,11 +286,11 @@ Subscribe::send_events (TAO_ENV_SINGLE_ARG_DECL) // let supplier 1 send all these events for (int i = 0; i < 1; ++i) { - supplier_1_->send_event (event1 TAO_ENV_ARG_PARAMETER); + supplier_1_->send_event (event1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; - supplier_1_->send_event (event2 TAO_ENV_ARG_PARAMETER); + supplier_1_->send_event (event2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; - supplier_1_->send_event (event3 TAO_ENV_ARG_PARAMETER); + supplier_1_->send_event (event3 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -308,15 +308,15 @@ Subscribe_StructuredPushConsumer::~Subscribe_StructuredPushConsumer () void Subscribe_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Activate the consumer with the default_POA_ CosNotifyComm::StructuredPushConsumer_var objref = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CosNotifyChannelAdmin::ProxySupplier_var proxysupplier = - consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_ TAO_ENV_ARG_PARAMETER); + consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ())); @@ -324,21 +324,21 @@ Subscribe_StructuredPushConsumer::connect // narrow this->proxy_supplier_ = CosNotifyChannelAdmin::StructuredProxyPushSupplier:: - _narrow (proxysupplier.in () TAO_ENV_ARG_PARAMETER); + _narrow (proxysupplier.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ())); proxy_supplier_->connect_structured_push_consumer (objref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -Subscribe_StructuredPushConsumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) +Subscribe_StructuredPushConsumer::disconnect (ACE_ENV_SINGLE_ARG_DECL) { this->proxy_supplier_-> - disconnect_structured_push_supplier(TAO_ENV_SINGLE_ARG_PARAMETER); + disconnect_structured_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -346,7 +346,7 @@ void Subscribe_StructuredPushConsumer::offer_change (const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed*/ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyComm::InvalidEventType @@ -358,7 +358,7 @@ Subscribe_StructuredPushConsumer::offer_change void Subscribe_StructuredPushConsumer::push_structured_event (const CosNotification::StructuredEvent & notification - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosEventComm::Disconnected @@ -379,7 +379,7 @@ Subscribe_StructuredPushConsumer::push_structured_event void Subscribe_StructuredPushConsumer::disconnect_structured_push_consumer - (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -406,43 +406,43 @@ Subscribe_StructuredPushSupplier::~Subscribe_StructuredPushSupplier () void Subscribe_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CosNotifyComm::StructuredPushSupplier_var objref = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer = - supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_ TAO_ENV_ARG_PARAMETER); + supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ())); // narrow this->proxy_consumer_ = - CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in () TAO_ENV_ARG_PARAMETER); + CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ())); proxy_consumer_->connect_structured_push_supplier (objref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -Subscribe_StructuredPushSupplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) +Subscribe_StructuredPushSupplier::disconnect (ACE_ENV_SINGLE_ARG_DECL) { ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ())); - this->proxy_consumer_->disconnect_structured_push_consumer(TAO_ENV_SINGLE_ARG_PARAMETER); + this->proxy_consumer_->disconnect_structured_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER); } void Subscribe_StructuredPushSupplier::subscription_change (const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyComm::InvalidEventType @@ -454,17 +454,17 @@ Subscribe_StructuredPushSupplier::subscription_change void Subscribe_StructuredPushSupplier::send_event (const CosNotification::StructuredEvent& event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ())); - proxy_consumer_->push_structured_event (event TAO_ENV_ARG_PARAMETER); + proxy_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void Subscribe_StructuredPushSupplier::disconnect_structured_push_supplier - (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h index 37124da02eb..578151b170e 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h @@ -42,41 +42,41 @@ class Subscribe Subscribe (void); ~Subscribe (); - void init (int argc, char *argv [] TAO_ENV_ARG_DECL); + void init (int argc, char *argv [] ACE_ENV_ARG_DECL); // Init the Client. - void run (TAO_ENV_SINGLE_ARG_DECL); + void run (ACE_ENV_SINGLE_ARG_DECL); // Run the demo. void done (void); // Called when all events we are waiting for have occured. protected: - void init_ORB (int argc, char *argv [] TAO_ENV_ARG_DECL); + void init_ORB (int argc, char *argv [] ACE_ENV_ARG_DECL); // Initializes the ORB. - void resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL); + void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL); // Try to get hold of a running naming service. - void resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL); + void resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL); // Try to resolve the Notify factory from the Naming service. - void create_EC (TAO_ENV_SINGLE_ARG_DECL); + void create_EC (ACE_ENV_SINGLE_ARG_DECL); // Create an EC. - void create_supplieradmin(TAO_ENV_SINGLE_ARG_DECL); + void create_supplieradmin(ACE_ENV_SINGLE_ARG_DECL); // Create the Supplier Admin. - void create_consumeradmin (TAO_ENV_SINGLE_ARG_DECL); + void create_consumeradmin (ACE_ENV_SINGLE_ARG_DECL); // Create the Consumer Admin. - void create_consumers (TAO_ENV_SINGLE_ARG_DECL); + void create_consumers (ACE_ENV_SINGLE_ARG_DECL); // Create and initialize the consumers. - void create_suppliers (TAO_ENV_SINGLE_ARG_DECL); + void create_suppliers (ACE_ENV_SINGLE_ARG_DECL); // create and initialize the suppliers. - void send_events (TAO_ENV_SINGLE_ARG_DECL); + void send_events (ACE_ENV_SINGLE_ARG_DECL); // send the events. // = Data Members @@ -135,11 +135,11 @@ class Subscribe_StructuredPushConsumer : public POA_CosNotifyComm::StructuredPus Subscribe_StructuredPushConsumer (Subscribe* subscribe); // Constructor. - void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin TAO_ENV_ARG_DECL); + void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL); // Connect the Consumer to the EventChannel. // Creates a new proxy supplier and connects to it. - virtual void disconnect (TAO_ENV_SINGLE_ARG_DECL); + virtual void disconnect (ACE_ENV_SINGLE_ARG_DECL); // Disconnect from the supplier. CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr get_proxy_supplier (void); @@ -164,7 +164,7 @@ protected: virtual void offer_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -174,7 +174,7 @@ protected: // = StructuredPushSupplier methods virtual void push_structured_event ( const CosNotification::StructuredEvent & notification - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -182,7 +182,7 @@ protected: )); virtual void disconnect_structured_push_consumer ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -205,15 +205,15 @@ class Subscribe_StructuredPushSupplier : public POA_CosNotifyComm::StructuredPus // Constructor. void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Connect the Supplier to the EventChannel. // Creates a new proxy supplier and connects to it. - void disconnect (TAO_ENV_SINGLE_ARG_DECL); + void disconnect (ACE_ENV_SINGLE_ARG_DECL); // Disconnect from the supplier. virtual void send_event (const CosNotification::StructuredEvent& event - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Send one event. protected: @@ -232,7 +232,7 @@ protected: virtual void subscription_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -241,7 +241,7 @@ protected: // = StructuredPushSupplier method virtual void disconnect_structured_push_supplier ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp index e7e5550a01e..b817728c231 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp +++ b/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp @@ -11,10 +11,10 @@ main (int argc, char *argv []) ACE_TRY_NEW_ENV { client.init (argc, argv - TAO_ENV_ARG_PARAMETER); //Init the Client + ACE_ENV_ARG_PARAMETER); //Init the Client ACE_TRY_CHECK; - client.run (TAO_ENV_SINGLE_ARG_PARAMETER); + client.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::UserException, ue) diff --git a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp index 12913369c99..6452c3393ee 100644 --- a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp +++ b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp @@ -16,18 +16,18 @@ CORBA::Object_ptr Gateway_ObjRef_Factory:: make_object (const char *interface_repository_id, const PortableInterceptor::ObjectId & id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Object_var object = this->old_factory_->make_object (interface_repository_id, id - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); ACE_CHECK_RETURN (CORBA::Object::_nil ()); CORBA::Object_ptr object_ptr = this->gateway_object_factory_->create_object (interface_repository_id, object.in () - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); ACE_CHECK_RETURN (CORBA::Object::_nil ()); return object_ptr; diff --git a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h index cf3cc01c34d..a49fbcde666 100644 --- a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h +++ b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h @@ -31,7 +31,7 @@ class Gateway_ObjRef_Factory virtual CORBA::Object_ptr make_object (const char *repository_id, const PortableInterceptor::ObjectId &id - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: diff --git a/TAO/orbsvcs/examples/ORT/Gateway_i.cpp b/TAO/orbsvcs/examples/ORT/Gateway_i.cpp index 0fe5ba3bf64..7391e9c9f65 100644 --- a/TAO/orbsvcs/examples/ORT/Gateway_i.cpp +++ b/TAO/orbsvcs/examples/ORT/Gateway_i.cpp @@ -28,7 +28,7 @@ Gateway_i (CORBA::ORB_ptr orb, void Gateway_i::invoke (CORBA::ServerRequest_ptr request - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { PortableServer::ObjectId_var target_id = this->poa_current_->get_object_id (); @@ -38,12 +38,12 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request CORBA::Object_var target_object = this->orb_->string_to_object (stringified_object_id.in () - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); ACE_CHECK; // Use the IfR interfaces to query the NVList for this object... CORBA::InterfaceDef_var interface = - target_object->_get_interface (TAO_ENV_ARG_DECL); + target_object->_get_interface (ACE_ENV_ARG_DECL); ACE_CHECK; if (CORBA::is_nil (interface.in ())) @@ -63,7 +63,7 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request // Save the result typecode... CORBA::TypeCode_var result_typecode = - operation.in ()->result (TAO_ENV_ARG_DECL); + operation.in ()->result (ACE_ENV_ARG_DECL); ACE_CHECK; CORBA::ParDescriptionSeq_var parameters = @@ -73,7 +73,7 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request CORBA::NVList_ptr arguments; this->orb_->create_list (parameters->length (), arguments - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); ACE_CHECK; CORBA::Flags flags; @@ -105,12 +105,12 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request arguments->add_value (parameters[i].name, any, flags - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); ACE_CHECK; } // Extract the values of the arguments from the DSI ServerRequest - request->arguments (arguments TAO_ENV_ARG_DECL); + request->arguments (arguments ACE_ENV_ARG_DECL); // Use the NVList (with values) to create a DII Request... CORBA::Request_var dii_request; @@ -118,7 +118,7 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request CORBA::NamedValue *named_value; this->orb_->create_named_value (named_value - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); ACE_CHECK; CORBA::ContextList *context_list = 0; @@ -132,7 +132,7 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request context_list, /* Context List */ dii_request.inout (), CORBA::Flags (0) - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); ACE_CHECK; // Set the return type... @@ -141,7 +141,7 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request ACE_TRY { // Make the DII request - dii_request->invoke (TAO_ENV_ARG_DECL); + dii_request->invoke (ACE_ENV_ARG_DECL); ACE_TRY_CHECK; // At this point the NVList contains all the out and inout @@ -172,7 +172,7 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request CORBA::RepositoryId Gateway_i::_primary_interface (const PortableServer::ObjectId &, PortableServer::POA_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return 0; } diff --git a/TAO/orbsvcs/examples/ORT/Gateway_i.h b/TAO/orbsvcs/examples/ORT/Gateway_i.h index 88c8860829b..ce662e3b46f 100644 --- a/TAO/orbsvcs/examples/ORT/Gateway_i.h +++ b/TAO/orbsvcs/examples/ORT/Gateway_i.h @@ -30,12 +30,12 @@ public: PortableServer::Current_ptr poa_current); virtual void invoke (CORBA::ServerRequest_ptr request - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual CORBA::RepositoryId _primary_interface ( const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: diff --git a/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp b/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp index 7967157e6be..7340fb7830a 100644 --- a/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp +++ b/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp @@ -16,11 +16,11 @@ Object_Factory_i::Object_Factory_i (CORBA::ORB_ptr orb, CORBA::Object_ptr Object_Factory_i::create_object (const char *interface_repository_id, CORBA::Object_ptr gatewayed_object - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var stringified_object = - this->orb_->object_to_string (gatewayed_object TAO_ENV_ARG_DECL); + this->orb_->object_to_string (gatewayed_object ACE_ENV_ARG_DECL); ACE_CHECK_RETURN (CORBA::Object::_nil ()); const PortableServer::ObjectId_var id = @@ -44,7 +44,7 @@ Object_Factory_i::create_object (const char *interface_repository_id, CORBA::Object_ptr object_ptr = ort->make_object (interface_repository_id, *obj_id - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); ACE_CHECK_RETURN (CORBA::Object::_nil ()); return object_ptr; diff --git a/TAO/orbsvcs/examples/ORT/Object_Factory_i.h b/TAO/orbsvcs/examples/ORT/Object_Factory_i.h index 206f8fd5ff7..add32112dbd 100644 --- a/TAO/orbsvcs/examples/ORT/Object_Factory_i.h +++ b/TAO/orbsvcs/examples/ORT/Object_Factory_i.h @@ -33,7 +33,7 @@ class Object_Factory_i : public virtual POA_Gateway::Object_Factory CORBA::Object_ptr create_object (const char *interface_repository_id, CORBA::Object_ptr gatewayed_object - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp index 4764242e5a2..ce7279dd995 100644 --- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp +++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp @@ -18,14 +18,14 @@ Server_IORInterceptor (Gateway::Object_Factory_ptr } char * -Server_IORInterceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Server_IORInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Server_IORInterceptor"); } void -Server_IORInterceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Server_IORInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->gateway_object_factory_ = Gateway::Object_Factory::_nil (); @@ -34,10 +34,10 @@ Server_IORInterceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Server_IORInterceptor::establish_components ( PortableInterceptor::IORInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::String_var name = this->name (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var name = this->name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Get the length of the string plus one for the NULL terminator. @@ -60,7 +60,7 @@ Server_IORInterceptor::establish_components ( // Add the tagged component to all profiles. info->add_ior_component (ORT_Component - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h index 3d1f5947911..0ca90dca802 100644 --- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h +++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h @@ -38,34 +38,34 @@ class Server_IORInterceptor : */ //@{ /// Return the name of this IORInterceptor. - virtual char * name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Cleanup resources acquired by this IORInterceptor. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Add the tagged components to the IOR. virtual void establish_components ( PortableInterceptor::IORInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void components_established ( PortableInterceptor::IORInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void adapter_manager_state_changed ( PortableInterceptor::AdapterManagerId id, PortableInterceptor::AdapterState state - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void adapter_state_changed ( const PortableInterceptor::ObjectReferenceTemplateSeq & templates, PortableInterceptor::AdapterState state - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp index e17ff769ddf..68b32004c1c 100644 --- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp +++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp @@ -15,7 +15,7 @@ ACE_RCSID (ORT, void Server_IORInterceptor_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr /* info */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -23,17 +23,17 @@ Server_IORInterceptor_ORBInitializer::pre_init ( void Server_IORInterceptor_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_var obj = info->resolve_initial_references ("Gateway_Object_Factory" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; /// Narrow it down correctly. Gateway::Object_Factory_var gateway_object_factory = - Gateway::Object_Factory::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + Gateway::Object_Factory::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; /// Check for nil reference @@ -56,6 +56,6 @@ Server_IORInterceptor_ORBInitializer::post_init ( gateway; info->add_ior_interceptor (ior_interceptor.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h index fd588c8cdc8..4eb8ac2d3e7 100644 --- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h +++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h @@ -28,12 +28,12 @@ class Server_IORInterceptor_ORBInitializer //@{ /// The pre-initialization hook. virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// The post-initialization hook. virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} diff --git a/TAO/orbsvcs/examples/ORT/client.cpp b/TAO/orbsvcs/examples/ORT/client.cpp index e7642915681..70caad06d63 100644 --- a/TAO/orbsvcs/examples/ORT/client.cpp +++ b/TAO/orbsvcs/examples/ORT/client.cpp @@ -46,11 +46,11 @@ main (int argc, char *argv[]) return 1; CORBA::Object_var obj = - orb->string_to_object (ior TAO_ENV_ARG_DECL); + orb->string_to_object (ior ACE_ENV_ARG_DECL); ACE_TRY_CHECK; ORT::sum_server_var server = - ORT::sum_server::_narrow (obj.in () TAO_ENV_ARG_DECL); + ORT::sum_server::_narrow (obj.in () ACE_ENV_ARG_DECL); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -66,7 +66,7 @@ main (int argc, char *argv[]) CORBA::ULong result = server->add_variables (a, b - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); ACE_TRY_CHECK; cout << "**************************RREESSUULLTT: *****" << diff --git a/TAO/orbsvcs/examples/ORT/gateway_server.cpp b/TAO/orbsvcs/examples/ORT/gateway_server.cpp index 8549bf9a00a..135d9c710d5 100644 --- a/TAO/orbsvcs/examples/ORT/gateway_server.cpp +++ b/TAO/orbsvcs/examples/ORT/gateway_server.cpp @@ -42,7 +42,7 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "gateway_server_orb" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -51,12 +51,12 @@ main (int argc, char *argv[]) /// Resolve reference to RootPOA CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; /// Narrow it down correctly. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; /// Check for nil references @@ -67,11 +67,11 @@ main (int argc, char *argv[]) /// Get poa_manager reference PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; /// Activate it. - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ///@} @@ -81,25 +81,25 @@ main (int argc, char *argv[]) policies [0] = root_poa->create_servant_retention_policy (PortableServer::RETAIN - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policies [1] = root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policies [2] = root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var gateway_poa = root_poa->create_POA ("Gateway_POA", poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (CORBA::ULong i = 0; i != policies.length (); ++i) { @@ -109,13 +109,13 @@ main (int argc, char *argv[]) // Get the POA Current object reference obj = orb->resolve_initial_references ("POACurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow the object reference to a POA Current reference PortableServer::Current_var poa_current = PortableServer::Current::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Gateway_i *gateway; @@ -126,7 +126,7 @@ main (int argc, char *argv[]) CORBA::NO_MEMORY ()); ACE_TRY_CHECK; - gateway_poa->set_servant (gateway TAO_ENV_ARG_PARAMETER); + gateway_poa->set_servant (gateway ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; /// Get the ObjectID @@ -145,7 +145,7 @@ main (int argc, char *argv[]) /// Activate the Object_Factory_i Object gateway_poa->activate_object_with_id (oid.in (), object_factory - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the object reference. @@ -155,7 +155,7 @@ main (int argc, char *argv[]) /// Convert the object reference to a string format. CORBA::String_var ior = orb->object_to_string (gateway_object_factory.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; /// If the ior_output_file exists, output the IOR to it. @@ -172,7 +172,7 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/examples/ORT/server.cpp b/TAO/orbsvcs/examples/ORT/server.cpp index ddb7512a775..7290ea13a32 100644 --- a/TAO/orbsvcs/examples/ORT/server.cpp +++ b/TAO/orbsvcs/examples/ORT/server.cpp @@ -53,7 +53,7 @@ main (int argc, char *argv[]) orb_initializer; PortableInterceptor::register_orb_initializer (orb_initializer_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS == 1 */ @@ -65,7 +65,7 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "server_sum_orb" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -74,12 +74,12 @@ main (int argc, char *argv[]) /// Resolve reference to RootPOA CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; /// Narrow it down correctly. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; /// Check for nil references @@ -90,11 +90,11 @@ main (int argc, char *argv[]) /// Get poa_manager reference PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; /// Activate it. - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ///@} @@ -103,13 +103,13 @@ main (int argc, char *argv[]) sum_server_i sum_server_impl; /// Activate - obj = sum_server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + obj = sum_server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; /// Narrow it down. ORT::sum_server_var sum_server = ORT::sum_server::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; /// Check for nil reference @@ -121,7 +121,7 @@ main (int argc, char *argv[]) /// Convert the object reference to a string format. CORBA::String_var ior = - orb->object_to_string (sum_server.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (sum_server.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; /// If the ior_output_file exists, output the IOR to it. @@ -138,7 +138,7 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_INFO, "Successful.\n")); diff --git a/TAO/orbsvcs/examples/ORT/sum_server_i.cpp b/TAO/orbsvcs/examples/ORT/sum_server_i.cpp index 205cabf7e1e..8d2014066f4 100644 --- a/TAO/orbsvcs/examples/ORT/sum_server_i.cpp +++ b/TAO/orbsvcs/examples/ORT/sum_server_i.cpp @@ -13,7 +13,7 @@ sum_server_i::sum_server_i () CORBA::Long sum_server_i::add_variables (CORBA::Long a, CORBA::Long b - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { cout << __FILE__ << __LINE__ << endl; diff --git a/TAO/orbsvcs/examples/ORT/sum_server_i.h b/TAO/orbsvcs/examples/ORT/sum_server_i.h index 1501c410327..ea38c4ae7ab 100644 --- a/TAO/orbsvcs/examples/ORT/sum_server_i.h +++ b/TAO/orbsvcs/examples/ORT/sum_server_i.h @@ -32,7 +32,7 @@ class sum_server_i : public virtual POA_ORT::sum_server /// add variables method CORBA::Long add_variables (CORBA::Long a, CORBA::Long b - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp index bfa2b4e8bd8..05fd4d9c983 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp +++ b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp @@ -12,7 +12,7 @@ AddrServer::AddrServer (const RtecUDPAdmin::UDP_Addr& addr) void AddrServer::get_addr (const RtecEventComm::EventHeader&, RtecUDPAdmin::UDP_Addr_out addr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { addr = this->addr_; diff --git a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h index fc3610771df..72e99b0d205 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h +++ b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h @@ -41,7 +41,7 @@ public: // = The RtecUDPAdmin::AddrServer methods virtual void get_addr (const RtecEventComm::EventHeader& header, RtecUDPAdmin::UDP_Addr_out addr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp index c6e79b3ef6b..ff393428e06 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp @@ -13,14 +13,14 @@ Consumer::Consumer (void) void Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->proxy_ = - consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventComm::PushConsumer_var me = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Simple subscription, but usually the helper classes in @@ -40,17 +40,17 @@ Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin h1.source = ACE_ES_EVENT_SOURCE_ANY; // Any source is OK this->proxy_->connect_push_consumer (me.in (), qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) +Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { // Disconnect from the proxy - this->proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + this->proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -62,20 +62,20 @@ Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) // Deactivate this object PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Get the Object Id used for the servant.. PortableServer::ObjectId_var oid = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Deactivate the object - poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void Consumer::push (const RtecEventComm::EventSet& events - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { if (events.length () == 0) @@ -95,7 +95,7 @@ Consumer::push (const RtecEventComm::EventSet& events } void -Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h index c71328b15d4..536404b824b 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h +++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h @@ -38,18 +38,18 @@ public: // Constructor void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Connect to the Event Channel - void disconnect (TAO_ENV_SINGLE_ARG_DECL); + void disconnect (ACE_ENV_SINGLE_ARG_DECL); // Disconnect from the event channel // = The RtecEventComm::PushConsumer methods virtual void push (const RtecEventComm::EventSet& events - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The skeleton methods. diff --git a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp index 82df7818a72..6dabe408305 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp +++ b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp @@ -44,18 +44,18 @@ main (int argc, char* argv[]) // // If your platform supports native exceptions, and TAO was compiled // with native exception support then you can simply use try/catch - // and avoid the TAO_ENV_SINGLE_ARG_PARAMETER argument. + // and avoid the ACE_ENV_SINGLE_ARG_PARAMETER argument. // Unfortunately many embedded systems cannot use exceptions due to // the space and time overhead. // - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // **************** HERE STARTS THE ORB SETUP // Create the ORB, pass the argv list for parsing. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse the arguments, you usually want to do this after @@ -73,15 +73,15 @@ main (int argc, char* argv[]) // The POA starts in the holding state, if it is not activated // it will not process any requests. CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************** THAT COMPLETS THE ORB SETUP @@ -104,14 +104,14 @@ main (int argc, char* argv[]) // that may involve creating some threads. // But it should always be invoked because several internal data // structures are initialized at that point. - ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // The event channel is activated as any other CORBA servant. // In this case we use the simple implicit activation with the // RootPOA RtecEventChannelAdmin::EventChannel_var event_channel = - ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************** THAT COMPLETES THE LOCAL EVENT CHANNEL SETUP @@ -148,7 +148,7 @@ main (int argc, char* argv[]) // Now we create and activate the servant AddrServer as_impl (addr); RtecUDPAdmin::AddrServer_var address_server = - as_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + as_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // We need a local socket to send the data, open it and check @@ -165,7 +165,7 @@ main (int argc, char* argv[]) sender.init (event_channel.in (), address_server.in (), &endpoint - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Now we connect the sender as a consumer of events, it will @@ -180,7 +180,7 @@ main (int argc, char* argv[]) sub.dependencies[0].event.header.source = ACE_ES_EVENT_SOURCE_ANY; // Any source is OK - sender.open (sub TAO_ENV_ARG_PARAMETER); + sender.open (sub ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // To receive events we need to setup an event handler: @@ -198,7 +198,7 @@ main (int argc, char* argv[]) // Then it register for the multicast groups that carry those // events: int r = mcast_eh.open (event_channel.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (r == -1) { @@ -222,7 +222,7 @@ main (int argc, char* argv[]) orb->orb_core ()->reactor (), expire, max_expiration_count - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // The Receiver is also a supplier of events. The exact type of @@ -242,7 +242,7 @@ main (int argc, char* argv[]) pub.publications[0].event.header.source = ACE_ES_EVENT_SOURCE_ANY; pub.is_gateway = 1; - receiver.open (pub TAO_ENV_ARG_PARAMETER); + receiver.open (pub ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************** THAT COMPLETES THE FEDERATION SETUP @@ -253,19 +253,19 @@ main (int argc, char* argv[]) // channel Consumer consumer; RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; consumer.connect (consumer_admin.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // And now create a supplier Supplier supplier; RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; supplier.connect (supplier_admin.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************** THAT COMPLETES THE CLIENT SETUP @@ -278,7 +278,7 @@ main (int argc, char* argv[]) for (int i = 0; i != 1000; ++i) { CORBA::Boolean there_is_work = - orb->work_pending (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (there_is_work) { @@ -287,12 +287,12 @@ main (int argc, char* argv[]) // perform_work() or work_pending(), so just calling // them results in a spin loop. ACE_Time_Value tv (0, 50000); - orb->perform_work (tv TAO_ENV_ARG_PARAMETER); + orb->perform_work (tv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_Time_Value tv (0, 100000); ACE_OS::sleep (tv); - supplier.perform_push (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier.perform_push (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -301,16 +301,16 @@ main (int argc, char* argv[]) // **************** HERE STARTS THE CLEANUP CODE // First the easy ones - supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Now let us close the Receiver - receiver.close (TAO_ENV_SINGLE_ARG_PARAMETER); + receiver.close (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - r = mcast_eh.close (TAO_ENV_SINGLE_ARG_PARAMETER); + r = mcast_eh.close (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (r == -1) { @@ -319,13 +319,13 @@ main (int argc, char* argv[]) } // And also close the sender of events - sender.close (TAO_ENV_SINGLE_ARG_PARAMETER); + sender.close (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // The event channel must be destroyed, so it can release its // resources, and inform all the clients that are still // connected that it is going away. - event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Deactivating the event channel implementation is not strictly @@ -337,24 +337,24 @@ main (int argc, char* argv[]) // is the root POA, but the code is more robust if we don't // rely on that. PortableServer::POA_var poa = - ec_impl._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get the Object Id used for the servant.. PortableServer::ObjectId_var oid = - poa->servant_to_id (&ec_impl TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (&ec_impl ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Deactivate the object - poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } // Now we can destroy the POA, the flags mean that we want to // wait until the POA is really destroyed - poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Finally destroy the ORB - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************** THAT COMPLETES THE CLEANUP CODE diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp index 1904326e03e..2572716d1e8 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp @@ -12,14 +12,14 @@ Supplier::Supplier (void) void Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->proxy_ = - supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventComm::PushSupplier_var me = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Simple publication, but usually the helper classes in @@ -34,17 +34,17 @@ Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin h0.source = 1; // first free event source this->proxy_->connect_push_supplier (me.in (), qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) +Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL) { // Disconnect from the EC ACE_TRY { - this->proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + this->proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -53,17 +53,17 @@ Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) ACE_ENDTRY; PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -Supplier::perform_push (TAO_ENV_SINGLE_ARG_DECL) +Supplier::perform_push (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { @@ -75,7 +75,7 @@ Supplier::perform_push (TAO_ENV_SINGLE_ARG_DECL) // Avoid loops throught the event channel federations event[0].header.ttl = 1; - this->proxy_->push (event TAO_ENV_ARG_PARAMETER); + this->proxy_->push (event ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -85,7 +85,7 @@ Supplier::perform_push (TAO_ENV_SINGLE_ARG_DECL) } void -Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h index a8d6c6ff31d..7c591f5fdb7 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h +++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h @@ -39,18 +39,18 @@ public: // Constructor void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Connect to the event channel - void disconnect (TAO_ENV_SINGLE_ARG_DECL); + void disconnect (ACE_ENV_SINGLE_ARG_DECL); // Disconnect from the event channel - void perform_push (TAO_ENV_SINGLE_ARG_DECL); + void perform_push (ACE_ENV_SINGLE_ARG_DECL); // Push a single event // = The RtecEventComm::PushSupplier methods - virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The skeleton methods. diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp index 4793a20ab13..e207d997042 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp @@ -10,7 +10,7 @@ Consumer::Consumer (void) void Consumer::push (const RtecEventComm::EventSet& events - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { if (events.length () == 0) @@ -25,7 +25,7 @@ Consumer::push (const RtecEventComm::EventSet& events } void -Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h index 20c1ffad011..bdbdbaad894 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h @@ -45,9 +45,9 @@ public: // = The RtecEventComm::PushConsumer methods virtual void push (const RtecEventComm::EventSet& events - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The skeleton methods. }; diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp index 52485b074cf..41b84c08355 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp @@ -30,12 +30,12 @@ main (int argc, char* argv[]) { TAO_EC_Default_Factory::init_svcs (); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) == -1) @@ -46,15 +46,15 @@ main (int argc, char* argv[]) } CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -62,11 +62,11 @@ main (int argc, char* argv[]) #if 0 // Obtain a reference to the naming service... CORBA::Object_var naming_obj = - orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosNaming::NamingContext_var naming_context = - CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER); + CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* 0 */ @@ -93,7 +93,7 @@ main (int argc, char* argv[]) } RtecScheduler::Scheduler_var scheduler = - sched_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + sched_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; #if 0 @@ -106,7 +106,7 @@ main (int argc, char* argv[]) schedule_name[0].id = CORBA::string_dup ("ScheduleService"); // Register the servant with the Naming Context.... naming_context->rebind (schedule_name, scheduler.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* 0 */ @@ -121,7 +121,7 @@ main (int argc, char* argv[]) &module_factory); RtecEventChannelAdmin::EventChannel_var event_channel = - event_channel_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; #else @@ -131,12 +131,12 @@ main (int argc, char* argv[]) TAO_EC_Event_Channel ec_impl (attributes); ACE_DEBUG ((LM_DEBUG, "activating EC\n")); - ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "EC activated\n")); RtecEventChannelAdmin::EventChannel_var event_channel = - ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* 0 */ @@ -148,7 +148,7 @@ main (int argc, char* argv[]) Consumer consumer_impl; RtecScheduler::handle_t consumer_rt_info1 = - scheduler->create ("consumer_event_1" TAO_ENV_ARG_PARAMETER); + scheduler->create ("consumer_event_1" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Let's say that the execution time for event 1 is 2 @@ -164,11 +164,11 @@ main (int argc, char* argv[]) time, 0, RtecScheduler::OPERATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecScheduler::handle_t consumer_rt_info2 = - scheduler->create ("consumer_event_2" TAO_ENV_ARG_PARAMETER); + scheduler->create ("consumer_event_2" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Let's say that the execution time for event 2 is 1 @@ -183,7 +183,7 @@ main (int argc, char* argv[]) time, 0, RtecScheduler::OPERATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_ConsumerQOS_Factory consumer_qos; @@ -197,21 +197,21 @@ main (int argc, char* argv[]) // The canonical protocol to connect to the EC RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::ProxyPushSupplier_var supplier_proxy = - consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventComm::PushConsumer_var consumer = - consumer_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "connecting consumer\n")); supplier_proxy->connect_push_consumer (consumer.in (), consumer_qos.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "consumer connected\n")); @@ -220,7 +220,7 @@ main (int argc, char* argv[]) Supplier supplier_impl; RtecScheduler::handle_t supplier_rt_info1 = - scheduler->create ("supplier_event_1" TAO_ENV_ARG_PARAMETER); + scheduler->create ("supplier_event_1" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // The execution times are set to reasonable values, but @@ -240,11 +240,11 @@ main (int argc, char* argv[]) 0, 1, RtecScheduler::OPERATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecScheduler::handle_t supplier_rt_info2 = - scheduler->create ("supplier_event_2" TAO_ENV_ARG_PARAMETER); + scheduler->create ("supplier_event_2" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // The execution times are set to reasonable values, but @@ -263,7 +263,7 @@ main (int argc, char* argv[]) 0, 1, RtecScheduler::OPERATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventComm::EventSourceID supplier_id = 1; @@ -279,21 +279,21 @@ main (int argc, char* argv[]) // The canonical protocol to connect to the EC RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::ProxyPushConsumer_var consumer_proxy = - supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventComm::PushSupplier_var supplier = - supplier_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "connecting supplier\n")); consumer_proxy->connect_push_supplier (supplier.in (), supplier_qos.get_SupplierQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "supplier connected\n")); @@ -330,7 +330,7 @@ main (int argc, char* argv[]) infos.out (), configs.out (), anomalies.out () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Dump the schedule to a file.. @@ -362,12 +362,12 @@ main (int argc, char* argv[]) { if (i % 2 == 0) { - consumer_proxy->push (event1 TAO_ENV_ARG_PARAMETER); + consumer_proxy->push (event1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else { - consumer_proxy->push (event2 TAO_ENV_ARG_PARAMETER); + consumer_proxy->push (event2 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp index f60d585f1ec..badc65b011d 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp @@ -9,7 +9,7 @@ Supplier::Supplier (void) } void -Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h index e6139801c49..b0391f7602b 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h @@ -44,7 +44,7 @@ public: // = The RtecEventComm::PushSupplier methods - virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The skeleton methods. diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp index d0d81303d5c..191503bfb3d 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp @@ -24,12 +24,12 @@ Consumer::Consumer (void) int Consumer::run (int argc, char* argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Do *NOT* make a copy because we don't want the ORB to outlive @@ -44,40 +44,40 @@ Consumer::run (int argc, char* argv[]) } CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the event channel, we could use a naming service, a // command line argument or resolve_initial_references(), but // this is simpler... object = - orb->string_to_object (argv[1] TAO_ENV_ARG_PARAMETER); + orb->string_to_object (argv[1] ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var event_channel = RtecEventChannelAdmin::EventChannel::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // The canonical protocol to connect to the EC RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::ProxyPushSupplier_var supplier = - consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventComm::PushConsumer_var consumer = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Simple subscription, but usually the helper classes in @@ -95,7 +95,7 @@ Consumer::run (int argc, char* argv[]) h1.source = ACE_ES_EVENT_SOURCE_ANY; supplier->connect_push_consumer (consumer.in (), qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Wait for events, using work_pending()/perform_work() may help @@ -120,7 +120,7 @@ Consumer::run (int argc, char* argv[]) void Consumer::push (const RtecEventComm::EventSet& events - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { if (events.length () == 0) @@ -140,13 +140,13 @@ Consumer::push (const RtecEventComm::EventSet& events } void -Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL) +Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // In this example we shutdown the ORB when we disconnect from the // EC (or rather the EC disconnects from us), but this doesn't have // to be the case.... - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } // **************************************************************** diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h index e7dfda0c32a..19005b96ec1 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h +++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h @@ -42,9 +42,9 @@ public: // = The RtecEventComm::PushConsumer methods virtual void push (const RtecEventComm::EventSet& events - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The skeleton methods. diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp index ad054096ce4..657aaae2f3b 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp @@ -15,12 +15,12 @@ main (int argc, char* argv[]) { TAO_EC_Default_Factory::init_svcs (); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) == -1) @@ -31,30 +31,30 @@ main (int argc, char* argv[]) } CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; TAO_EC_Event_Channel_Attributes attributes (poa.in (), poa.in ()); TAO_EC_Event_Channel ec_impl (attributes); - ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var event_channel = - ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (event_channel.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (event_channel.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp index 32ea062d450..481850d7a64 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp @@ -23,12 +23,12 @@ Supplier::Supplier (void) int Supplier::run (int argc, char* argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (argc <= 1) @@ -39,40 +39,40 @@ Supplier::run (int argc, char* argv[]) } CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the event channel, we could use a naming service, a // command line argument or resolve_initial_references(), but // this is simpler... object = - orb->string_to_object (argv[1] TAO_ENV_ARG_PARAMETER); + orb->string_to_object (argv[1] ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var event_channel = RtecEventChannelAdmin::EventChannel::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // The canonical protocol to connect to the EC RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::ProxyPushConsumer_var consumer = - supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventComm::PushSupplier_var supplier = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Simple publication, but usually the helper classes in @@ -85,7 +85,7 @@ Supplier::run (int argc, char* argv[]) h0.source = 1; // first free event source consumer->connect_push_supplier (supplier.in (), qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Push the events... @@ -99,28 +99,28 @@ Supplier::run (int argc, char* argv[]) for (int i = 0; i != 2000; ++i) { - consumer->push (event TAO_ENV_ARG_PARAMETER); + consumer->push (event ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::sleep (sleep_time); } // Disconnect from the EC - consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Destroy the EC.... - event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Deactivate this object... PortableServer::ObjectId_var id = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Destroy the POA - poa->destroy (1, 0 TAO_ENV_ARG_PARAMETER); + poa->destroy (1, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -133,7 +133,7 @@ Supplier::run (int argc, char* argv[]) } void -Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h index 72a72f74395..b1fce544ccc 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h +++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h @@ -41,7 +41,7 @@ public: // = The RtecEventComm::PushSupplier methods - virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The skeleton methods. diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp index bbef4bc291e..2153014c111 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp @@ -14,13 +14,13 @@ static int authorize_1 = 1; static int authorize_2 = 1; CORBA::Boolean -SLevel1_Server_i::authorize_level1 (TAO_ENV_SINGLE_ARG_DECL) +SLevel1_Server_i::authorize_level1 (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { /// Get a reference to the SecurityCurrent object. CORBA::Object_var obj = - orb->resolve_initial_references ("SecurityCurrent" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("SecurityCurrent" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); /// Narrow it down correctly. @@ -110,7 +110,7 @@ SLevel1_Server_i::authorize_level1 (TAO_ENV_SINGLE_ARG_DECL) CORBA::Boolean -SLevel1_Server_i::authorize_level2 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +SLevel1_Server_i::authorize_level2 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { /// If the owner of this invocation is authorized to invoke this diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h index 7448af5dadc..d284e65c293 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h @@ -25,10 +25,10 @@ class SLevel1_Server_i : public POA_SLevel1_Server SLevel1_Server_i (); /// - CORBA::Boolean authorize_level1 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + CORBA::Boolean authorize_level1 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Boolean authorize_level2 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + CORBA::Boolean authorize_level2 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); static int authorized_1; diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp index 651169f1c21..b7779c65615 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp @@ -37,18 +37,18 @@ main (int argc, char *argv []) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; SLevel1_Server_var server = - SLevel1_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + SLevel1_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -60,7 +60,7 @@ main (int argc, char *argv []) } CORBA::Boolean authorized = - server->authorize_level1 (TAO_ENV_SINGLE_ARG_PARAMETER); + server->authorize_level1 (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (authorized == 0) @@ -70,10 +70,10 @@ main (int argc, char *argv []) ACE_DEBUG ((LM_DEBUG, "DENIED: You Do NOT have enough privileges\n")); - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp index 7a70989ebf0..2b39bda82e3 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp @@ -15,12 +15,12 @@ main (int argc, char *argv[]) { /// Our regular ORB Initialization. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; /// Get a reference to the RootPOA. CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -30,18 +30,18 @@ main (int argc, char *argv[]) /// Narrow down the reference to the currect interface. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; SLevel1_Server_i level1_server (); SLevel1_Server_var server = - level1_server._this (TAO_ENV_SINGLE_ARG_PARAMETER); + level1_server._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (server.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it @@ -60,7 +60,7 @@ main (int argc, char *argv[]) // Start the ORB orb->run (); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/orbsvcs/examples/Security/Send_File/client.cpp b/TAO/orbsvcs/examples/Security/Send_File/client.cpp index f82560ff07e..507bdde5847 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/client.cpp +++ b/TAO/orbsvcs/examples/Security/Send_File/client.cpp @@ -39,18 +39,18 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Simple_Server_var server = - Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -67,15 +67,15 @@ main (int argc, char *argv[]) char *line = buf.read ('\n'); if (line == 0) break; - server->send_line (line TAO_ENV_ARG_PARAMETER); + server->send_line (line ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; buf.alloc ()->free (line); } - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/examples/Security/Send_File/server.cpp b/TAO/orbsvcs/examples/Security/Send_File/server.cpp index 846d129d28e..fd1b150a481 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/server.cpp +++ b/TAO/orbsvcs/examples/Security/Send_File/server.cpp @@ -38,11 +38,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -51,11 +51,11 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -64,11 +64,11 @@ main (int argc, char *argv[]) Simple_Server_i server_impl (orb.in ()); Simple_Server_var server = - server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -86,15 +86,15 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::sleep (5); diff --git a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp index c292b05581b..62d1ff2e04a 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp +++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp @@ -10,14 +10,14 @@ ACE_RCSID(Send_File, test_i, "$Id$") void Simple_Server_i::send_line (const char *line - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "%s\n", line)); } void -Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); diff --git a/TAO/orbsvcs/examples/Security/Send_File/test_i.h b/TAO/orbsvcs/examples/Security/Send_File/test_i.h index ccf178af83f..10b18e60116 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/test_i.h +++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.h @@ -32,10 +32,10 @@ public: // = The Simple_Server methods. void send_line (const char *line - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp index efbedd11025..4b2ef6a487e 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp @@ -73,7 +73,7 @@ TAO_Basic_StreamCtrl::TAO_Basic_StreamCtrl (void) // Empty the_spec means apply operation to all flows void TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)) { @@ -92,7 +92,7 @@ TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec if (this->flow_connection_map_.find (flow_name_key, flow_connection_entry) == 0) { - flow_connection_entry->int_id_->stop (TAO_ENV_SINGLE_ARG_PARAMETER); + flow_connection_entry->int_id_->stop (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -103,7 +103,7 @@ TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec FlowConnection_Map_Entry *entry = 0; for (;iterator.next (entry) != 0;iterator.advance ()) { - entry->int_id_->stop (TAO_ENV_SINGLE_ARG_PARAMETER); + entry->int_id_->stop (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -122,7 +122,7 @@ TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec // Empty the_spec means apply operation to all flows void TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)) { @@ -142,7 +142,7 @@ TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec if (this->flow_connection_map_.find (flow_name_key, flow_connection_entry) == 0) { - flow_connection_entry->int_id_->start (TAO_ENV_SINGLE_ARG_PARAMETER); + flow_connection_entry->int_id_->start (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -153,7 +153,7 @@ TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec FlowConnection_Map_Entry *entry = 0; for (;iterator.next (entry) != 0;iterator.advance ()) { - entry->int_id_->start (TAO_ENV_SINGLE_ARG_PARAMETER); + entry->int_id_->start (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -174,7 +174,7 @@ TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec void TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)) { @@ -192,7 +192,7 @@ TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec FlowConnection_Map::ENTRY *flow_connection_entry = 0; if (this->flow_connection_map_.find (flow_name_key, flow_connection_entry) == 0) { - flow_connection_entry->int_id_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + flow_connection_entry->int_id_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -204,7 +204,7 @@ TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec FlowConnection_Map_Entry *entry = 0; for (;iterator.next (entry) != 0;iterator.advance ()) { - entry->int_id_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + entry->int_id_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -225,7 +225,7 @@ CORBA::Boolean TAO_Basic_StreamCtrl::modify_QoS (AVStreams::streamQoS & /*new_qos*/, const AVStreams::flowSpec &/*flowspec*/ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed)) @@ -237,7 +237,7 @@ TAO_Basic_StreamCtrl::modify_QoS (AVStreams::streamQoS & /*new_qos*/, // E.g., loss of flow, reestablishment of flow, etc.. void TAO_Basic_StreamCtrl::push_event (const struct CosPropertyService::Property &/*the_event*/ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) @@ -249,7 +249,7 @@ void TAO_Basic_StreamCtrl::set_FPStatus (const AVStreams::flowSpec &flow_spec, const char *fp_name, const CORBA::Any &fp_settings - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::FPError)) @@ -257,7 +257,7 @@ TAO_Basic_StreamCtrl::set_FPStatus (const AVStreams::flowSpec &flow_spec, { if (!CORBA::is_nil (this->sep_a_.in ())) { - this->sep_a_->set_FPStatus (flow_spec, fp_name, fp_settings TAO_ENV_ARG_PARAMETER); + this->sep_a_->set_FPStatus (flow_spec, fp_name, fp_settings ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -265,7 +265,7 @@ TAO_Basic_StreamCtrl::set_FPStatus (const AVStreams::flowSpec &flow_spec, // Gets the flow connection. CORBA::Object_ptr TAO_Basic_StreamCtrl::get_flow_connection (const char *flow_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::notSupported)) @@ -282,7 +282,7 @@ TAO_Basic_StreamCtrl::get_flow_connection (const char *flow_name void TAO_Basic_StreamCtrl::set_flow_connection (const char *flow_name, CORBA::Object_ptr flow_connection_obj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::notSupported)) @@ -290,7 +290,7 @@ TAO_Basic_StreamCtrl::set_flow_connection (const char *flow_name, AVStreams::FlowConnection_ptr flow_connection = AVStreams::FlowConnection::_nil (); ACE_TRY { - flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj TAO_ENV_ARG_PARAMETER); + flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -323,7 +323,7 @@ TAO_Basic_StreamCtrl::~TAO_Basic_StreamCtrl (void) CORBA::Boolean TAO_Negotiator::negotiate (AVStreams::Negotiator_ptr /* remote_negotiator */, const AVStreams::streamQoS &/* qos_spec */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -365,11 +365,11 @@ int MMDevice_Map_Hash_Key::operator == (const MMDevice_Map_Hash_Key &hash_key) const { CORBA::Boolean result = 0; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { result = - this->mmdevice_->_is_equivalent (hash_key.mmdevice_ TAO_ENV_ARG_PARAMETER); + this->mmdevice_->_is_equivalent (hash_key.mmdevice_ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -387,14 +387,14 @@ operator < (const MMDevice_Map_Hash_Key &left, const MMDevice_Map_Hash_Key &right) { int result = 0; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ULong left_hash = left.mmdevice_->_hash (left.hash_maximum_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ULong right_hash = right.mmdevice_->_hash (right.hash_maximum_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; result = left_hash < right_hash; } @@ -412,11 +412,11 @@ u_long MMDevice_Map_Hash_Key::hash (void) const { u_long result = 0; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { result = this->mmdevice_->_hash (this->hash_maximum_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -436,10 +436,10 @@ MMDevice_Map_Hash_Key::hash (void) const TAO_StreamCtrl::TAO_StreamCtrl (void) :mcastconfigif_ (0) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->streamctrl_ = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->streamctrl_ = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; char buf [BUFSIZ]; int result = ACE_OS::hostname (buf, BUFSIZ); @@ -477,13 +477,13 @@ TAO_StreamCtrl::~TAO_StreamCtrl (void) // Empty the_spec means apply operation to all flows void TAO_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)) { ACE_TRY { - TAO_Basic_StreamCtrl::stop (flow_spec TAO_ENV_ARG_PARAMETER); + TAO_Basic_StreamCtrl::stop (flow_spec ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->flow_connection_map_.current_size () > 0) return; @@ -491,13 +491,13 @@ TAO_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec MMDevice_Map::ENTRY *entry = 0; for (;a_iterator.next (entry)!= 0;a_iterator.advance ()) { - entry->int_id_.sep_->stop (flow_spec TAO_ENV_ARG_PARAMETER); + entry->int_id_.sep_->stop (flow_spec ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } MMDevice_Map_Iterator b_iterator (this->mmdevice_b_map_); for (;b_iterator.next (entry)!= 0;b_iterator.advance ()) { - entry->int_id_.sep_->stop (flow_spec TAO_ENV_ARG_PARAMETER); + entry->int_id_.sep_->stop (flow_spec ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -514,13 +514,13 @@ TAO_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec // Empty the_spec means apply operation to all flows void TAO_StreamCtrl::start (const AVStreams::flowSpec &flow_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)) { ACE_TRY { - TAO_Basic_StreamCtrl::start (flow_spec TAO_ENV_ARG_PARAMETER); + TAO_Basic_StreamCtrl::start (flow_spec ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->flow_connection_map_.current_size () > 0) return; @@ -529,13 +529,13 @@ TAO_StreamCtrl::start (const AVStreams::flowSpec &flow_spec MMDevice_Map::ENTRY *entry = 0; for (;a_iterator.next (entry)!= 0;a_iterator.advance ()) { - entry->int_id_.sep_->start (flow_spec TAO_ENV_ARG_PARAMETER); + entry->int_id_.sep_->start (flow_spec ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } MMDevice_Map_Iterator b_iterator (this->mmdevice_b_map_); for (;b_iterator.next (entry)!= 0;b_iterator.advance ()) { - entry->int_id_.sep_->start (flow_spec TAO_ENV_ARG_PARAMETER); + entry->int_id_.sep_->start (flow_spec ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -553,13 +553,13 @@ TAO_StreamCtrl::start (const AVStreams::flowSpec &flow_spec // Empty the_spec means apply operation to all flows void TAO_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)) { ACE_TRY { - TAO_Basic_StreamCtrl::destroy (flow_spec TAO_ENV_ARG_PARAMETER); + TAO_Basic_StreamCtrl::destroy (flow_spec ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->flow_connection_map_.current_size () > 0) return; @@ -568,13 +568,13 @@ TAO_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec MMDevice_Map::ENTRY *entry = 0; for (;a_iterator.next (entry)!= 0;a_iterator.advance ()) { - entry->int_id_.sep_->destroy (flow_spec TAO_ENV_ARG_PARAMETER); + entry->int_id_.sep_->destroy (flow_spec ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } MMDevice_Map_Iterator b_iterator (this->mmdevice_b_map_); for (;b_iterator.next (entry)!= 0;b_iterator.advance ()) { - entry->int_id_.sep_->destroy (flow_spec TAO_ENV_ARG_PARAMETER); + entry->int_id_.sep_->destroy (flow_spec ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -600,7 +600,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, AVStreams::MMDevice_ptr b_party, AVStreams::streamQoS &the_qos, const AVStreams::flowSpec &the_flows - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -649,7 +649,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, met_qos, named_vdev.inout (), the_flows - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (TAO_debug_level > 0) @@ -659,21 +659,21 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, streamctrl_any <<= this->streamctrl_.in (); this->sep_a_->define_property ("Related_StreamCtrl", streamctrl_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Any vdev_a_any; vdev_a_any <<= this->vdev_a_.in (); this->sep_a_->define_property ("Related_VDev", vdev_a_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Any streamendpoint_a_any; streamendpoint_a_any <<= this->sep_a_.in (); this->vdev_a_->define_property ("Related_StreamEndpoint", streamendpoint_a_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -681,7 +681,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, mmdevice_a_any <<= a_party; this->vdev_a_->define_property ("Related_MMDevice", mmdevice_a_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // add the mmdevice, sep and vdev to the map. @@ -720,7 +720,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, met_qos, named_vdev.inout (), the_flows - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) TAO_StreamCtrl::create_B: succeeded\n")); @@ -728,28 +728,28 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "\n(%P|%t)stream_endpoint_b_ = %s", TAO_ORB_Core_instance ()->orb ()->object_to_string (this->sep_b_.in () - TAO_ENV_ARG_PARAMETER))); + ACE_ENV_ARG_PARAMETER))); ACE_TRY_CHECK; // Define ourselves as the related_streamctrl property of the sep. CORBA::Any streamctrl_any; streamctrl_any <<= this->streamctrl_.in (); this->sep_b_->define_property ("Related_StreamCtrl", streamctrl_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Any vdev_b_any; vdev_b_any <<= this->vdev_b_.in (); this->sep_b_->define_property ("Related_VDev", vdev_b_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Any streamendpoint_b_any; streamendpoint_b_any <<= this->sep_b_.in (); this->vdev_b_->define_property ("Related_StreamEndpoint", streamendpoint_b_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -757,7 +757,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, mmdevice_b_any <<= b_party; this->vdev_b_->define_property ("Related_MMDevice", mmdevice_b_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // add the mmdevice, sep and vdev to the map. MMDevice_Map_Entry map_entry; @@ -783,12 +783,12 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, sep_b_peer_any <<= this->sep_a_.in(); this->sep_a_->define_property ("PeerAdapter", sep_a_peer_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->sep_b_->define_property ("PeerAdapter", sep_b_peer_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -801,20 +801,20 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, ACE_TRY_EX (set_source_id) { CORBA::Any_ptr flows_any = this->sep_a_->get_property_value ("Flows" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (set_source_id); AVStreams::flowSpec_var flows; *flows_any >>= flows.out (); for (u_int i=0; i< flows->length ();i++) { CORBA::Object_var fep_obj = - this->sep_a_->get_fep (flows [i] TAO_ENV_ARG_PARAMETER); + this->sep_a_->get_fep (flows [i] ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (set_source_id); ACE_TRY_EX (producer_check) { AVStreams::FlowProducer_var producer = AVStreams::FlowProducer::_narrow (fep_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (producer_check); producer->set_source_id (this->source_id_++); } @@ -839,7 +839,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, // the streamctrl has to give an array of source ids to // the sep. this->sep_a_->set_source_id (this->source_id_++ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_ENDTRY; @@ -850,7 +850,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, TAO_MCastConfigIf, 0); // @@: Deactivating the object thru poa means calling remove_ref after _this. - this->mcastconfigif_ptr_ = this->mcastconfigif_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->mcastconfigif_ptr_ = this->mcastconfigif_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } // Multicast source being added. @@ -858,7 +858,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, this->mcastconfigif_ptr_.in (), the_qos, the_flows - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); if (!result) ACE_ERROR_RETURN ((LM_ERROR, "set_Mcast_peer failed\n"), 0); } @@ -873,7 +873,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, this->mcastconfigif_->set_peer (this->vdev_b_.in (), the_qos, the_flows - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -885,7 +885,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, connect_leaf_success = this->sep_a_->connect_leaf (this->sep_b_.in (), the_qos, the_flows - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (connect_leaf); connect_leaf_success = 1; } @@ -905,9 +905,9 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_StreamCtrl::bind_devs Multiconnect\n")); AVStreams::flowSpec connect_flows = the_flows; - this->sep_a_->multiconnect (the_qos, connect_flows TAO_ENV_ARG_PARAMETER); + this->sep_a_->multiconnect (the_qos, connect_flows ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->sep_b_->multiconnect (the_qos, connect_flows TAO_ENV_ARG_PARAMETER); + this->sep_b_->multiconnect (the_qos, connect_flows ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -921,14 +921,14 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, this->vdev_b_.in (), the_qos, the_flows - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->vdev_b_->set_peer (this->streamctrl_.in (), this->vdev_a_.in (), the_qos, the_flows - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -938,7 +938,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, this->sep_a_->connect (this->sep_b_.in (), the_qos, the_flows - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == 0) ACE_ERROR_RETURN ((LM_ERROR, "sep_a->connect (sep_b) failed\n"), 0); @@ -951,7 +951,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, this->sep_b_.in (), the_qos, the_flows - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -973,7 +973,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, AVStreams::StreamEndPoint_B_ptr sep_b, AVStreams::streamQoS &stream_qos, const AVStreams::flowSpec &flow_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -997,24 +997,24 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, sep_any <<= sep_b; sep_a->define_property ("PeerAdapter", sep_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; sep_any <<= sep_a; sep_b->define_property ("PeerAdapter", sep_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // since its full profile we do the viable stream setup algorithm. // get the flows for the A streamendpoint. // the flows spec is empty and hence we do a exhaustive match. AVStreams::flowSpec a_flows, b_flows; CORBA::Any_var flows_any; - flows_any = sep_a->get_property_value ("Flows" TAO_ENV_ARG_PARAMETER); + flows_any = sep_a->get_property_value ("Flows" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AVStreams::flowSpec *temp_flows; flows_any.in () >>= temp_flows; a_flows = *temp_flows; - flows_any = sep_b->get_property_value ("Flows" TAO_ENV_ARG_PARAMETER); + flows_any = sep_b->get_property_value ("Flows" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; flows_any.in () >>= temp_flows; b_flows = *temp_flows; @@ -1033,11 +1033,11 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, // get the flowendpoint references. CORBA::Object_var fep_obj = sep_a->get_fep (flowname - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AVStreams::FlowEndPoint_ptr fep = AVStreams::FlowEndPoint::_narrow (fep_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_CString fep_key (flowname); result = a_fep_map->bind (fep_key, fep); @@ -1051,11 +1051,11 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, // get the flowendpoint references. CORBA::Object_var fep_obj = sep_b->get_fep (flowname - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AVStreams::FlowEndPoint_ptr fep = AVStreams::FlowEndPoint::_narrow (fep_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_CString fep_key (flowname); result = b_fep_map->bind (fep_key, fep); @@ -1119,7 +1119,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, { AVStreams::FlowEndPoint_ptr fep_a = a_feps_entry->int_id_; AVStreams::FlowEndPoint_var connected_to = - fep_a->get_connected_fep (TAO_ENV_SINGLE_ARG_PARAMETER); + fep_a->get_connected_fep (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_connect); if (!CORBA::is_nil (connected_to.in ())) @@ -1136,7 +1136,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, AVStreams::FlowConnection_var flow_connection; AVStreams::FlowEndPoint_var connected_to = - fep_b->get_connected_fep (TAO_ENV_SINGLE_ARG_PARAMETER); + fep_b->get_connected_fep (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_connect); if (!CORBA::is_nil (connected_to.in ())) @@ -1146,7 +1146,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, } if (fep_a->is_fep_compatible (fep_b - TAO_ENV_ARG_PARAMETER) == 1) + ACE_ENV_ARG_PARAMETER) == 1) { ACE_TRY_CHECK_EX (flow_connect); // assume that flow names are same so that we @@ -1154,7 +1154,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, CORBA::Object_var flow_connection_obj; CORBA::Any_var flowname_any = fep_a->get_property_value ("Flow" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_connect); const char *flowname = 0; flowname_any.in () >>= flowname; @@ -1162,11 +1162,11 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, { flow_connection_obj = this->get_flow_connection (flowname - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_connection); flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_connection); } ACE_CATCHANY @@ -1175,11 +1175,11 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, ACE_NEW_RETURN (flowConnection, TAO_FlowConnection, 0); - flow_connection = flowConnection->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + flow_connection = flowConnection->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_connect); this->set_flow_connection (flowname, flow_connection.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_connect); } ACE_ENDTRY; @@ -1198,11 +1198,11 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, { producer = AVStreams::FlowProducer::_narrow (fep_a - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (producer_check); consumer = AVStreams::FlowConsumer::_narrow (fep_b - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (producer_check); // If the types don't match then try in @@ -1211,11 +1211,11 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, { producer = AVStreams::FlowProducer::_narrow (fep_b - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (producer_check); consumer = AVStreams::FlowConsumer::_narrow (fep_a - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (producer_check); } // At this point they should both be @@ -1234,12 +1234,12 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, ACE_CHECK_RETURN (0); CORBA::String_var fep_a_name, fep_b_name; flowname_any = fep_a->get_property_value ("FlowName" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); const char *temp_name; flowname_any.in () >>= temp_name; fep_a_name = CORBA::string_dup (temp_name); flowname_any = fep_b->get_property_value ("FlowName" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); flowname_any.in () >>= temp_name; fep_b_name = CORBA::string_dup (temp_name); AVStreams::QoS flow_qos; @@ -1258,7 +1258,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, flow_connection->connect (producer.in (), consumer.in (), flow_qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_connect); } } @@ -1280,7 +1280,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, this->sep_a_->connect (this->sep_b_.in (), stream_qos, flow_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_ENDTRY; @@ -1289,7 +1289,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, } void -TAO_StreamCtrl::unbind (TAO_ENV_SINGLE_ARG_DECL) +TAO_StreamCtrl::unbind (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed)) { @@ -1305,13 +1305,13 @@ TAO_StreamCtrl::unbind (TAO_ENV_SINGLE_ARG_DECL) MMDevice_Map::ENTRY *entry = 0; for (;a_iterator.next (entry)!= 0;a_iterator.advance ()) { - entry->int_id_.sep_->destroy (flow_spec TAO_ENV_ARG_PARAMETER); + entry->int_id_.sep_->destroy (flow_spec ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } MMDevice_Map_Iterator b_iterator (this->mmdevice_b_map_); for (;b_iterator.next (entry)!= 0;b_iterator.advance ()) { - entry->int_id_.sep_->destroy (flow_spec TAO_ENV_ARG_PARAMETER); + entry->int_id_.sep_->destroy (flow_spec ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -1327,7 +1327,7 @@ TAO_StreamCtrl::unbind (TAO_ENV_SINGLE_ARG_DECL) void TAO_StreamCtrl::unbind_party (AVStreams::StreamEndPoint_ptr /* the_ep */, const AVStreams::flowSpec &/* the_spec */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow)) @@ -1337,7 +1337,7 @@ TAO_StreamCtrl::unbind_party (AVStreams::StreamEndPoint_ptr /* the_ep */, void TAO_StreamCtrl::unbind_dev (AVStreams::MMDevice_ptr /* dev */, const AVStreams::flowSpec & /* the_spec */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow)) @@ -1347,7 +1347,7 @@ TAO_StreamCtrl::unbind_dev (AVStreams::MMDevice_ptr /* dev */, AVStreams::VDev_ptr TAO_StreamCtrl::get_related_vdev (AVStreams::MMDevice_ptr adev, AVStreams::StreamEndPoint_out sep - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed)) { @@ -1369,7 +1369,7 @@ CORBA::Boolean TAO_StreamCtrl::modify_QoS (AVStreams::streamQoS &new_qos, const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed)) @@ -1438,13 +1438,13 @@ TAO_StreamCtrl::modify_QoS (AVStreams::streamQoS &new_qos, if (in_flowspec.length () != 0) { - this->vdev_a_->modify_QoS (new_qos, in_flowspec TAO_ENV_ARG_PARAMETER); + this->vdev_a_->modify_QoS (new_qos, in_flowspec ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } if (out_flowspec.length () != 0) { - this->vdev_b_->modify_QoS (new_qos, out_flowspec TAO_ENV_ARG_PARAMETER); + this->vdev_b_->modify_QoS (new_qos, out_flowspec ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -1479,7 +1479,7 @@ CORBA::Boolean TAO_MCastConfigIf::set_peer (CORBA::Object_ptr peer, AVStreams::streamQoS & qos, const AVStreams::flowSpec & flow_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::QoSRequestFailed, AVStreams::streamOpFailed)) @@ -1490,7 +1490,7 @@ TAO_MCastConfigIf::set_peer (CORBA::Object_ptr peer, ACE_NEW_RETURN (info, Peer_Info, 0); - info->peer_ = AVStreams::VDev::_narrow (peer TAO_ENV_ARG_PARAMETER); + info->peer_ = AVStreams::VDev::_narrow (peer ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; info->qos_ = qos; info->flow_spec_ = flow_spec; @@ -1509,7 +1509,7 @@ TAO_MCastConfigIf::set_peer (CORBA::Object_ptr peer, // In future this should be a multicast message instead of point-to-point unicasts. void TAO_MCastConfigIf::configure (const CosPropertyService::Property & a_configuration - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Peer_Info *info; @@ -1519,7 +1519,7 @@ TAO_MCastConfigIf::configure (const CosPropertyService::Property & a_configurati (info = this->peer_list_iterator_.next ()) != 0; this->peer_list_iterator_.advance ()) { - info->peer_->configure (a_configuration TAO_ENV_ARG_PARAMETER); + info->peer_->configure (a_configuration ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -1535,7 +1535,7 @@ TAO_MCastConfigIf::configure (const CosPropertyService::Property & a_configurati void TAO_MCastConfigIf::set_initial_configuration (const CosPropertyService::Properties &initial - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->initial_configuration_ = initial; @@ -1545,7 +1545,7 @@ TAO_MCastConfigIf::set_initial_configuration (const CosPropertyService::Properti void TAO_MCastConfigIf::set_format (const char * flowName, const char * format_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported)) { @@ -1558,7 +1558,7 @@ TAO_MCastConfigIf::set_format (const char * flowName, { if (this->in_flowSpec (info->flow_spec_, flowName)) { - info->peer_->set_format (flowName, format_name TAO_ENV_ARG_PARAMETER); + info->peer_->set_format (flowName, format_name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -1576,7 +1576,7 @@ TAO_MCastConfigIf::set_format (const char * flowName, void TAO_MCastConfigIf::set_dev_params (const char * flowName, const CosPropertyService::Properties & new_params - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::PropertyException, AVStreams::streamOpFailed)) @@ -1591,7 +1591,7 @@ TAO_MCastConfigIf::set_dev_params (const char * flowName, { if (this->in_flowSpec (info->flow_spec_, flowName)) { - info->peer_->set_dev_params (flowName, new_params TAO_ENV_ARG_PARAMETER); + info->peer_->set_dev_params (flowName, new_params ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -1650,21 +1650,21 @@ TAO_Base_StreamEndPoint::handle_open (void) int TAO_Base_StreamEndPoint::handle_stop (const AVStreams::flowSpec & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return 0; } int TAO_Base_StreamEndPoint::handle_start (const AVStreams::flowSpec & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return 0; } int TAO_Base_StreamEndPoint::handle_destroy (const AVStreams::flowSpec & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return 0; } @@ -1686,7 +1686,7 @@ TAO_Base_StreamEndPoint::handle_postconnect (AVStreams::flowSpec &) // The following function is for backward compatibility. CORBA::Boolean TAO_Base_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return 1; } @@ -1758,7 +1758,7 @@ CORBA::Boolean TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder, AVStreams::streamQoS &qos, const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed, @@ -1784,7 +1784,7 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder, CORBA::Boolean result = this->negotiator_->negotiate (peer_negotiator, qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (negotiate); if (!result) if (TAO_debug_level > 0) @@ -1805,7 +1805,7 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder, { // choose protocols based on what the remote endpoint can support. CORBA::Any_var protocols_any = - responder->get_property_value ("AvailableProtocols" TAO_ENV_ARG_PARAMETER); + responder->get_property_value ("AvailableProtocols" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (available_protocols); AVStreams::protocolSpec peer_protocols; AVStreams::protocolSpec *temp_protocols; @@ -1884,14 +1884,14 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder, ACE_ERROR_RETURN ((LM_ERROR, "%N:%l TAO_AV_Core::init_forward_flows failed\n"), 0); - AVStreams::StreamEndPoint_var streamendpoint = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + AVStreams::StreamEndPoint_var streamendpoint = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; retv = responder->request_connection (streamendpoint.in (), 0, network_qos, flow_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (TAO_debug_level > 0) @@ -1959,12 +1959,12 @@ TAO_StreamEndPoint::translate_qos (const AVStreams::streamQoS& application_qos, void TAO_StreamEndPoint::stop (const AVStreams::flowSpec &flow_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)) { // Make the upcall into the app - this->handle_stop (flow_spec TAO_ENV_ARG_PARAMETER); + this->handle_stop (flow_spec ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (flow_spec.length () > 0) @@ -2007,13 +2007,13 @@ TAO_StreamEndPoint::stop (const AVStreams::flowSpec &flow_spec // Empty the_spec --> apply to all flows void TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::start\n")); // Make the upcall into the app - this->handle_start (flow_spec TAO_ENV_ARG_PARAMETER); + this->handle_start (flow_spec ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (flow_spec.length () > 0) @@ -2098,12 +2098,12 @@ TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec // Close the connection void TAO_StreamEndPoint::destroy (const AVStreams::flowSpec &flow_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)) { CORBA::Any_var vdev_any = this->get_property_value ("Related_VDev" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); CORBA::Any_var mc_str_any; CORBA::Object_var mc_obj; AVStreams::VDev_ptr vdev; @@ -2112,10 +2112,10 @@ TAO_StreamEndPoint::destroy (const AVStreams::flowSpec &flow_spec const char *media_ctrl_str; vdev_any.in() >>= vdev; mc_str_any = vdev->get_property_value ("Related_MediaCtrl" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); mc_str_any.in() >>= media_ctrl_str; mc_obj = TAO_AV_CORE::instance()->orb()->string_to_object (media_ctrl_str - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); media_ctrl = Null_MediaCtrl::_narrow (mc_obj.in()); // deactivate the associated vdev and media ctrl @@ -2210,7 +2210,7 @@ TAO_StreamEndPoint::destroy (const AVStreams::flowSpec &flow_spec } // Make the upcall into the app - // this->handle_destroy (the_spec TAO_ENV_ARG_PARAMETER); + // this->handle_destroy (the_spec ACE_ENV_ARG_PARAMETER); // } @@ -2221,7 +2221,7 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato CORBA::Boolean /*is_mcast*/, AVStreams::streamQoS &qos, AVStreams::flowSpec &flow_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpDenied, AVStreams::noSuchFlow, @@ -2293,7 +2293,7 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato return 0; // Make the upcall to the app - result = this->handle_connection_requested (flow_spec TAO_ENV_ARG_PARAMETER); + result = this->handle_connection_requested (flow_spec ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2310,7 +2310,7 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato int TAO_StreamEndPoint::change_qos (AVStreams::streamQoS &new_qos, const AVStreams::flowSpec &the_flows - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -2347,7 +2347,7 @@ TAO_StreamEndPoint::change_qos (AVStreams::streamQoS &new_qos, CORBA::Boolean TAO_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos, const AVStreams::flowSpec &the_flows - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed)) @@ -2356,7 +2356,7 @@ TAO_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos, ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::modify_QoS\n")); - int result = this->change_qos (new_qos, the_flows TAO_ENV_ARG_PARAMETER); + int result = this->change_qos (new_qos, the_flows ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (result != 0) @@ -2370,7 +2370,7 @@ TAO_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos, CORBA::Boolean TAO_StreamEndPoint::set_protocol_restriction (const AVStreams::protocolSpec &protocols - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY @@ -2380,7 +2380,7 @@ TAO_StreamEndPoint::set_protocol_restriction (const AVStreams::protocolSpec &pro protocol_restriction_any <<= protocols; this->define_property ("ProtocolRestriction", protocol_restriction_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->protocols_ = protocols; } @@ -2397,7 +2397,7 @@ TAO_StreamEndPoint::set_protocol_restriction (const AVStreams::protocolSpec &pro void TAO_StreamEndPoint::disconnect (const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::streamOpFailed)) @@ -2411,7 +2411,7 @@ void TAO_StreamEndPoint::set_FPStatus (const AVStreams::flowSpec &/*the_spec*/, const char *fp_name, const CORBA::Any &fp_settings - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::FPError)) @@ -2425,7 +2425,7 @@ TAO_StreamEndPoint::set_FPStatus (const AVStreams::flowSpec &/*the_spec*/, CORBA::Object_ptr TAO_StreamEndPoint::get_fep (const char *flow_name - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::noSuchFlow)) @@ -2439,7 +2439,7 @@ TAO_StreamEndPoint::get_fep (const char *flow_name char* TAO_StreamEndPoint::add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::streamOpFailed)) @@ -2461,7 +2461,7 @@ TAO_StreamEndPoint::add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep flowname_any <<= flow_name.in (); fep->define_property ("Flow", flowname_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2476,7 +2476,7 @@ TAO_StreamEndPoint::add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep char* TAO_StreamEndPoint::add_fep_i (AVStreams::FlowEndPoint_ptr fep - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::streamOpFailed)) @@ -2485,7 +2485,7 @@ TAO_StreamEndPoint::add_fep_i (AVStreams::FlowEndPoint_ptr fep ACE_TRY { CORBA::Any_var flow_name_any = - fep->get_property_value ("FlowName" TAO_ENV_ARG_PARAMETER); + fep->get_property_value ("FlowName" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; const char *tmp; @@ -2495,7 +2495,7 @@ TAO_StreamEndPoint::add_fep_i (AVStreams::FlowEndPoint_ptr fep ACE_CATCHANY { flow_name = - this->add_fep_i_add_property (fep TAO_ENV_ARG_PARAMETER); + this->add_fep_i_add_property (fep ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } ACE_ENDTRY; @@ -2504,22 +2504,22 @@ TAO_StreamEndPoint::add_fep_i (AVStreams::FlowEndPoint_ptr fep char * TAO_StreamEndPoint::add_fep (CORBA::Object_ptr fep_obj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::streamOpFailed)) { AVStreams::FlowEndPoint_var fep = - AVStreams::FlowEndPoint::_narrow (fep_obj TAO_ENV_ARG_PARAMETER); + AVStreams::FlowEndPoint::_narrow (fep_obj ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::String_var flow_name = - this->add_fep_i (fep.in () TAO_ENV_ARG_PARAMETER); + this->add_fep_i (fep.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_TRY { - fep->lock (TAO_ENV_SINGLE_ARG_PARAMETER); + fep->lock (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Add it to the sequence of flowNames supported. // put the flowname and the flowendpoint in a hashtable. @@ -2537,7 +2537,7 @@ TAO_StreamEndPoint::add_fep (CORBA::Object_ptr fep_obj flows_any <<= this->flows_; this->define_property ("Flows", flows_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2552,7 +2552,7 @@ TAO_StreamEndPoint::add_fep (CORBA::Object_ptr fep_obj void TAO_StreamEndPoint::remove_fep (const char *flow_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::streamOpFailed)) @@ -2575,7 +2575,7 @@ TAO_StreamEndPoint::remove_fep (const char *flow_name this->flows_ = new_flows; this->define_property ("Flows", flows - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2589,7 +2589,7 @@ TAO_StreamEndPoint::remove_fep (const char *flow_name // Sets the negotiator object. void TAO_StreamEndPoint::set_negotiator (AVStreams::Negotiator_ptr new_negotiator - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY @@ -2598,7 +2598,7 @@ TAO_StreamEndPoint::set_negotiator (AVStreams::Negotiator_ptr new_negotiator negotiator <<= new_negotiator; this->define_property ("Negotiator", negotiator - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->negotiator_ = AVStreams::Negotiator::_duplicate (new_negotiator); } @@ -2615,7 +2615,7 @@ TAO_StreamEndPoint::set_negotiator (AVStreams::Negotiator_ptr new_negotiator void TAO_StreamEndPoint::set_key (const char *flow_name, const AVStreams::key & the_key - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY @@ -2627,7 +2627,7 @@ TAO_StreamEndPoint::set_key (const char *flow_name, ACE_OS::sprintf (PublicKey_property, "%s_PublicKey", flow_name); this->define_property (PublicKey_property, PublicKey - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2641,7 +2641,7 @@ TAO_StreamEndPoint::set_key (const char *flow_name, // Set the source id. void TAO_StreamEndPoint::set_source_id (CORBA::Long source_id - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->source_id_ = source_id; @@ -2650,7 +2650,7 @@ TAO_StreamEndPoint::set_source_id (CORBA::Long source_id CORBA::Boolean TAO_StreamEndPoint::multiconnect (AVStreams::streamQoS &/*the_qos*/, AVStreams::flowSpec &/*flow_spec*/ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::multiconnect\n")); @@ -2701,7 +2701,7 @@ TAO_StreamEndPoint_A::TAO_StreamEndPoint_A (void) CORBA::Boolean TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos, AVStreams::flowSpec &flow_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed, @@ -2738,7 +2738,7 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos, if (result < 0) if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "QoS not found for %s", forward_entry->flowname ())); // Narrow it to FlowProducer. - AVStreams::FlowProducer_var producer = AVStreams::FlowProducer::_narrow (flow_endpoint TAO_ENV_ARG_PARAMETER); + AVStreams::FlowProducer_var producer = AVStreams::FlowProducer::_narrow (flow_endpoint ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (narrow); // Else narrow succeeeded. if (!CORBA::is_nil (producer.in ())) @@ -2750,7 +2750,7 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos, { CORBA::Any_var streamctrl_any; streamctrl_any = this->get_property_value ("Related_StreamCtrl" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AVStreams::StreamCtrl_ptr streamctrl; streamctrl_any.in () >>= streamctrl; @@ -2759,10 +2759,10 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos, CORBA::Object_var flow_connection_obj = this->streamctrl_->get_flow_connection (forward_entry->flowname () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_connection); flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_connection); } ACE_CATCHANY @@ -2775,11 +2775,11 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos, flowConnection->set_mcast_addr (this->mcast_addr_, this->mcast_port_); this->mcast_port_++; flowConnection->set_protocol (forward_entry->carrier_protocol_str ()); - flow_connection = flowConnection->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + flow_connection = flowConnection->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->streamctrl_->set_flow_connection (forward_entry->flowname (), flow_connection.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_ENDTRY; @@ -2789,12 +2789,12 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos, CORBA::Any fp_settings; flow_connection->use_flow_protocol (forward_entry->flow_protocol_str (), fp_settings - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } result = flow_connection->add_producer (producer.in (), flow_qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == 0) ACE_ERROR_RETURN ((LM_ERROR, "TAO_StreamEndPoint_A::multiconnect: add_producer failed\n"), 0); @@ -2894,7 +2894,7 @@ CORBA::Boolean TAO_StreamEndPoint_A::connect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep */, AVStreams::streamQoS & /* the_qos */, const AVStreams::flowSpec & /* the_flows */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -2908,7 +2908,7 @@ TAO_StreamEndPoint_A::connect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep */ void TAO_StreamEndPoint_A::disconnect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep */, const AVStreams::flowSpec & /* theSpec */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, @@ -2937,7 +2937,7 @@ TAO_StreamEndPoint_B::TAO_StreamEndPoint_B (void) CORBA::Boolean TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos, AVStreams::flowSpec &flow_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -2963,7 +2963,7 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos, AVStreams::FlowConsumer_var consumer; ACE_TRY_EX (narrow) { - consumer = AVStreams::FlowConsumer::_narrow (flow_endpoint.in () TAO_ENV_ARG_PARAMETER); + consumer = AVStreams::FlowConsumer::_narrow (flow_endpoint.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (narrow); } ACE_CATCHANY @@ -2984,7 +2984,7 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos, { CORBA::Any_var streamctrl_any; streamctrl_any = this->get_property_value ("Related_StreamCtrl" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AVStreams::StreamCtrl_ptr streamctrl; streamctrl_any.in () >>= streamctrl; @@ -2992,10 +2992,10 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos, } CORBA::Object_var flow_connection_obj = this->streamctrl_->get_flow_connection (forward_entry->flowname () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_connection); flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_connection); } ACE_CATCHANY @@ -3007,7 +3007,7 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos, ACE_CHECK_RETURN (0); result = flow_connection->add_consumer (consumer.in (), flow_qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == 0) ACE_ERROR_RETURN ((LM_ERROR, "TAO_StreamEndPoint_B::multiconnect:add_consumer failed\n"), 0); @@ -3089,7 +3089,7 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl, AVStreams::VDev_ptr the_peer_dev, AVStreams::streamQoS &the_qos, const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed, @@ -3105,7 +3105,7 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl, ACE_DEBUG ((LM_DEBUG, "(%P|%t) TAO_VDev::set_peer: called")); CORBA::String_var ior = TAO_ORB_Core_instance ()->orb ()->object_to_string (the_peer_dev - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -3117,7 +3117,7 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl, anyval <<= ior.in (); this->define_property ("Related_VDev", anyval - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -3127,7 +3127,7 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl, CORBA::Any_var anyptr; const char *media_ctrl_ior; anyptr = this->peer_->get_property_value ("Related_MediaCtrl" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; anyptr.in () >>= media_ctrl_ior; @@ -3136,10 +3136,10 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl, media_ctrl_ior)); CORBA::Object_ptr media_ctrl_obj = TAO_ORB_Core_instance ()->orb ()->string_to_object - (media_ctrl_ior TAO_ENV_ARG_PARAMETER); + (media_ctrl_ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - result = this->set_media_ctrl (media_ctrl_obj TAO_ENV_ARG_PARAMETER); + result = this->set_media_ctrl (media_ctrl_obj ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3154,7 +3154,7 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl, CORBA::Boolean TAO_VDev::set_media_ctrl (CORBA::Object_ptr media_ctrl - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // ACE_UNUSED_ARG (media_ctrl); @@ -3175,7 +3175,7 @@ TAO_VDev::set_Mcast_peer (AVStreams::StreamCtrl_ptr /* the_ctrl */, AVStreams::MCastConfigIf_ptr mcast_peer, AVStreams::streamQoS &/* the_qos */, const AVStreams::flowSpec &/* the_spec */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed, @@ -3188,7 +3188,7 @@ TAO_VDev::set_Mcast_peer (AVStreams::StreamCtrl_ptr /* the_ctrl */, // applications should override this to handle configuration changes. void TAO_VDev::configure (const CosPropertyService::Property &/*the_config_mesg*/ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::PropertyException, AVStreams::streamOpFailed)) @@ -3199,7 +3199,7 @@ TAO_VDev::configure (const CosPropertyService::Property &/*the_config_mesg*/ void TAO_VDev::set_format (const char *flowName, const char *format_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported)) { @@ -3213,7 +3213,7 @@ TAO_VDev::set_format (const char *flowName, format <<= format_name; this->define_property (format_property, format - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3230,7 +3230,7 @@ TAO_VDev::set_format (const char *flowName, void TAO_VDev::set_dev_params (const char *flowName, const CosPropertyService::Properties &new_params - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::PropertyException, AVStreams::streamOpFailed)) @@ -3245,7 +3245,7 @@ TAO_VDev::set_dev_params (const char *flowName, devParams <<= new_params; this->define_property (devParams_property, devParams - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3262,7 +3262,7 @@ TAO_VDev::set_dev_params (const char *flowName, CORBA::Boolean TAO_VDev::modify_QoS (AVStreams::streamQoS &the_qos, const AVStreams::flowSpec &flowspec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed)) @@ -3282,13 +3282,13 @@ TAO_VDev::modify_QoS (AVStreams::streamQoS &the_qos, CORBA::Any_ptr streamendpoint_a_any = this->get_property_value ("Related_StreamEndpoint" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); *streamendpoint_a_any >>= sep_a; if (sep_a != 0) { - sep_a->modify_QoS (the_qos, flowspec TAO_ENV_ARG_PARAMETER); + sep_a->modify_QoS (the_qos, flowspec ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } else ACE_DEBUG ((LM_DEBUG, @@ -3300,10 +3300,10 @@ TAO_VDev::modify_QoS (AVStreams::streamQoS &the_qos, CORBA::Any_ptr streamendpoint_b_any = this->get_property_value ("Related_StreamEndpoint" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); *streamendpoint_b_any >>= sep_b; - sep_b->modify_QoS (the_qos, flowspec TAO_ENV_ARG_PARAMETER); + sep_b->modify_QoS (the_qos, flowspec ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } } @@ -3334,7 +3334,7 @@ TAO_MMDevice::bind (AVStreams::MMDevice_ptr peer_device, AVStreams::streamQoS &the_qos, CORBA::Boolean_out is_met, const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -3347,15 +3347,15 @@ TAO_MMDevice::bind (AVStreams::MMDevice_ptr peer_device, ACE_NEW_RETURN (this->stream_ctrl_, TAO_StreamCtrl, 0); - AVStreams::MMDevice_var mmdevice = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + AVStreams::MMDevice_var mmdevice = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->stream_ctrl_->bind_devs (peer_device, mmdevice.in (), the_qos, the_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - streamctrl = this->stream_ctrl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + streamctrl = this->stream_ctrl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3374,7 +3374,7 @@ TAO_MMDevice::bind_mcast (AVStreams::MMDevice_ptr first_peer, AVStreams::streamQoS &the_qos, CORBA::Boolean_out is_met, const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -3397,7 +3397,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type, CORBA::Boolean_out met_qos, char *&/*named_vdev*/, const AVStreams::flowSpec &flow_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { AVStreams::StreamEndPoint_A_ptr sep_a (AVStreams::StreamEndPoint_A::_nil ()); AVStreams::StreamEndPoint_B_ptr sep_b (AVStreams::StreamEndPoint_B::_nil ()); @@ -3410,7 +3410,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type, { if (this->endpoint_strategy_->create_A (sep_a, the_vdev - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, "TAO_MMDevice::create_A_B (%P|%t) - " "error in create_A\n"), @@ -3422,7 +3422,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type, { if (this->endpoint_strategy_->create_B (sep_b, the_vdev - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, "TAO_MMDevice::create_A_B (%P|%t) - " "error in create_B\n"), @@ -3451,12 +3451,12 @@ TAO_MMDevice::create_A_B (MMDevice_Type type, { // Get the flowconnection for this flow. CORBA::Object_var flowconnection_obj = - streamctrl->get_flow_connection (forward_entry.flowname () TAO_ENV_ARG_PARAMETER); + streamctrl->get_flow_connection (forward_entry.flowname () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flowconnection); if (!CORBA::is_nil (flowconnection_obj.in ())) { flowconnection = AVStreams::FlowConnection::_narrow (flowconnection_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flowconnection); } } @@ -3494,7 +3494,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type, flow_qos, met_qos, named_fdev.inout () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } break; case MMDEVICE_B: @@ -3504,7 +3504,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type, flow_qos, met_qos, named_fdev.inout () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } break; } @@ -3525,7 +3525,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type, flow_qos, met_qos, named_fdev.inout () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } break; case MMDEVICE_B: @@ -3538,7 +3538,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type, flow_qos, met_qos, named_fdev.inout () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } break; } @@ -3550,10 +3550,10 @@ TAO_MMDevice::create_A_B (MMDevice_Type type, } CORBA::Any flowname_any; flowname_any <<= forward_entry.flowname (); - flow_endpoint->define_property ("FlowName", flowname_any TAO_ENV_ARG_PARAMETER); + flow_endpoint->define_property ("FlowName", flowname_any ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; sep->add_fep (flow_endpoint.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -3575,7 +3575,7 @@ TAO_MMDevice::create_A (AVStreams::StreamCtrl_ptr streamctrl, CORBA::Boolean_out met_qos, char *&named_vdev, const AVStreams::flowSpec &flow_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::streamOpDenied, @@ -3584,16 +3584,16 @@ TAO_MMDevice::create_A (AVStreams::StreamCtrl_ptr streamctrl, AVStreams::noSuchFlow)) { CORBA::String_var str_ctrl_ior = - TAO_ORB_Core_instance ()->orb ()->object_to_string (streamctrl TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core_instance ()->orb ()->object_to_string (streamctrl ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); AVStreams::StreamEndPoint_A_ptr sep_a = 0; AVStreams::StreamEndPoint_var sep; ACE_TRY { - sep = this->create_A_B (MMDEVICE_A, streamctrl, the_vdev, stream_qos, met_qos, named_vdev, flow_spec TAO_ENV_ARG_PARAMETER); + sep = this->create_A_B (MMDEVICE_A, streamctrl, the_vdev, stream_qos, met_qos, named_vdev, flow_spec ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - sep_a = AVStreams::StreamEndPoint_A::_narrow (sep.in() TAO_ENV_ARG_PARAMETER); + sep_a = AVStreams::StreamEndPoint_A::_narrow (sep.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3614,7 +3614,7 @@ TAO_MMDevice::create_B (AVStreams::StreamCtrl_ptr streamctrl, CORBA::Boolean_out met_qos, char *&named_vdev, const AVStreams::flowSpec &flow_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::streamOpDenied, @@ -3627,9 +3627,9 @@ TAO_MMDevice::create_B (AVStreams::StreamCtrl_ptr streamctrl, ACE_TRY { - sep = this->create_A_B (MMDEVICE_B, streamctrl, the_vdev, stream_qos, met_qos, named_vdev, flow_spec TAO_ENV_ARG_PARAMETER); + sep = this->create_A_B (MMDEVICE_B, streamctrl, the_vdev, stream_qos, met_qos, named_vdev, flow_spec ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - sep_b = AVStreams::StreamEndPoint_B::_narrow (sep.in() TAO_ENV_ARG_PARAMETER); + sep_b = AVStreams::StreamEndPoint_B::_narrow (sep.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3647,7 +3647,7 @@ TAO_MMDevice::create_B (AVStreams::StreamCtrl_ptr streamctrl, void TAO_MMDevice::destroy (AVStreams::StreamEndPoint_ptr /* the_ep */, const char * /* vdev_name */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported)) { @@ -3661,7 +3661,7 @@ TAO_MMDevice::destroy (AVStreams::StreamEndPoint_ptr /* the_ep */, char * TAO_MMDevice::add_fdev_i (AVStreams::FDev_ptr fdev - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::streamOpFailed)) @@ -3679,7 +3679,7 @@ TAO_MMDevice::add_fdev_i (AVStreams::FDev_ptr fdev ACE_OS::sprintf (tmp, "flow%d", flow_num_++); CORBA::Any flowname_any; flowname_any <<= flow_name.in (); - fdev->define_property ("Flow", flowname_any TAO_ENV_ARG_PARAMETER); + fdev->define_property ("Flow", flowname_any ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3694,7 +3694,7 @@ TAO_MMDevice::add_fdev_i (AVStreams::FDev_ptr fdev // Adds the fdev object to the MMDevice. char * TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::streamOpFailed)) @@ -3704,14 +3704,14 @@ TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj ACE_TRY_EX (flow_name) { CORBA::Any_ptr flow_name_any; - fdev = AVStreams::FDev::_narrow (fdev_obj TAO_ENV_ARG_PARAMETER); + fdev = AVStreams::FDev::_narrow (fdev_obj ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_name); if (CORBA::is_nil (fdev.in ())) return 0; - flow_name_any = fdev->get_property_value ("Flow" TAO_ENV_ARG_PARAMETER); + flow_name_any = fdev->get_property_value ("Flow" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_name); const char *tmp; @@ -3721,7 +3721,7 @@ TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj ACE_CATCHANY { flow_name = - this->add_fdev_i (fdev.in () TAO_ENV_ARG_PARAMETER); + this->add_fdev_i (fdev.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } ACE_ENDTRY; @@ -3746,7 +3746,7 @@ TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj { this->define_property ("Flows", flows_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flows); } ACE_CATCHANY @@ -3762,7 +3762,7 @@ TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj // Gets the FDev object associated with this flow. CORBA::Object_ptr TAO_MMDevice::get_fdev (const char *flow_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::noSuchFlow)) @@ -3779,7 +3779,7 @@ TAO_MMDevice::get_fdev (const char *flow_name // Removes the fdev from this MMDevice. void TAO_MMDevice::remove_fdev (const char *flow_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::noSuchFlow, @@ -3806,7 +3806,7 @@ TAO_MMDevice::remove_fdev (const char *flow_name this->flows_ = new_flows; this->define_property ("Flows", flows - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3862,7 +3862,7 @@ TAO_FlowConnection::set_protocol (const char *protocol) // stop this flow. void -TAO_FlowConnection::stop (TAO_ENV_SINGLE_ARG_DECL) +TAO_FlowConnection::stop (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY @@ -3873,7 +3873,7 @@ TAO_FlowConnection::stop (TAO_ENV_SINGLE_ARG_DECL) this->flow_producer_set_.end (); producer_begin != producer_end; ++producer_begin) { - (*producer_begin)->stop (TAO_ENV_SINGLE_ARG_PARAMETER); + (*producer_begin)->stop (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } FlowConsumer_SetItor consumer_begin = this->flow_consumer_set_.begin @@ -3882,7 +3882,7 @@ TAO_FlowConnection::stop (TAO_ENV_SINGLE_ARG_DECL) this->flow_consumer_set_.end (); consumer_begin != consumer_end; ++consumer_begin) { - (*consumer_begin)->stop (TAO_ENV_SINGLE_ARG_PARAMETER); + (*consumer_begin)->stop (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -3897,7 +3897,7 @@ TAO_FlowConnection::stop (TAO_ENV_SINGLE_ARG_DECL) // start this flow. void -TAO_FlowConnection::start (TAO_ENV_SINGLE_ARG_DECL) +TAO_FlowConnection::start (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY @@ -3908,7 +3908,7 @@ TAO_FlowConnection::start (TAO_ENV_SINGLE_ARG_DECL) this->flow_consumer_set_.end (); consumer_begin != consumer_end; ++consumer_begin) { - (*consumer_begin)->start (TAO_ENV_SINGLE_ARG_PARAMETER); + (*consumer_begin)->start (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } FlowProducer_SetItor producer_begin = this->flow_producer_set_.begin @@ -3917,7 +3917,7 @@ TAO_FlowConnection::start (TAO_ENV_SINGLE_ARG_DECL) this->flow_producer_set_.end (); producer_begin != producer_end; ++producer_begin) { - (*producer_begin)->start (TAO_ENV_SINGLE_ARG_PARAMETER); + (*producer_begin)->start (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -3932,7 +3932,7 @@ TAO_FlowConnection::start (TAO_ENV_SINGLE_ARG_DECL) // destroy this flow. void -TAO_FlowConnection::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_FlowConnection::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY @@ -3943,7 +3943,7 @@ TAO_FlowConnection::destroy (TAO_ENV_SINGLE_ARG_DECL) this->flow_producer_set_.end (); producer_begin != producer_end; ++producer_begin) { - (*producer_begin)->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + (*producer_begin)->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } FlowConsumer_SetItor consumer_begin = this->flow_consumer_set_.begin @@ -3952,7 +3952,7 @@ TAO_FlowConnection::destroy (TAO_ENV_SINGLE_ARG_DECL) this->flow_consumer_set_.end (); consumer_begin != consumer_end; ++consumer_begin) { - (*consumer_begin)->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + (*consumer_begin)->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -3971,7 +3971,7 @@ TAO_FlowConnection::destroy (TAO_ENV_SINGLE_ARG_DECL) // modify the QoS for this flow. CORBA::Boolean TAO_FlowConnection::modify_QoS (AVStreams::QoS & new_qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::QoSRequestFailed)) { @@ -3984,7 +3984,7 @@ TAO_FlowConnection::modify_QoS (AVStreams::QoS & new_qos CORBA::Boolean TAO_FlowConnection::use_flow_protocol (const char * fp_name, const CORBA::Any & fp_settings - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::FPError, AVStreams::notSupported)) @@ -3998,7 +3998,7 @@ TAO_FlowConnection::use_flow_protocol (const char * fp_name, producer_begin != producer_end; ++producer_begin) { (*producer_begin)->use_flow_protocol - (fp_name, fp_settings TAO_ENV_ARG_PARAMETER); + (fp_name, fp_settings ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } FlowConsumer_SetItor consumer_begin = this->flow_consumer_set_.begin @@ -4008,7 +4008,7 @@ TAO_FlowConnection::use_flow_protocol (const char * fp_name, consumer_begin != consumer_end; ++consumer_begin) { (*consumer_begin)->use_flow_protocol - (fp_name, fp_settings TAO_ENV_ARG_PARAMETER); + (fp_name, fp_settings ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } return 1; @@ -4016,7 +4016,7 @@ TAO_FlowConnection::use_flow_protocol (const char * fp_name, void TAO_FlowConnection::push_event (const AVStreams::streamEvent & the_event - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_UNUSED_ARG (the_event); @@ -4026,7 +4026,7 @@ CORBA::Boolean TAO_FlowConnection::connect_devs (AVStreams::FDev_ptr a_party, AVStreams::FDev_ptr b_party, AVStreams::QoS & flow_qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::streamOpDenied, @@ -4035,7 +4035,7 @@ TAO_FlowConnection::connect_devs (AVStreams::FDev_ptr a_party, CORBA::Boolean result = 0; ACE_TRY { - AVStreams::FlowConnection_var flowconnection = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + AVStreams::FlowConnection_var flowconnection = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Boolean met_qos; CORBA::String_var named_fdev ((const char *)""); @@ -4044,19 +4044,19 @@ TAO_FlowConnection::connect_devs (AVStreams::FDev_ptr a_party, flow_qos, met_qos, named_fdev.inout () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AVStreams::FlowConsumer_var consumer = b_party->create_consumer (flowconnection.in (), flow_qos, met_qos, named_fdev.inout () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; result = this->connect (producer.in (), consumer.in (), flow_qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -4074,7 +4074,7 @@ CORBA::Boolean TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer, AVStreams::FlowConsumer_ptr consumer, AVStreams::QoS & the_qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::formatMismatch, AVStreams::FEPMismatch, @@ -4091,19 +4091,19 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer, this->flow_producer_set_.insert (flow_producer); this->flow_consumer_set_.insert (flow_consumer); AVStreams::FlowConnection_var flowconnection = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; flow_producer->set_peer (flowconnection.in (), flow_consumer, the_qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; flow_consumer->set_peer (flowconnection.in (), flow_producer, the_qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; char *consumer_address = @@ -4111,7 +4111,7 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer, 0, // false for is_mcast flow_producer, this->fp_name_.inout () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ACE_OS::strcmp (consumer_address, "") == 0) @@ -4121,12 +4121,12 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer, 0, // false for is_mcast flow_consumer, this->fp_name_.inout () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; flow_consumer->connect_to_peer (the_qos, consumer_address, this->fp_name_.inout () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // @@ Naga: We have to find means to set the reverse channel for the producer. // Its broken in the point-to_point case for UDP. @@ -4137,7 +4137,7 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer, flow_producer->connect_to_peer (the_qos, consumer_address, this->fp_name_.inout () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -4152,7 +4152,7 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer, CORBA::Boolean -TAO_FlowConnection::disconnect (TAO_ENV_SINGLE_ARG_DECL) +TAO_FlowConnection::disconnect (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_CHECK_RETURN (0); @@ -4162,7 +4162,7 @@ TAO_FlowConnection::disconnect (TAO_ENV_SINGLE_ARG_DECL) CORBA::Boolean TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer, AVStreams::QoS & the_qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::alreadyConnected, AVStreams::notSupported)) @@ -4181,7 +4181,7 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer, for (; begin != end; ++begin) { if ((*begin)->_is_equivalent (producer - TAO_ENV_ARG_PARAMETER)) + ACE_ENV_ARG_PARAMETER)) // producer exists in the set, a duplicate. ACE_ERROR_RETURN ((LM_WARNING, "TAO_FlowConnection::add_producer: producer already exists\n"), 1); } @@ -4216,7 +4216,7 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer, met_qos, mcast_address, this->fp_name_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->producer_address_.in () == 0) @@ -4239,15 +4239,15 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer, ACE_NEW_RETURN (this->mcastconfigif_i_, TAO_MCastConfigIf, 0); - this->mcastconfigif_ = this->mcastconfigif_i_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->mcastconfigif_ = this->mcastconfigif_i_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } - AVStreams::FlowConnection_var flowconnection = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + AVStreams::FlowConnection_var flowconnection = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; flow_producer->set_Mcast_peer (flowconnection.in (), this->mcastconfigif_.in (), the_qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -4263,7 +4263,7 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer, CORBA::Boolean TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer, AVStreams::QoS & the_qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::alreadyConnected)) { @@ -4276,7 +4276,7 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer, for (; begin != end; ++begin) { if ((*begin)->_is_equivalent (consumer - TAO_ENV_ARG_PARAMETER)) + ACE_ENV_ARG_PARAMETER)) // Consumer exists in the set, a duplicate. ACE_ERROR_RETURN ((LM_WARNING, "TAO_FlowConnection::add_Consumer: Consumer already exists\n"), 1); } @@ -4301,21 +4301,21 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer, if (!this->ip_multicast_) { flow_consumer->set_protocol_restriction (protocols - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; char * address = flow_consumer->go_to_listen (the_qos, 1, flow_producer, this->fp_name_.inout () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Boolean is_met; flow_producer->connect_mcast (the_qos, is_met, address, this->fp_name_.inout () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else @@ -4328,14 +4328,14 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer, flow_consumer->connect_to_peer (the_qos, this->producer_address_.in (), this->fp_name_.inout () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // char * address = // flow_consumer->go_to_listen (the_qos, // 1, // flow_producer, // this->fp_name_.inout () - // TAO_ENV_ARG_PARAMETER); + // ACE_ENV_ARG_PARAMETER); // ACE_TRY_CHECK; } @@ -4349,7 +4349,7 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer, this->mcastconfigif_->set_peer (flow_consumer, stream_qos, flow_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -4364,7 +4364,7 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer, CORBA::Boolean TAO_FlowConnection::drop (AVStreams::FlowEndPoint_ptr target - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notConnected)) { @@ -4405,17 +4405,17 @@ TAO_FlowEndPoint::open (const char *flowname, this->format_ = format; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_FlowEndPoint::open\n")); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::Any flowname_any; flowname_any <<= flowname; this->define_property ("Flow", flowname_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->set_format (format - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->protocol_addresses_ = protocols; AVStreams::protocolSpec protocol_spec (protocols.length ()); @@ -4429,7 +4429,7 @@ TAO_FlowEndPoint::open (const char *flowname, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "%s\n", protocol_spec[i].in ())); } this->set_protocol_restriction (protocol_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -4453,7 +4453,7 @@ TAO_FlowEndPoint::set_flowname (const char *flowname) // used by one flowconnection so that multiple connections cant use // the same flowendpoint. CORBA::Boolean -TAO_FlowEndPoint::lock (TAO_ENV_SINGLE_ARG_DECL) +TAO_FlowEndPoint::lock (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // lock the current flowendpoint @@ -4467,7 +4467,7 @@ TAO_FlowEndPoint::lock (TAO_ENV_SINGLE_ARG_DECL) // unlocks the flowendpoint , becomes free to be used in another flow. void -TAO_FlowEndPoint::unlock (TAO_ENV_SINGLE_ARG_DECL) +TAO_FlowEndPoint::unlock (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_CHECK; @@ -4477,7 +4477,7 @@ TAO_FlowEndPoint::unlock (TAO_ENV_SINGLE_ARG_DECL) void -TAO_FlowEndPoint::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_FlowEndPoint::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { int result = TAO_AV_Core::deactivate_servant (this); @@ -4490,7 +4490,7 @@ TAO_FlowEndPoint::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } AVStreams::StreamEndPoint_ptr -TAO_FlowEndPoint::related_sep (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_FlowEndPoint::related_sep (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -4499,14 +4499,14 @@ TAO_FlowEndPoint::related_sep (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_FlowEndPoint::related_sep (AVStreams::StreamEndPoint_ptr related_sep - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->related_sep_ = AVStreams::StreamEndPoint::_duplicate (related_sep); } AVStreams::FlowConnection_ptr -TAO_FlowEndPoint::related_flow_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_FlowEndPoint::related_flow_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return AVStreams::FlowConnection::_duplicate (this->related_flow_connection_.in ()); @@ -4514,7 +4514,7 @@ TAO_FlowEndPoint::related_flow_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_FlowEndPoint::related_flow_connection (AVStreams::FlowConnection_ptr related_flow_connection - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_CHECK; @@ -4524,7 +4524,7 @@ TAO_FlowEndPoint::related_flow_connection (AVStreams::FlowConnection_ptr related // returns the connected peer for this flow AVStreams::FlowEndPoint_ptr -TAO_FlowEndPoint::get_connected_fep (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_FlowEndPoint::get_connected_fep (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notConnected, AVStreams::notSupported)) @@ -4535,7 +4535,7 @@ TAO_FlowEndPoint::get_connected_fep (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) CORBA::Boolean TAO_FlowEndPoint::use_flow_protocol (const char * fp_name, const CORBA::Any & - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::FPError, AVStreams::notSupported)) @@ -4547,7 +4547,7 @@ TAO_FlowEndPoint::use_flow_protocol (const char * fp_name, flowname_property <<= fp_name; this->define_property ("FlowProtocol", flowname_property - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -4562,7 +4562,7 @@ TAO_FlowEndPoint::use_flow_protocol (const char * fp_name, void TAO_FlowEndPoint::set_format (const char * format - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported)) { @@ -4575,7 +4575,7 @@ TAO_FlowEndPoint::set_format (const char * format format_val <<= format; this->define_property ("Format", format_val - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -4588,7 +4588,7 @@ TAO_FlowEndPoint::set_format (const char * format void TAO_FlowEndPoint::set_dev_params (const CosPropertyService::Properties & new_settings - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::PropertyException, AVStreams::streamOpFailed)) @@ -4600,7 +4600,7 @@ TAO_FlowEndPoint::set_dev_params (const CosPropertyService::Properties & new_set DevParams_property <<= new_settings; this->define_property ("DevParams", DevParams_property - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -4613,7 +4613,7 @@ TAO_FlowEndPoint::set_dev_params (const CosPropertyService::Properties & new_set void TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & protocols - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported)) { @@ -4630,11 +4630,11 @@ TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & prot AvailableProtocols_property <<= protocols; this->define_property ("AvailableProtocols", AvailableProtocols_property - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AVStreams::protocolSpec *temp_spec; CORBA::Any_var temp_any = this->get_property_value ("AvailableProtocols" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; temp_any.in () >>= temp_spec; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "%N:%l\n")); @@ -4655,7 +4655,7 @@ TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & prot CORBA::Boolean TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::formatMismatch, AVStreams::deviceQosMismatch)) @@ -4671,7 +4671,7 @@ TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep exception_message = "TAO_FlowEndPoint::is_fep_compatible - Format"; format_ptr = this->get_property_value ("Format" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; const char *temp_format; @@ -4680,7 +4680,7 @@ TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep // get my peer's format value exception_message = "TAO_FlowEndPoint::is_fep_compatible - Format[2]"; format_ptr = peer_fep->get_property_value ("Format" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; format_ptr.in () >>= temp_format; peer_format = CORBA::string_dup (temp_format); @@ -4696,7 +4696,7 @@ TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep exception_message = "TAO_FlowEndPoint::is_fep_compatible - AvailableProtocols"; AvailableProtocols_ptr = this->get_property_value ("AvailableProtocols" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AvailableProtocols_ptr.in () >>= temp_protocols; my_protocol_spec = *temp_protocols; @@ -4704,7 +4704,7 @@ TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep exception_message = "TAO_FlowEndPoint::is_fep_compatible - AvailableProtocols[2]"; AvailableProtocols_ptr = peer_fep->get_property_value ("AvailableProtocols" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AvailableProtocols_ptr.in () >>= temp_protocols; peer_protocol_spec = *temp_protocols; @@ -4750,7 +4750,7 @@ CORBA::Boolean TAO_FlowEndPoint::set_peer (AVStreams::FlowConnection_ptr /* the_fc */, AVStreams::FlowEndPoint_ptr the_peer_fep, AVStreams::QoS & /* the_qos */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::QoSRequestFailed, AVStreams::streamOpFailed)) @@ -4764,7 +4764,7 @@ CORBA::Boolean TAO_FlowEndPoint::set_Mcast_peer (AVStreams::FlowConnection_ptr /* the_fc */, AVStreams::MCastConfigIf_ptr mcast_peer, AVStreams::QoS & /* the_qos */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::QoSRequestFailed)) { @@ -4778,7 +4778,7 @@ TAO_FlowEndPoint::go_to_listen_i (TAO_FlowSpec_Entry::Role role, CORBA::Boolean /*is_mcast*/, AVStreams::FlowEndPoint_ptr peer_fep, char *& flowProtocol - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToListen, AVStreams::FPError, @@ -4800,13 +4800,13 @@ TAO_FlowEndPoint::go_to_listen_i (TAO_FlowSpec_Entry::Role role, AVStreams::protocolSpec *temp_protocols; CORBA::Any_var AvailableProtocols_ptr = peer_fep->get_property_value ("AvailableProtocols" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); AvailableProtocols_ptr.in () >>= temp_protocols; peer_protocol_spec = *temp_protocols; AvailableProtocols_ptr = this->get_property_value ("AvailableProtocols" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); AvailableProtocols_ptr.in () >>= temp_protocols; my_protocol_spec = *temp_protocols; @@ -4871,7 +4871,7 @@ TAO_FlowEndPoint::connect_to_peer_i (TAO_FlowSpec_Entry::Role role, AVStreams::QoS & /*the_qos*/, const char * address, const char * use_flow_protocol - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToConnect, AVStreams::FPError, @@ -4935,7 +4935,7 @@ TAO_FlowProducer::TAO_FlowProducer (const char *flowname, // gets the reverse channel for feedback. char * TAO_FlowProducer::get_rev_channel (const char * /*pcol_name*/ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; @@ -4943,7 +4943,7 @@ TAO_FlowProducer::get_rev_channel (const char * /*pcol_name*/ // The start, stop and destroy are to be handled by the application. void -TAO_FlowProducer::stop (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_FlowProducer::stop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end (); @@ -4956,7 +4956,7 @@ TAO_FlowProducer::stop (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } void -TAO_FlowProducer::start (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_FlowProducer::start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end (); @@ -4980,7 +4980,7 @@ TAO_FlowProducer::go_to_listen (AVStreams::QoS & the_qos, CORBA::Boolean is_mcast, AVStreams::FlowEndPoint_ptr peer_fep, char *& flowProtocol - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToListen, AVStreams::FPError, @@ -4991,14 +4991,14 @@ TAO_FlowProducer::go_to_listen (AVStreams::QoS & the_qos, is_mcast, peer_fep, flowProtocol - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Boolean TAO_FlowProducer::connect_to_peer (AVStreams::QoS & the_qos, const char * address, const char * use_flow_protocol - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToConnect, AVStreams::FPError, @@ -5008,7 +5008,7 @@ TAO_FlowProducer::connect_to_peer (AVStreams::QoS & the_qos, the_qos, address, use_flow_protocol - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } // Connect to a IP multicast address. char * @@ -5016,7 +5016,7 @@ TAO_FlowProducer::connect_mcast (AVStreams::QoS & /* the_qos */, CORBA::Boolean_out /* is_met */, const char *address, const char * use_flow_protocol - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToConnect, AVStreams::notSupported, @@ -5060,7 +5060,7 @@ TAO_FlowProducer::connect_mcast (AVStreams::QoS & /* the_qos */, // sets the key for this flow. void TAO_FlowProducer::set_key (const AVStreams::key & the_key - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY @@ -5069,7 +5069,7 @@ TAO_FlowProducer::set_key (const AVStreams::key & the_key anyval <<= the_key; this->define_property ("PublicKey", anyval - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -5083,7 +5083,7 @@ TAO_FlowProducer::set_key (const AVStreams::key & the_key // source id to be used to distinguish this source from others. void TAO_FlowProducer::set_source_id (CORBA::Long source_id - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->source_id_ = source_id; @@ -5108,7 +5108,7 @@ TAO_FlowConsumer::TAO_FlowConsumer (const char *flowname, // The start, stop and destroy are to be handled by the application. void -TAO_FlowConsumer::stop (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_FlowConsumer::stop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end (); @@ -5118,7 +5118,7 @@ TAO_FlowConsumer::stop (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } void -TAO_FlowConsumer::start (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_FlowConsumer::start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end (); @@ -5134,7 +5134,7 @@ TAO_FlowConsumer::go_to_listen (AVStreams::QoS & the_qos, CORBA::Boolean is_mcast, AVStreams::FlowEndPoint_ptr peer_fep, char *& flowProtocol - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToListen, AVStreams::FPError, @@ -5145,14 +5145,14 @@ TAO_FlowConsumer::go_to_listen (AVStreams::QoS & the_qos, is_mcast, peer_fep, flowProtocol - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Boolean TAO_FlowConsumer::connect_to_peer (AVStreams::QoS & the_qos, const char * address, const char * use_flow_protocol - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToConnect, AVStreams::FPError, @@ -5162,7 +5162,7 @@ TAO_FlowConsumer::connect_to_peer (AVStreams::QoS & the_qos, the_qos, address, use_flow_protocol - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } //------------------------------------------------------------ diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h index 80edd90fc01..95ab3009b5b 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h @@ -95,14 +95,14 @@ public: /// Stop the transfer of data of the stream /// Empty the_spec means apply operation to all flows virtual void stop (const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)); /// Start the transfer of data in the stream. /// Empty the_spec means apply operation to all flows virtual void start (const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)); @@ -112,7 +112,7 @@ public: * Empty the_spec means apply operation to all flows */ virtual void destroy (const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)); @@ -120,7 +120,7 @@ public: /// Empty the_spec means apply operation to all flows virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos, const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed)); @@ -128,14 +128,14 @@ public: /// Used by StreamEndPoint and VDev to inform StreamCtrl of events. /// E.g., loss of flow, reestablishment of flow, etc.. virtual void push_event (const struct CosPropertyService::Property & the_event - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Used to control the flow protocol parameters. virtual void set_FPStatus (const AVStreams::flowSpec &the_spec, const char *fp_name, const CORBA::Any &fp_settings - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::FPError)); @@ -143,7 +143,7 @@ public: /// Not implemented in the light profile, will raise the notsupported /// exception virtual CORBA::Object_ptr get_flow_connection (const char *flow_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::notSupported)); @@ -152,7 +152,7 @@ public: /// exception virtual void set_flow_connection (const char *flow_name, CORBA::Object_ptr flow_connection - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::notSupported)); @@ -186,7 +186,7 @@ class TAO_AV_Export TAO_Negotiator public: virtual CORBA::Boolean negotiate (AVStreams::Negotiator_ptr remote_negotiator, const AVStreams::streamQoS &qos_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; @@ -251,14 +251,14 @@ public: /// Stop the transfer of data of the stream /// Empty the_spec means apply operation to all flows virtual void stop (const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)); /// Start the transfer of data in the stream. /// Empty the_spec means apply operation to all flows virtual void start (const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)); @@ -268,7 +268,7 @@ public: * Empty the_spec means apply operation to all flows */ virtual void destroy (const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)); @@ -283,7 +283,7 @@ public: AVStreams::MMDevice_ptr b_party, AVStreams::streamQoS& the_qos, const AVStreams::flowSpec& the_flows - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -298,7 +298,7 @@ public: AVStreams::StreamEndPoint_B_ptr b_party, AVStreams::streamQoS &the_qos, const AVStreams::flowSpec &the_flows - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -306,7 +306,7 @@ public: virtual void unbind_dev (AVStreams::MMDevice_ptr dev, const AVStreams::flowSpec & the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow)); @@ -314,19 +314,19 @@ public: /// Unbind the_ep from the stream. Empty the_spec means apply to all flows. virtual void unbind_party (AVStreams::StreamEndPoint_ptr the_ep, const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow)); /// unbind the stream. Same effect as Basic_StreamCtrl::destroy () - virtual void unbind (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void unbind (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed)); virtual AVStreams::VDev_ptr get_related_vdev (AVStreams::MMDevice_ptr adev, AVStreams::StreamEndPoint_out sep - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed)); @@ -334,7 +334,7 @@ public: /// Empty the_spec means apply operation to all flows virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos, const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed)); @@ -386,28 +386,28 @@ public: virtual CORBA::Boolean set_peer (CORBA::Object_ptr peer, AVStreams::streamQoS & the_qos, const AVStreams::flowSpec & the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::QoSRequestFailed, AVStreams::streamOpFailed)); virtual void configure (const CosPropertyService::Property & a_configuration - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void set_initial_configuration (const CosPropertyService::Properties & initial - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void set_format (const char * flowName, const char * format_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported)); virtual void set_dev_params (const char * flowName, const CosPropertyService::Properties & new_params - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::PropertyException, @@ -494,15 +494,15 @@ public: /// Application needs to define this virtual int handle_stop (const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Application needs to define this virtual int handle_start (const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Application needs to define this virtual int handle_destroy (const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Application needs to define this virtual CORBA::Boolean handle_preconnect (AVStreams::flowSpec &the_spec); @@ -512,7 +512,7 @@ public: /// Application needs to define this virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual int get_callback (const char *flowname, TAO_AV_Callback *&callback); @@ -563,19 +563,19 @@ public: /// Stop the stream. Empty the_spec means, for all the flows virtual void stop (const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)); /// Start the stream, Empty the_spec means, for all the flows virtual void start (const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)); /// Destroy the stream, Empty the_spec means, for all the flows virtual void destroy (const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)); @@ -583,7 +583,7 @@ public: virtual CORBA::Boolean connect (AVStreams::StreamEndPoint_ptr responder, AVStreams::streamQoS& qos_spec, const AVStreams::flowSpec& the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed, @@ -595,7 +595,7 @@ public: CORBA::Boolean is_mcast, AVStreams::streamQoS &qos, AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpDenied, AVStreams::noSuchFlow, @@ -605,23 +605,23 @@ public: /// Change the transport qos on a stream virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos, const AVStreams::flowSpec &the_flows - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed)); virtual int change_qos (AVStreams::streamQoS &new_qos, const AVStreams::flowSpec &the_flows - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Used to restrict the set of protocols virtual CORBA::Boolean set_protocol_restriction (const AVStreams::protocolSpec &the_pspec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// disconnect the flows virtual void disconnect (const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::streamOpFailed)); @@ -630,46 +630,46 @@ public: virtual void set_FPStatus (const AVStreams::flowSpec &the_spec, const char *fp_name, const CORBA::Any &fp_settings - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::FPError)); /// Not implemented in the light profile, throws notsupported virtual CORBA::Object_ptr get_fep (const char *flow_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::noSuchFlow)); /// Not implemented in the light profile, throws notsupported virtual char * add_fep (CORBA::Object_ptr the_fep - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::streamOpFailed)); /// Not implemented in the light profile, throws notsupported virtual void remove_fep (const char *fep_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::streamOpFailed)); /// Used to "attach" a negotiator to the endpoint virtual void set_negotiator (AVStreams::Negotiator_ptr new_negotiator - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Used for public key encryption. virtual void set_key (const char *flow_name, const AVStreams::key & the_key - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Used to set a unique id for packets sent by this streamendpoint virtual void set_source_id (CORBA::Long source_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Destructor @@ -677,17 +677,17 @@ public: CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos, AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); protected: /// Helper methods to implement add_fep() char* add_fep_i (AVStreams::FlowEndPoint_ptr fep - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::streamOpFailed)); char* add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::streamOpFailed)); @@ -753,7 +753,7 @@ public: /// Used for ATM-style multicast virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos, AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed, @@ -763,7 +763,7 @@ public: virtual CORBA::Boolean connect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep, AVStreams::streamQoS &the_qos, const AVStreams::flowSpec &the_flows - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -773,7 +773,7 @@ public: /// Used to remove a multicast leaf virtual void disconnect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep, const AVStreams::flowSpec &theSpec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -806,7 +806,7 @@ public: /// Used for internet-style multicast virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos, AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -837,7 +837,7 @@ public: AVStreams::VDev_ptr the_peer_dev, AVStreams::streamQoS &the_qos, const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed, @@ -848,7 +848,7 @@ public: AVStreams::MCastConfigIf_ptr a_mcastconfigif, AVStreams::streamQoS &the_qos, const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed, @@ -856,7 +856,7 @@ public: /// Called by the peer VDev to configure the device (catch all) virtual void configure (const CosPropertyService::Property &the_config_mesg - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::PropertyException, AVStreams::streamOpFailed)); @@ -864,14 +864,14 @@ public: /// Used to set a format on a flowname virtual void set_format (const char *flowName, const char *format_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported)); /// Used to set device parameters virtual void set_dev_params (const char *flowName, const CosPropertyService::Properties &new_params - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::PropertyException, AVStreams::streamOpFailed)); @@ -879,7 +879,7 @@ public: /// Called to change QoS of the device virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &the_qos, const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed)); @@ -890,7 +890,7 @@ public: protected: /// hook called after set_peer is done to set the media ctrl of the peer vdev. virtual CORBA::Boolean set_media_ctrl (CORBA::Object_ptr media_ctrl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// My stream controller AVStreams::StreamCtrl_var streamctrl_; @@ -927,7 +927,7 @@ public: CORBA::Boolean_out met_qos, char *&named_vdev, const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Can be used to request the MMDevice to create a new StreamCtrl, /// and call bind_devs on it @@ -935,7 +935,7 @@ public: AVStreams::streamQoS &the_qos, CORBA::Boolean_out is_met, const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -946,7 +946,7 @@ public: AVStreams::streamQoS &the_qos, CORBA::Boolean_out is_met, const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -959,7 +959,7 @@ public: CORBA::Boolean_out met_qos, char *&named_vdev, const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::streamOpDenied, @@ -974,7 +974,7 @@ public: CORBA::Boolean_out met_qos, char *&named_vdev, const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::streamOpDenied, @@ -985,27 +985,27 @@ public: /// Remove the StreamEndPoint and the related vdev virtual void destroy (AVStreams::StreamEndPoint_ptr the_ep, const char *vdev_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported)); /// Not supported in the light profile, raises notsupported virtual char * add_fdev (CORBA::Object_ptr the_fdev - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::streamOpFailed)); /// Not supported in the light profile, raises notsupported virtual CORBA::Object_ptr get_fdev (const char *flow_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::noSuchFlow)); /// Not supported in the light profile, raises notsupported virtual void remove_fdev (const char *flow_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::noSuchFlow, @@ -1017,7 +1017,7 @@ public: protected: /// Helper method to implement add_fdev() char* add_fdev_i (AVStreams::FDev_ptr fdev - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::streamOpFailed)); @@ -1066,34 +1066,34 @@ public: TAO_FlowConnection (void); /// stop this flow. - virtual void stop (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void stop (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// start this flow. - virtual void start (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void start (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// destroy this flow. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// modify the QoS for this flow. virtual CORBA::Boolean modify_QoS (AVStreams::QoS & new_qos - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::QoSRequestFailed)); /// use the specified flow protocol for this flow. virtual CORBA::Boolean use_flow_protocol (const char * fp_name, const CORBA::Any & fp_settings - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::FPError, AVStreams::notSupported)); /// pushes an event , to be handled by the application. virtual void push_event (const AVStreams::streamEvent & the_event - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -1101,7 +1101,7 @@ public: virtual CORBA::Boolean connect_devs (AVStreams::FDev_ptr a_party, AVStreams::FDev_ptr b_party, AVStreams::QoS & the_qos - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::streamOpDenied, @@ -1111,20 +1111,20 @@ public: virtual CORBA::Boolean connect (AVStreams::FlowProducer_ptr flow_producer, AVStreams::FlowConsumer_ptr flow_consumer, AVStreams::QoS & the_qos - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::formatMismatch, AVStreams::FEPMismatch, AVStreams::alreadyConnected)); /// disconnect this flow connection. - virtual CORBA::Boolean disconnect (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Boolean disconnect (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// adds the producer to this flow connection. virtual CORBA::Boolean add_producer (AVStreams::FlowProducer_ptr flow_producer, AVStreams::QoS & the_qos - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::alreadyConnected, AVStreams::notSupported)); @@ -1132,13 +1132,13 @@ public: /// adds a consumer to this flow connection. virtual CORBA::Boolean add_consumer (AVStreams::FlowConsumer_ptr flow_consumer, AVStreams::QoS & the_qos - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::alreadyConnected)); /// drops a flow endpoint from the flow. virtual CORBA::Boolean drop (AVStreams::FlowEndPoint_ptr target - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notConnected)); @@ -1200,41 +1200,41 @@ public: TAO_AV_Protocol_Object *object); /// lock the flow endpoint for a particular flow. - virtual CORBA::Boolean lock (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Boolean lock (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// unlock the flow endpoint for subsequent use. - virtual void unlock (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void unlock (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// destroy this flow. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// get method for the related streamendpoint under which this /// flowendpoint is. - virtual AVStreams::StreamEndPoint_ptr related_sep(TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual AVStreams::StreamEndPoint_ptr related_sep(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// set method for the related streamendpoint under which this /// flowendpoint is. virtual void related_sep (AVStreams::StreamEndPoint_ptr related_sep - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual AVStreams::FlowConnection_ptr related_flow_connection(TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual AVStreams::FlowConnection_ptr related_flow_connection(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // accessor for the related flow connection attribute. /// set method for the related flow connection attribute. virtual void related_flow_connection (AVStreams::FlowConnection_ptr related_flow_connection - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// returns the other flowendpoint to which this is connected. - virtual AVStreams::FlowEndPoint_ptr get_connected_fep (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual AVStreams::FlowEndPoint_ptr get_connected_fep (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notConnected, AVStreams::notSupported)); @@ -1242,33 +1242,33 @@ public: //// use the specified flow protocol. virtual CORBA::Boolean use_flow_protocol (const char * fp_name, const CORBA::Any & fp_settings - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::FPError, AVStreams::notSupported)); /// sets the data format. virtual void set_format (const char * format - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported)); /// sets the device parameters. virtual void set_dev_params (const CosPropertyService::Properties & new_settings - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::PropertyException, AVStreams::streamOpFailed)); /// sets the list of protocols to be used. virtual void set_protocol_restriction (const AVStreams::protocolSpec & the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported)); /// checks whether the passed flowendpoint is compatible with this. virtual CORBA::Boolean is_fep_compatible (AVStreams::FlowEndPoint_ptr fep - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::formatMismatch, AVStreams::deviceQosMismatch)); @@ -1277,7 +1277,7 @@ public: virtual CORBA::Boolean set_peer (AVStreams::FlowConnection_ptr the_fc, AVStreams::FlowEndPoint_ptr the_peer_fep, AVStreams::QoS & the_qos - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::QoSRequestFailed, AVStreams::streamOpFailed)); @@ -1286,7 +1286,7 @@ public: virtual CORBA::Boolean set_Mcast_peer (AVStreams::FlowConnection_ptr the_fc, AVStreams::MCastConfigIf_ptr a_mcastconfigif, AVStreams::QoS & the_qos - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::QoSRequestFailed)); @@ -1299,7 +1299,7 @@ public: virtual CORBA::Boolean connect_to_peer (AVStreams::QoS & the_qos, const char * address, const char * use_flow_protocol - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToConnect, AVStreams::FPError, @@ -1310,7 +1310,7 @@ public: AVStreams::QoS & the_qos, const char * address, const char * use_flow_protocol - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToConnect, AVStreams::FPError, @@ -1325,7 +1325,7 @@ public: CORBA::Boolean is_mcast, AVStreams::FlowEndPoint_ptr peer, char *& flowProtocol - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToListen, AVStreams::FPError, @@ -1337,7 +1337,7 @@ public: CORBA::Boolean is_mcast, AVStreams::FlowEndPoint_ptr peer, char *& flowProtocol - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToListen, AVStreams::FPError, @@ -1394,22 +1394,22 @@ public: * know the reverse channel on its peer fep to send data to. */ virtual char * get_rev_channel (const char * pcol_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// stop this flow, to be overridden by the application. - virtual void stop (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void stop (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// start this flow, to be overridden by the application. - virtual void start (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void start (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * go_to_listen (AVStreams::QoS & the_qos, CORBA::Boolean is_mcast, AVStreams::FlowEndPoint_ptr peer, char *& flowProtocol - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToListen, AVStreams::FPError, @@ -1418,7 +1418,7 @@ public: virtual CORBA::Boolean connect_to_peer (AVStreams::QoS & the_qos, const char * address, const char * use_flow_protocol - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToConnect, AVStreams::FPError, @@ -1429,7 +1429,7 @@ public: CORBA::Boolean_out is_met, const char * address, const char * use_flow_protocol - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToConnect, AVStreams::notSupported, @@ -1440,13 +1440,13 @@ public: /// sets the public key to be used for encryption of the data. virtual void set_key (const AVStreams::key & the_key - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// sets the source id of this flow producer so that it can be used /// to distinguish this producer from others in the multicast case. virtual void set_source_id (CORBA::Long source_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); protected: @@ -1469,18 +1469,18 @@ public: const char *format); /// stop this flow, to be overridden by the application. - virtual void stop (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void stop (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// start this flow, to be overridden by the application. - virtual void start (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void start (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * go_to_listen (AVStreams::QoS & the_qos, CORBA::Boolean is_mcast, AVStreams::FlowEndPoint_ptr peer, char *& flowProtocol - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToListen, AVStreams::FPError, @@ -1489,7 +1489,7 @@ public: virtual CORBA::Boolean connect_to_peer (AVStreams::QoS & the_qos, const char * address, const char * use_flow_protocol - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToConnect, AVStreams::FPError, @@ -1513,33 +1513,33 @@ public: virtual AVStreams::Position get_media_position (AVStreams::PositionOrigin an_origin, AVStreams::PositionKey a_key - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::MediaControl::PostionKeyNotSupported)) =0; virtual void set_media_position (const AVStreams::Position & a_position - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::MediaControl::PostionKeyNotSupported, AVStreams::InvalidPosition)) =0; virtual void start (const AVStreams::Position & a_position - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::InvalidPosition)) =0; virtual void pause (const AVStreams::Position & a_position - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::InvalidPosition)) =0; virtual void resume (const AVStreams::Position & a_position - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::InvalidPosition)) =0; virtual void stop (const AVStreams::Position & a_position - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::InvalidPosition)) =0; diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp index 1c4406449ed..5c73560bc55 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp @@ -149,7 +149,7 @@ TAO_AV_Core::reactor (void) int TAO_AV_Core::init (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_Core::init ")); this->orb_ = CORBA::ORB::_duplicate (orb); @@ -1016,18 +1016,18 @@ TAO_AV_Core::deactivate_servant (PortableServer::Servant servant) // the servant when all pending requests on this servant are // complete. - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - PortableServer::POA_var poa = servant->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa = servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h index d170ef600b4..c1242aed973 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h @@ -86,7 +86,7 @@ public: int init (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int run (void); int stop_run (void); int init_forward_flows (TAO_Base_StreamEndPoint *endpoint, diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp index fe0fb2884ad..f70a5c8b9e9 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp @@ -53,7 +53,7 @@ TAO_AV_Endpoint_Strategy::~TAO_AV_Endpoint_Strategy (void) int TAO_AV_Endpoint_Strategy::create_A (AVStreams::StreamEndPoint_A_ptr & /* stream_endpoint */, AVStreams::VDev_ptr & /* vdev */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) Error creating A endpoint\n"), @@ -67,7 +67,7 @@ TAO_AV_Endpoint_Strategy::create_A (AVStreams::StreamEndPoint_A_ptr & /* stream_ int TAO_AV_Endpoint_Strategy::create_B (AVStreams::StreamEndPoint_B_ptr & /* stream_endpoint */, AVStreams::VDev_ptr & /*vdev */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) Error creating B endpoint\n"), @@ -156,19 +156,19 @@ TAO_AV_Endpoint_Process_Strategy::activate (void) "remove"), -1); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Get ourselves a Naming service - this->bind_to_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER); + this->bind_to_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get the stream endpoint created by the child from the naming service - this->get_stream_endpoint (TAO_ENV_SINGLE_ARG_PARAMETER); + this->get_stream_endpoint (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get the Vdev created by the child from the naming service - this->get_vdev (TAO_ENV_SINGLE_ARG_PARAMETER); + this->get_vdev (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -183,7 +183,7 @@ TAO_AV_Endpoint_Process_Strategy::activate (void) // Get ourselves a Naming service reference int -TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (TAO_ENV_SINGLE_ARG_DECL) +TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { @@ -191,7 +191,7 @@ TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (TAO_ENV_SINGLE_ARG_DEC return 0; CORBA::Object_var naming_obj = - TAO_ORB_Core_instance ()->orb ()->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core_instance ()->orb ()->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (naming_obj.in ())) @@ -200,7 +200,7 @@ TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (TAO_ENV_SINGLE_ARG_DEC -1); this->naming_context_ = CosNaming::NamingContext::_narrow (naming_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -215,7 +215,7 @@ TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (TAO_ENV_SINGLE_ARG_DEC // Get the VDev created in the child process from the namingservice int -TAO_AV_Endpoint_Process_Strategy::get_vdev (TAO_ENV_SINGLE_ARG_DECL) +TAO_AV_Endpoint_Process_Strategy::get_vdev (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { @@ -236,13 +236,13 @@ TAO_AV_Endpoint_Process_Strategy::get_vdev (TAO_ENV_SINGLE_ARG_DECL) // Get the CORBA::Object CORBA::Object_var vdev = this->naming_context_->resolve (VDev_Name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow it this->vdev_ = AVStreams::VDev::_narrow (vdev.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Check if valid @@ -280,7 +280,7 @@ TAO_AV_Endpoint_Process_Strategy_A::~TAO_AV_Endpoint_Process_Strategy_A (void) int TAO_AV_Endpoint_Process_Strategy_A::create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint, AVStreams::VDev_ptr &vdev - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { // use the baseclass activate if (this->activate () == -1) @@ -297,7 +297,7 @@ TAO_AV_Endpoint_Process_Strategy_A::create_A (AVStreams::StreamEndPoint_A_ptr &s // Gets the stream endpoint object reference from the naming service int -TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL) +TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { @@ -319,13 +319,13 @@ TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL // Get the CORBA::Object CORBA::Object_var stream_endpoint_a = this->naming_context_->resolve (Stream_Endpoint_A_Name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow the reference this->stream_endpoint_a_ = AVStreams::StreamEndPoint_A::_narrow (stream_endpoint_a.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Check for validity @@ -363,7 +363,7 @@ TAO_AV_Endpoint_Process_Strategy_B::~TAO_AV_Endpoint_Process_Strategy_B (void) int TAO_AV_Endpoint_Process_Strategy_B::create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint, AVStreams::VDev_ptr &vdev - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -374,7 +374,7 @@ TAO_AV_Endpoint_Process_Strategy_B::create_B (AVStreams::StreamEndPoint_B_ptr &s if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Process_Strategy_B::create_B ()\n: stream_endpoint is:%s\n", TAO_ORB_Core_instance ()->orb ()->object_to_string (this->stream_endpoint_b_ - TAO_ENV_ARG_PARAMETER))); + ACE_ENV_ARG_PARAMETER))); ACE_TRY_CHECK; stream_endpoint = this->stream_endpoint_b_; vdev = this->vdev_; @@ -391,7 +391,7 @@ TAO_AV_Endpoint_Process_Strategy_B::create_B (AVStreams::StreamEndPoint_B_ptr &s // Gets the B type stream_endpoint from the Naming service int -TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL) +TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { @@ -413,13 +413,13 @@ TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL // Get the CORBA::Object reference CORBA::Object_var stream_endpoint_b = this->naming_context_->resolve (Stream_Endpoint_B_Name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow the reference this->stream_endpoint_b_ = AVStreams::StreamEndPoint_B::_narrow (stream_endpoint_b.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Check for validity diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h index 7323dd79bcb..f57d2ac3533 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h @@ -44,12 +44,12 @@ public: /// Called by the MMDevice, when it needs to create an A type endpoint virtual int create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint, AVStreams::VDev_ptr &vdev - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Called by the MMDevice, when it needs to create an B type endpoint virtual int create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint, AVStreams::VDev_ptr &vdev - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); protected: /// The "A" stream endpoint @@ -87,18 +87,18 @@ public: protected: /// Bind to the naming service - virtual int bind_to_naming_service (TAO_ENV_SINGLE_ARG_DECL); + virtual int bind_to_naming_service (ACE_ENV_SINGLE_ARG_DECL); /** * Get the object reference for the newly created stream * endpoint (which will be in the child process) * Subclasses will define the functionality for this */ - virtual int get_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL) = 0; + virtual int get_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL) = 0; /// Get the Vdev object reference for the newly created /// endpoint - virtual int get_vdev (TAO_ENV_SINGLE_ARG_DECL); + virtual int get_vdev (ACE_ENV_SINGLE_ARG_DECL); /// Naming context CosNaming::NamingContext_var naming_context_; @@ -135,10 +135,10 @@ protected: /// Creates an "A" type stream endpoint, and a vdev virtual int create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint, AVStreams::VDev_ptr &vdev - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Gets the "A" type stream endpoint from the child process - virtual int get_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL); + virtual int get_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL); }; @@ -163,11 +163,11 @@ protected: /// Creates a "B" type stream endpoint, and a vdev virtual int create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint, AVStreams::VDev_ptr &vdev - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Gets the object reference of the "B" type streamendpoint. - virtual int get_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL); + virtual int get_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL); }; diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp index 87dac015760..68df61b060d 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp @@ -32,15 +32,15 @@ TAO_AV_Endpoint_Reactive_Strategy ::activ ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->activate_stream_endpoint (TAO_ENV_SINGLE_ARG_PARAMETER); + this->activate_stream_endpoint (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activated stream_endpoint\n")); - this->activate_vdev (TAO_ENV_SINGLE_ARG_PARAMETER); + this->activate_vdev (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activated vdev\n")); - this->activate_mediactrl (TAO_ENV_SINGLE_ARG_PARAMETER); + this->activate_mediactrl (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activated mediactrl\n")); } @@ -56,22 +56,22 @@ TAO_AV_Endpoint_Reactive_Strategy ::activ template char * -TAO_AV_Endpoint_Reactive_Strategy ::activate_with_poa (PortableServer::Servant servant TAO_ENV_ARG_DECL) +TAO_AV_Endpoint_Reactive_Strategy ::activate_with_poa (PortableServer::Servant servant ACE_ENV_ARG_DECL) { PortableServer::ObjectId_var id = this->poa_->activate_object (servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Object_var obj = this->poa_->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::String_var str = this->orb_->object_to_string (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return str._retn (); @@ -81,7 +81,7 @@ TAO_AV_Endpoint_Reactive_Strategy ::activ // Activate VDev into the POA template int -TAO_AV_Endpoint_Reactive_Strategy ::activate_vdev (TAO_ENV_SINGLE_ARG_DECL) +TAO_AV_Endpoint_Reactive_Strategy ::activate_vdev (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { @@ -92,15 +92,15 @@ TAO_AV_Endpoint_Reactive_Strategy ::activ // Activate the object under the root poa. // CORBA::String_var vdev_ior = this->activate_with_poa (vdev, -// TAO_ENV_ARG_PARAMETER); +// ACE_ENV_ARG_PARAMETER); // ACE_TRY_CHECK; // if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activate_vdev, vdev ior is:%s\n", // vdev_ior. in ())); // Save the object reference, so that create_A can return it - this->vdev_ = vdev->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->vdev_ = vdev->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - vdev->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + vdev->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -117,7 +117,7 @@ TAO_AV_Endpoint_Reactive_Strategy ::activ // Activate the media_controller template int -TAO_AV_Endpoint_Reactive_Strategy ::activate_mediactrl (TAO_ENV_SINGLE_ARG_DECL) +TAO_AV_Endpoint_Reactive_Strategy ::activate_mediactrl (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { @@ -128,7 +128,7 @@ TAO_AV_Endpoint_Reactive_Strategy ::activ // Activate the mediactrl object under the root poa. // CORBA::String_var mediactrl_ior = this->activate_with_poa (media_ctrl -// TAO_ENV_ARG_PARAMETER); +// ACE_ENV_ARG_PARAMETER); // ACE_TRY_CHECK; // if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activate_mediactrl , media_ctrl ior is :%s\n", @@ -138,13 +138,13 @@ TAO_AV_Endpoint_Reactive_Strategy ::activ // Associate the media controller object reference with the vdev, as per the OMG spec CORBA::Any anyval; CORBA::Object_var media_ctrl_obj - = media_ctrl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + = media_ctrl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - media_ctrl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + media_ctrl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var str = this->orb_->object_to_string (media_ctrl_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); anyval <<= str.in(); @@ -152,7 +152,7 @@ TAO_AV_Endpoint_Reactive_Strategy ::activ this->vdev_->define_property ("Related_MediaCtrl", anyval - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -235,7 +235,7 @@ template int TAO_AV_Endpoint_Reactive_Strategy_A::create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint, AVStreams::VDev_ptr &vdev - TAO_ENV_ARG_DECL_NOT_USED/* TAO_ENV_SINGLE_ARG_PARAMETER */) + ACE_ENV_ARG_DECL_NOT_USED/* ACE_ENV_SINGLE_ARG_PARAMETER */) { if (this->activate () == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -251,7 +251,7 @@ TAO_AV_Endpoint_Reactive_Strategy_A::crea // Put the stream_endpoint into the POA template int -TAO_AV_Endpoint_Reactive_Strategy_A ::activate_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL) +TAO_AV_Endpoint_Reactive_Strategy_A ::activate_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { @@ -262,14 +262,14 @@ TAO_AV_Endpoint_Reactive_Strategy_A ::act return -1; // CORBA::String_var stream_endpoint_ior = this->activate_with_poa (stream_endpoint_a -// TAO_ENV_ARG_PARAMETER); +// ACE_ENV_ARG_PARAMETER); // ACE_TRY_CHECK; // if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_Endpoint_Reactive_Strategy_A::activate_stream_endpoint,Stream Endpoint ior is : %s\n",stream_endpoint_ior.in ())); // Save the object references, so that create_a can return them - this->stream_endpoint_a_ = stream_endpoint_a->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->stream_endpoint_a_ = stream_endpoint_a->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - stream_endpoint_a->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + stream_endpoint_a->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -312,7 +312,7 @@ TAO_AV_Endpoint_Reactive_Strategy_B ::ini // Activate stream_endpoint template int -TAO_AV_Endpoint_Reactive_Strategy_B ::activate_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL) +TAO_AV_Endpoint_Reactive_Strategy_B ::activate_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { @@ -321,13 +321,13 @@ TAO_AV_Endpoint_Reactive_Strategy_B ::act if (this->make_stream_endpoint (stream_endpoint_b) == -1) return -1; // CORBA::String_var stream_endpoint_ior = this->activate_with_poa (stream_endpoint_b -// TAO_ENV_ARG_PARAMETER); +// ACE_ENV_ARG_PARAMETER); // ACE_TRY_CHECK; // if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_Endpoint_Reactive_Strategy_B::activate_stream_endpoint,Stream Endpoint ior is : %s\n",stream_endpoint_ior.in ())); - this->stream_endpoint_b_ = stream_endpoint_b->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->stream_endpoint_b_ = stream_endpoint_b->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - stream_endpoint_b->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + stream_endpoint_b->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -345,7 +345,7 @@ template int TAO_AV_Endpoint_Reactive_Strategy_B::create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint, AVStreams::VDev_ptr &vdev - TAO_ENV_ARG_DECL_NOT_USED/* TAO_ENV_SINGLE_ARG_PARAMETER */) + ACE_ENV_ARG_DECL_NOT_USED/* ACE_ENV_SINGLE_ARG_PARAMETER */) { if (this->activate () == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -393,19 +393,19 @@ TAO_AV_Child_Process ::init (int argc, // create the objects and activate them in the poa this->activate_objects (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get ourselves a naming_service object reference - this->bind_to_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER); + this->bind_to_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Register the vdev with the naming service - this->register_vdev (TAO_ENV_SINGLE_ARG_PARAMETER); + this->register_vdev (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // register the stream_endpoing with the naming_service - this->register_stream_endpoint (TAO_ENV_SINGLE_ARG_PARAMETER); + this->register_stream_endpoint (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -427,22 +427,22 @@ TAO_AV_Child_Process ::init (int argc, template char * TAO_AV_Child_Process ::activate_with_poa (PortableServer::Servant servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { PortableServer::ObjectId_var id = this->poa_->activate_object (servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Object_var obj = this->poa_->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::String_var str = this->orb_->object_to_string (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return str._retn (); @@ -453,7 +453,7 @@ template int TAO_AV_Child_Process ::activate_objects (int /*argc*/, char ** /*argv*/ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -471,7 +471,7 @@ TAO_AV_Child_Process ::activate_objects // activate the stream_endpoint CORBA::String_var stream_endpoint_ior = this->activate_with_poa (this->stream_endpoint_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t)TAO_AV_Child_Process::activate_objects,stream_endpoint_ior :%s\n", @@ -479,7 +479,7 @@ TAO_AV_Child_Process ::activate_objects // activate the vdev CORBA::String_var vdev_ior = this->activate_with_poa (this->vdev_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t)TAO_AV_Child_Process::activate_objects, vdev ior is :%s\n", @@ -487,7 +487,7 @@ TAO_AV_Child_Process ::activate_objects // activate the media controller CORBA::String_var media_ctrl_ior = this->activate_with_poa (this->media_ctrl_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Child_Process::activate_objects,media_ctrl_ior is: %s\n",media_ctrl_ior.in ())); @@ -505,12 +505,12 @@ TAO_AV_Child_Process ::activate_objects // Bind to the namingservice template int -TAO_AV_Child_Process ::bind_to_naming_service (TAO_ENV_SINGLE_ARG_DECL) +TAO_AV_Child_Process ::bind_to_naming_service (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { CORBA::Object_var naming_obj = - this->orb_->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (naming_obj.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -519,7 +519,7 @@ TAO_AV_Child_Process ::bind_to_naming_se // if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) %s:%d\n", __FILE__, __LINE__)); this->naming_context_ = CosNaming::NamingContext::_narrow (naming_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -535,7 +535,7 @@ TAO_AV_Child_Process ::bind_to_naming_se // register the vdev with the naming service template int -TAO_AV_Child_Process ::register_vdev (TAO_ENV_SINGLE_ARG_DECL) +TAO_AV_Child_Process ::register_vdev (ACE_ENV_SINGLE_ARG_DECL) { CORBA::Object_ptr vdev_obj = CORBA::Object::_nil (); ACE_TRY @@ -555,26 +555,26 @@ TAO_AV_Child_Process ::register_vdev (TA // make the media controller a property of the vdev CORBA::Any media_ctrl_property; CORBA::Object_var media_ctrl_obj = - this->media_ctrl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->media_ctrl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; media_ctrl_property <<= this->orb_->object_to_string (media_ctrl_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->vdev_->define_property ("Related_MediaCtrl", media_ctrl_property - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - vdev_obj = this->vdev_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + vdev_obj = this->vdev_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - this->vdev_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + this->vdev_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_TRY_EX (bind) { // Register the vdev with the naming server. this->naming_context_->bind (this->vdev_name_, vdev_obj - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (bind); } ACE_CATCH (CosNaming::NamingContext::AlreadyBound,ex) @@ -583,7 +583,7 @@ TAO_AV_Child_Process ::register_vdev (TA // with this one this->naming_context_->rebind (this->vdev_name_, vdev_obj - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -612,7 +612,7 @@ TAO_AV_Child_Process ::run (ACE_Time_V ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->orb_->run (tv TAO_ENV_ARG_PARAMETER); + this->orb_->run (tv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -660,14 +660,14 @@ TAO_AV_Child_Process ::release_semapho // register the stream_endpoint with the naming service template int -TAO_AV_Child_Process ::register_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL) +TAO_AV_Child_Process ::register_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL) { CORBA::Object_ptr stream_endpoint_obj = CORBA::Object::_nil (); ACE_TRY { - stream_endpoint_obj = this->stream_endpoint_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + stream_endpoint_obj = this->stream_endpoint_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - this->stream_endpoint_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + this->stream_endpoint_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) %s:%d\n", __FILE__, __LINE__)); // Create a name for the video control object @@ -675,7 +675,7 @@ TAO_AV_Child_Process ::register_stream_e // Register the stream endpoint object with the naming server. this->naming_context_->bind (this->stream_endpoint_name_, stream_endpoint_obj - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CosNaming::NamingContext::AlreadyBound,ex) @@ -683,7 +683,7 @@ TAO_AV_Child_Process ::register_stream_e // if the name was already there, replace the reference with the new one this->naming_context_->rebind (this->stream_endpoint_name_, stream_endpoint_obj - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -742,11 +742,11 @@ TAO_AV_Child_Process::unbind_names (void) if (CORBA::is_nil (this->naming_context_.in ()) == 0) return 0; this->naming_context_->unbind (this->stream_endpoint_name_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->naming_context_->unbind (this->vdev_name_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h index f4cb2acefd7..1ff9129d44f 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h @@ -42,15 +42,15 @@ protected: virtual int activate (void); /// activates the stream_endpoint with the POA - virtual int activate_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL) = 0; + virtual int activate_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL) = 0; /// activates the vdev with the POA - virtual int activate_vdev (TAO_ENV_SINGLE_ARG_DECL); + virtual int activate_vdev (ACE_ENV_SINGLE_ARG_DECL); /// activates the media controller with the POA - virtual int activate_mediactrl (TAO_ENV_SINGLE_ARG_DECL); + virtual int activate_mediactrl (ACE_ENV_SINGLE_ARG_DECL); /// Bridge method to create a vdev, a la Acceptor. Applications /// can override this @@ -65,7 +65,7 @@ protected: virtual int make_mediactrl (T_MediaCtrl *&media_ctrl); - char* activate_with_poa (PortableServer::Servant servant TAO_ENV_ARG_DECL); + char* activate_with_poa (PortableServer::Servant servant ACE_ENV_ARG_DECL); CORBA::ORB_var orb_; @@ -95,12 +95,12 @@ public: /// Overrides the base class stream_endpoint activator, to activate /// an "A" type endpoint - virtual int activate_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL); + virtual int activate_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL); /// Called by the MMDevice, when it needs to create an A type endpoint virtual int create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint, AVStreams::VDev_ptr &vdev - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); }; @@ -126,12 +126,12 @@ public: /// Overrides the base class stream_endpoint activator, to activate /// a "B" type endpoint - virtual int activate_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL); + virtual int activate_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL); /// Called by the MMDevice, when it needs to create a B type endpoint virtual int create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint, AVStreams::VDev_ptr &vdev - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); }; // ---------------------------------------------------------------------- @@ -168,22 +168,22 @@ protected: */ int activate_objects (int argc, char **argv - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); ///activate the servant with the poa - char* activate_with_poa (PortableServer::Servant servant TAO_ENV_ARG_DECL); + char* activate_with_poa (PortableServer::Servant servant ACE_ENV_ARG_DECL); /// Removes the vdev and streamendpoint names from the naming service. int unbind_names (void); /// Binds to the naming service - int bind_to_naming_service (TAO_ENV_SINGLE_ARG_DECL); + int bind_to_naming_service (ACE_ENV_SINGLE_ARG_DECL); /// Registers vdev with the naming service - int register_vdev (TAO_ENV_SINGLE_ARG_DECL); + int register_vdev (ACE_ENV_SINGLE_ARG_DECL); /// Registers stream_endpoint with the naming service - int register_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL); + int register_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL); /// Releases the semaphore on which the parent is waiting on int release_semaphore (); diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp index e26e6bc7116..a309efdf318 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp @@ -28,7 +28,7 @@ TAO_FDev::TAO_FDev (const char *flowname) flowname_any <<= flowname; this->define_property ("Flow", flowname_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -63,7 +63,7 @@ TAO_FDev::flowname (const char *flow_name) flowname_any <<= flow_name; this->define_property ("Flow", flowname_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -81,7 +81,7 @@ TAO_FDev::create_producer (AVStreams::FlowConnection_ptr AVStreams::QoS & the_qos, CORBA::Boolean_out met_qos, char *& named_fdev - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::streamOpDenied, @@ -93,7 +93,7 @@ TAO_FDev::create_producer (AVStreams::FlowConnection_ptr the_qos, met_qos, named_fdev - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } template @@ -103,7 +103,7 @@ TAO_FDev::make_producer (AVStreams::FlowConnection_ptr / AVStreams::QoS & /* the_qos */, CORBA::Boolean_out /* met_qos */, char *& /* named_fdev */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { AVStreams::FlowProducer_ptr producer = AVStreams::FlowProducer::_nil (); ACE_TRY @@ -114,7 +114,7 @@ TAO_FDev::make_producer (AVStreams::FlowConnection_ptr / T_Producer, 0); this->producer_list_.insert_tail (producer_i); - producer = producer_i->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + producer = producer_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -134,7 +134,7 @@ TAO_FDev::make_consumer (AVStreams::FlowConnection_ptr / AVStreams::QoS & /* the_qos */, CORBA::Boolean_out /* met_qos */, char *& /* named_fdev */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { AVStreams::FlowConsumer_ptr consumer = AVStreams::FlowConsumer::_nil (); ACE_TRY @@ -145,7 +145,7 @@ TAO_FDev::make_consumer (AVStreams::FlowConnection_ptr / T_Consumer, 0); this->consumer_list_.insert_tail (consumer_i); - consumer = consumer_i->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer = consumer_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -164,7 +164,7 @@ TAO_FDev::create_consumer (AVStreams::FlowConnection_ptr AVStreams::QoS & the_qos, CORBA::Boolean_out met_qos, char *& named_fdev - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::streamOpDenied, @@ -175,7 +175,7 @@ TAO_FDev::create_consumer (AVStreams::FlowConnection_ptr the_qos, met_qos, named_fdev - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } template @@ -184,7 +184,7 @@ AVStreams::FlowConnection_ptr TAO_FDev::bind (AVStreams::FDev_ptr peer_device, AVStreams::QoS & the_qos, CORBA::Boolean_out is_met - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::QoSRequestFailed)) @@ -202,7 +202,7 @@ AVStreams::FlowConnection_ptr TAO_FDev::bind_mcast (AVStreams::FDev_ptr first_peer, AVStreams::QoS & the_qos, CORBA::Boolean_out is_met - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::QoSRequestFailed)) @@ -218,7 +218,7 @@ template void TAO_FDev::destroy (AVStreams::FlowEndPoint_ptr /* the_ep */, const char * /* fdev_name */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported)) { diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h index b227851f3e7..c7a7cb87e47 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h +++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h @@ -48,7 +48,7 @@ public: AVStreams::QoS & the_qos, CORBA::Boolean_out met_qos, char *& named_fdev - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::streamOpDenied, @@ -61,14 +61,14 @@ public: AVStreams::QoS & the_qos, CORBA::Boolean_out met_qos, char *& named_fdev - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// create a flow consumer object. virtual AVStreams::FlowConsumer_ptr create_consumer (AVStreams::FlowConnection_ptr the_requester, AVStreams::QoS & the_qos, CORBA::Boolean_out met_qos, char *& named_fdev - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::streamOpDenied, @@ -81,13 +81,13 @@ public: AVStreams::QoS & the_qos, CORBA::Boolean_out met_qos, char *& named_fdev - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// bind this FDev with another FDev. virtual AVStreams::FlowConnection_ptr bind (AVStreams::FDev_ptr peer_device, AVStreams::QoS & the_qos, CORBA::Boolean_out is_met - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::QoSRequestFailed)); @@ -96,7 +96,7 @@ public: virtual AVStreams::FlowConnection_ptr bind_mcast (AVStreams::FDev_ptr first_peer, AVStreams::QoS & the_qos, CORBA::Boolean_out is_met - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::QoSRequestFailed)); @@ -104,7 +104,7 @@ public: /// destroys this FDev. virtual void destroy (AVStreams::FlowEndPoint_ptr the_ep, const char * fdev_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported)); diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp index dbeb3e615f0..27d79bd3ebd 100644 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp @@ -318,7 +318,7 @@ int TAO_AV_UDP_QoS_Flow_Handler::handle_qos (ACE_HANDLE /*fd*/) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::handle_qos\n")); @@ -375,7 +375,7 @@ TAO_AV_UDP_QoS_Flow_Handler::handle_qos (ACE_HANDLE /*fd*/) AVStreams::Negotiator_var remote_negotiator; this->negotiator_->negotiate (remote_negotiator.in (), new_qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } } } @@ -871,7 +871,7 @@ TAO_AV_UDP_QoS_Acceptor::open_default (TAO_Base_StreamEndPoint *endpoint, int TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; int result = 0; // TAO_AV_Callback *callback = 0; @@ -1020,7 +1020,7 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr) { CORBA::Any_ptr negotiator_any = this->endpoint_->get_property_value ("Negotiator" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (negotiator); *negotiator_any >>= negotiator; @@ -1298,7 +1298,7 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry, { CORBA::Any_ptr negotiator_any = this->endpoint_->get_property_value ("Negotiator" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (negotiator); *negotiator_any >>= negotiator; diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp index f81818b7a51..0d2a88a1430 100644 --- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp @@ -13,27 +13,27 @@ ACE_RCSID(orbsvcs, Channel_Clients_T, "$Id$") template void ACE_PushConsumer_Adapter::push (const RtecEventComm::EventSet& events - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - target_->push (events TAO_ENV_ARG_PARAMETER); + target_->push (events ACE_ENV_ARG_PARAMETER); } template void ACE_PushConsumer_Adapter::disconnect_push_consumer ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - target_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + target_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); } template void ACE_PushSupplier_Adapter::disconnect_push_supplier ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - target_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + target_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); } #endif /* ACE_CHANNEL_CLIENTS_T_C */ diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h index 7b88fccc846..91d7310ff86 100644 --- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h +++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h @@ -42,11 +42,11 @@ public: // Forwards all calls to . virtual void push (const RtecEventComm::EventSet& events - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException)); // Forwards to target_. - virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException)); // Forwards to target_. @@ -71,7 +71,7 @@ public: ACE_PushSupplier_Adapter (TARGET *target); // Forwards all calls to . - virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException)); // Forwards to target_. diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp index ea9dc033f6f..6a0f43a1c82 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp @@ -39,7 +39,7 @@ CC_Lock::~CC_Lock (void) } void -CC_Lock::lock (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +CC_Lock::lock (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { ACE_DEBUG ((LM_DEBUG, "CC_Lock::lock\n")); @@ -47,7 +47,7 @@ CC_Lock::lock (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } CORBA::Boolean -CC_Lock::try_lock (TAO_ENV_SINGLE_ARG_DECL) +CC_Lock::try_lock (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "CC_Lock::try_lock. ")); @@ -82,7 +82,7 @@ CC_Lock::try_lock (TAO_ENV_SINGLE_ARG_DECL) } void -CC_Lock::unlock (TAO_ENV_SINGLE_ARG_DECL) +CC_Lock::unlock (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "CC_Lock::unlock\n")); @@ -103,7 +103,7 @@ CC_Lock::unlock (TAO_ENV_SINGLE_ARG_DECL) void CC_Lock::change_mode (CosConcurrencyControl::lock_mode new_mode - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "CC_Lock::change_mode\n")); @@ -201,7 +201,7 @@ void CC_LockModeIterator::First (void) current_ = CosConcurrencyControl::intention_read; } -void CC_LockModeIterator::Next (TAO_ENV_SINGLE_ARG_DECL) +void CC_LockModeIterator::Next (ACE_ENV_SINGLE_ARG_DECL) { switch (current_) { diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h index dbc60939bbc..24b87792c7c 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h @@ -58,18 +58,18 @@ public: ~CC_Lock (void); // Deletes the lock - void lock (TAO_ENV_SINGLE_ARG_DECL); + void lock (ACE_ENV_SINGLE_ARG_DECL); // Acquires this lock. Blocks until lock is obtained - CORBA::Boolean try_lock (TAO_ENV_SINGLE_ARG_DECL); + CORBA::Boolean try_lock (ACE_ENV_SINGLE_ARG_DECL); // Tries to acquire this lock. If it is not possible to acquire the // lock, false is returned - void unlock (TAO_ENV_SINGLE_ARG_DECL); + void unlock (ACE_ENV_SINGLE_ARG_DECL); // Releases this lock. void change_mode (CosConcurrencyControl::lock_mode new_mode - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Changes the mode of this lock. void set_mode (CosConcurrencyControl::lock_mode mode); @@ -125,7 +125,7 @@ public: void First(void); // Reset the iterator to the first element - void Next(TAO_ENV_SINGLE_ARG_DECL); + void Next(ACE_ENV_SINGLE_ARG_DECL); // Advance the iterator to the next element // Throws exception if out of range diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp index f3afff015db..63082ca944a 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp @@ -24,7 +24,7 @@ CC_LockSet::CC_LockSet (void) { ACE_TRY_NEW_ENV { - this->Init (TAO_ENV_SINGLE_ARG_PARAMETER); + this->Init (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -42,7 +42,7 @@ CC_LockSet::CC_LockSet (CosConcurrencyControl::LockSet_ptr related) { ACE_TRY_NEW_ENV { - this->Init (TAO_ENV_SINGLE_ARG_PARAMETER); + this->Init (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -56,7 +56,7 @@ CC_LockSet::CC_LockSet (CosConcurrencyControl::LockSet_ptr related) // Initialization. void -CC_LockSet::Init (TAO_ENV_SINGLE_ARG_DECL) +CC_LockSet::Init (ACE_ENV_SINGLE_ARG_DECL) { // Set the mode of the statically allocated locks lock_[CC_IR] = 0; @@ -93,7 +93,7 @@ CORBA::Boolean CC_LockSet::compatible (CC_LockModeEnum mr) void CC_LockSet::lock (CosConcurrencyControl::lock_mode mode - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "CC_LockSet::lock\n")); @@ -114,7 +114,7 @@ CC_LockSet::lock (CosConcurrencyControl::lock_mode mode CORBA::Boolean CC_LockSet::try_lock (CosConcurrencyControl::lock_mode mode - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { CC_LockModeEnum lm = lmconvert (mode); @@ -155,7 +155,7 @@ CC_LockSet::lmconvert (CosConcurrencyControl::lock_mode mode) void CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosConcurrencyControl::LockNotHeld)) { @@ -200,7 +200,7 @@ CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode void CC_LockSet::change_mode (CosConcurrencyControl::lock_mode held_mode, CosConcurrencyControl::lock_mode new_mode - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosConcurrencyControl::LockNotHeld)) { @@ -213,7 +213,7 @@ CC_LockSet::change_mode (CosConcurrencyControl::lock_mode held_mode, ACE_THROW (CosConcurrencyControl::LockNotHeld()); else if (this->change_mode_i (lm_held, lm_new)==1) { - this->unlock (held_mode TAO_ENV_ARG_PARAMETER); + this->unlock (held_mode ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (semaphore_.acquire () == -1) diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h index efd63a16c41..e7080ab3572 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h @@ -87,25 +87,25 @@ public: // = CosConcurrencyControl methods virtual void lock (CosConcurrencyControl::lock_mode mode - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Acquires this lock. Blocks until lock is obtained virtual CORBA::Boolean try_lock (CosConcurrencyControl::lock_mode mode - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Tries to acquire this lock. If it is not possible to acquire the // lock, false is returned virtual void unlock (CosConcurrencyControl::lock_mode mode - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosConcurrencyControl::LockNotHeld)); // Releases this lock. virtual void change_mode (CosConcurrencyControl::lock_mode held_mode, CosConcurrencyControl::lock_mode new_mode - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosConcurrencyControl::LockNotHeld)); // Changes the mode of this lock. @@ -119,7 +119,7 @@ private: // Converts the CORBA specification's lock mode to the internal // representation - void Init (TAO_ENV_SINGLE_ARG_DECL); + void Init (ACE_ENV_SINGLE_ARG_DECL); // Initiatlizes the lock set array and acquires the initial // semaphore. diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp index 87bcc3c04f6..56466309fd3 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp @@ -29,7 +29,7 @@ CC_LockSetFactory::~CC_LockSetFactory (void) } CosConcurrencyControl::LockSet_ptr -CC_LockSetFactory::create (TAO_ENV_SINGLE_ARG_DECL) +CC_LockSetFactory::create (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CC_LockSet *ls = 0; @@ -41,12 +41,12 @@ CC_LockSetFactory::create (TAO_ENV_SINGLE_ARG_DECL) CORBA::NO_MEMORY()); ACE_CHECK_RETURN (CosConcurrencyControl::LockSet::_nil ()); - return ls->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return ls->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } CosConcurrencyControl::LockSet_ptr CC_LockSetFactory::create_related (CosConcurrencyControl::LockSet_ptr which - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CC_LockSet *ls = 0; @@ -58,5 +58,5 @@ CC_LockSetFactory::create_related (CosConcurrencyControl::LockSet_ptr which CORBA::NO_MEMORY()); ACE_CHECK_RETURN (CosConcurrencyControl::LockSet::_nil ()); - return ls->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return ls->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h index 538f11e3a63..92c6a480bd3 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h @@ -46,12 +46,12 @@ public: // Destructor. virtual CosConcurrencyControl::LockSet_ptr create ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CosConcurrencyControl::LockSet_ptr create_related ( CosConcurrencyControl::LockSet_ptr which - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp index 266ea7e4c3c..3a46ea8d99b 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp @@ -53,7 +53,7 @@ TAO_Concurrency_Server::init (CORBA::ORB_var &orb, poa->activate_object_with_id (id.in (), &lock_set_factory_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Stringify the objref we'll be implementing, and print it to @@ -61,12 +61,12 @@ TAO_Concurrency_Server::init (CORBA::ORB_var &orb, // client. Then release the object. CORBA::Object_var obj = poa->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var str = orb->object_to_string (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp index 164716520b0..f600d8a2a53 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp @@ -33,89 +33,89 @@ TAO_CEC_ConsumerAdmin::~TAO_CEC_ConsumerAdmin (void) void TAO_CEC_ConsumerAdmin::push (const CORBA::Any &event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_CEC_Propagate_Event_Push push_worker (event); this->push_admin_.for_each (&push_worker - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; TAO_CEC_Propagate_Event_Pull pull_worker (event); this->pull_admin_.for_each (&pull_worker - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_CEC_ConsumerAdmin::connected (TAO_CEC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->push_admin_.connected (supplier TAO_ENV_ARG_PARAMETER); + this->push_admin_.connected (supplier ACE_ENV_ARG_PARAMETER); } void TAO_CEC_ConsumerAdmin::reconnected (TAO_CEC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->push_admin_.reconnected (supplier TAO_ENV_ARG_PARAMETER); + this->push_admin_.reconnected (supplier ACE_ENV_ARG_PARAMETER); } void TAO_CEC_ConsumerAdmin::disconnected (TAO_CEC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->push_admin_.disconnected (supplier TAO_ENV_ARG_PARAMETER); + this->push_admin_.disconnected (supplier ACE_ENV_ARG_PARAMETER); } void TAO_CEC_ConsumerAdmin::connected (TAO_CEC_ProxyPullSupplier *supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->pull_admin_.connected (supplier TAO_ENV_ARG_PARAMETER); + this->pull_admin_.connected (supplier ACE_ENV_ARG_PARAMETER); } void TAO_CEC_ConsumerAdmin::reconnected (TAO_CEC_ProxyPullSupplier *supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->pull_admin_.reconnected (supplier TAO_ENV_ARG_PARAMETER); + this->pull_admin_.reconnected (supplier ACE_ENV_ARG_PARAMETER); } void TAO_CEC_ConsumerAdmin::disconnected (TAO_CEC_ProxyPullSupplier *supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->pull_admin_.disconnected (supplier TAO_ENV_ARG_PARAMETER); + this->pull_admin_.disconnected (supplier ACE_ENV_ARG_PARAMETER); } void -TAO_CEC_ConsumerAdmin::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_ConsumerAdmin::shutdown (ACE_ENV_SINGLE_ARG_DECL) { - this->push_admin_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->push_admin_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->pull_admin_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->pull_admin_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } CosEventChannelAdmin::ProxyPushSupplier_ptr -TAO_CEC_ConsumerAdmin::obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_ConsumerAdmin::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->push_admin_.obtain (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->push_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER); } CosEventChannelAdmin::ProxyPullSupplier_ptr -TAO_CEC_ConsumerAdmin::obtain_pull_supplier (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_ConsumerAdmin::obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->pull_admin_.obtain (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->pull_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER); } PortableServer::POA_ptr -TAO_CEC_ConsumerAdmin::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ConsumerAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } @@ -124,18 +124,18 @@ TAO_CEC_ConsumerAdmin::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_CEC_Propagate_Event_Push::work (TAO_CEC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - supplier->push (this->event_ TAO_ENV_ARG_PARAMETER); + supplier->push (this->event_ ACE_ENV_ARG_PARAMETER); } // **************************************************************** void TAO_CEC_Propagate_Event_Pull::work (TAO_CEC_ProxyPullSupplier *supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - supplier->push (this->event_ TAO_ENV_ARG_PARAMETER); + supplier->push (this->event_ ACE_ENV_ARG_PARAMETER); } // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h index b980088789a..61c5a765a72 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h @@ -58,43 +58,43 @@ public: /// For each elements call work()>. void for_each (TAO_ESF_Worker *worker - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void for_each (TAO_ESF_Worker *worker - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Push the event to all the consumers void push (const CORBA::Any &event - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Used to inform the EC that a Supplier has connected or /// disconnected from it. virtual void connected (TAO_CEC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void reconnected (TAO_CEC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void disconnected (TAO_CEC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void connected (TAO_CEC_ProxyPullSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void reconnected (TAO_CEC_ProxyPullSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void disconnected (TAO_CEC_ProxyPullSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); /// The event channel is shutting down, inform all the consumers of /// this - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); // = The CosEventChannelAdmin::ConsumerAdmin methods... virtual CosEventChannelAdmin::ProxyPushSupplier_ptr - obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CosEventChannelAdmin::ProxyPullSupplier_ptr - obtain_pull_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // = The PortableServer::ServantBase methods - virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); private: /// The Event Channel we belong to @@ -119,7 +119,7 @@ public: TAO_CEC_Propagate_Event_Push (const CORBA::Any& event); void work (TAO_CEC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: /// The event @@ -134,7 +134,7 @@ public: TAO_CEC_Propagate_Event_Pull (const CORBA::Any& event); void work (TAO_CEC_ProxyPullSupplier *supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: /// The event diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i index 8db0065dc5b..254a5bdd1fa 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i @@ -3,17 +3,17 @@ ACE_INLINE void TAO_CEC_ConsumerAdmin:: for_each (TAO_ESF_Worker *worker - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->push_admin_.for_each (worker TAO_ENV_ARG_PARAMETER); + this->push_admin_.for_each (worker ACE_ENV_ARG_PARAMETER); } ACE_INLINE void TAO_CEC_ConsumerAdmin:: for_each (TAO_ESF_Worker *worker - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->pull_admin_.for_each (worker TAO_ENV_ARG_PARAMETER); + this->pull_admin_.for_each (worker ACE_ENV_ARG_PARAMETER); } // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp index 4bf1072dd1d..f72c989f4ed 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp @@ -30,20 +30,20 @@ TAO_CEC_ConsumerControl::shutdown (void) void TAO_CEC_ConsumerControl::consumer_not_exist (TAO_CEC_ProxyPushSupplier * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_CEC_ConsumerControl::consumer_not_exist (TAO_CEC_ProxyPullSupplier * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_CEC_ConsumerControl::system_exception (TAO_CEC_ProxyPushSupplier *, CORBA::SystemException & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h index 9b84bca123e..1eccae7f2cf 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h @@ -59,7 +59,7 @@ public: * reclaim all the resources attached to that object. */ virtual void consumer_not_exist (TAO_CEC_ProxyPushSupplier *proxy - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); /** * Invoked by helper classes when they detect that a consumer no @@ -67,12 +67,12 @@ public: * CORBA::OBJECT_NOT_EXIST exception has been raised). */ virtual void consumer_not_exist (TAO_CEC_ProxyPullSupplier *proxy - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); /// Some system exception was rasied while trying to push an event. virtual void system_exception (TAO_CEC_ProxyPushSupplier *proxy, CORBA::SystemException & - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp index 7c343706f36..a2343f4d940 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp @@ -32,15 +32,15 @@ TAO_CEC_Reactive_Dispatching::shutdown (void) void TAO_CEC_Reactive_Dispatching::push (TAO_CEC_ProxyPushSupplier* proxy, const CORBA::Any& event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - proxy->reactive_push_to_consumer (event TAO_ENV_ARG_PARAMETER); + proxy->reactive_push_to_consumer (event ACE_ENV_ARG_PARAMETER); } void TAO_CEC_Reactive_Dispatching::push_nocopy (TAO_CEC_ProxyPushSupplier* proxy, CORBA::Any& event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - proxy->reactive_push_to_consumer (event TAO_ENV_ARG_PARAMETER); + proxy->reactive_push_to_consumer (event ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h index 9c6873bb59c..90fee4b6d21 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h @@ -54,10 +54,10 @@ public: /// The consumer represented by should receive . virtual void push (TAO_CEC_ProxyPushSupplier *proxy, const CORBA::Any &event - TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0; + ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0; virtual void push_nocopy (TAO_CEC_ProxyPushSupplier *proxy, CORBA::Any &event - TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0; + ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0; }; // **************************************************************** @@ -82,10 +82,10 @@ public: virtual void shutdown (void); virtual void push (TAO_CEC_ProxyPushSupplier *proxy, const CORBA::Any &event - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void push_nocopy (TAO_CEC_ProxyPushSupplier *proxy, CORBA::Any &event - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp index a2fd07cb36e..3c9b579775f 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp @@ -33,7 +33,7 @@ TAO_CEC_Dispatching_Task::svc (void) continue; } - int result = command->execute (TAO_ENV_SINGLE_ARG_PARAMETER); + int result = command->execute (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Message_Block::release (mb); @@ -54,7 +54,7 @@ TAO_CEC_Dispatching_Task::svc (void) void TAO_CEC_Dispatching_Task::push (TAO_CEC_ProxyPushSupplier *proxy, CORBA::Any& event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->allocator_ == 0) this->allocator_ = ACE_Allocator::instance (); @@ -82,7 +82,7 @@ TAO_CEC_Dispatch_Command::~TAO_CEC_Dispatch_Command (void) // **************************************************************** int -TAO_CEC_Shutdown_Task_Command::execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_Shutdown_Task_Command::execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return -1; } @@ -95,9 +95,9 @@ TAO_CEC_Push_Command::~TAO_CEC_Push_Command (void) } int -TAO_CEC_Push_Command::execute (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_Push_Command::execute (ACE_ENV_SINGLE_ARG_DECL) { - this->proxy_->push_to_consumer (this->event_ TAO_ENV_ARG_PARAMETER); + this->proxy_->push_to_consumer (this->event_ ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h index 85e81f2a5c8..b2a269a6793 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h @@ -42,7 +42,7 @@ public: virtual void push (TAO_CEC_ProxyPushSupplier *proxy, CORBA::Any& event - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: /// An per-task allocator @@ -68,7 +68,7 @@ public: virtual ~TAO_CEC_Dispatch_Command (void); /// Command callback - virtual int execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) = 0; + virtual int execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) = 0; }; // **************************************************************** @@ -80,7 +80,7 @@ public: TAO_CEC_Shutdown_Task_Command (ACE_Allocator *mb_allocator = 0); /// Command callback - virtual int execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + virtual int execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); }; // **************************************************************** @@ -98,7 +98,7 @@ public: virtual ~TAO_CEC_Push_Command (void); /// Command callback - virtual int execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + virtual int execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); private: /// The proxy diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp index e8613a8b31f..8a93d5c49cc 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp @@ -74,7 +74,7 @@ TAO_CEC_EventChannel::~TAO_CEC_EventChannel (void) } void -TAO_CEC_EventChannel::activate (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_EventChannel::activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->dispatching_->activate (); this->pulling_strategy_->activate (); @@ -83,7 +83,7 @@ TAO_CEC_EventChannel::activate (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } void -TAO_CEC_EventChannel::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_EventChannel::shutdown (ACE_ENV_SINGLE_ARG_DECL) { this->dispatching_->shutdown (); this->pulling_strategy_->shutdown (); @@ -91,141 +91,141 @@ TAO_CEC_EventChannel::shutdown (TAO_ENV_SINGLE_ARG_DECL) this->consumer_control_->shutdown (); PortableServer::POA_var consumer_poa = - this->consumer_admin_->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_admin_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var consumer_id = - consumer_poa->servant_to_id (this->consumer_admin_ TAO_ENV_ARG_PARAMETER); + consumer_poa->servant_to_id (this->consumer_admin_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; - consumer_poa->deactivate_object (consumer_id.in () TAO_ENV_ARG_PARAMETER); + consumer_poa->deactivate_object (consumer_id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::POA_var supplier_poa = - this->supplier_admin_->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_admin_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var supplier_id = - supplier_poa->servant_to_id (this->supplier_admin_ TAO_ENV_ARG_PARAMETER); + supplier_poa->servant_to_id (this->supplier_admin_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; - supplier_poa->deactivate_object (supplier_id.in () TAO_ENV_ARG_PARAMETER); + supplier_poa->deactivate_object (supplier_id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier_admin_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_admin_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - this->consumer_admin_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_admin_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); } void TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPushConsumer* consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->supplier_admin_->connected (consumer TAO_ENV_ARG_PARAMETER); + this->supplier_admin_->connected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPushConsumer* consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->supplier_admin_->reconnected (consumer TAO_ENV_ARG_PARAMETER); + this->supplier_admin_->reconnected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPushConsumer* consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->supplier_admin_->disconnected (consumer TAO_ENV_ARG_PARAMETER); + this->supplier_admin_->disconnected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPullConsumer* consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->supplier_admin_->connected (consumer TAO_ENV_ARG_PARAMETER); + this->supplier_admin_->connected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPullConsumer* consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->supplier_admin_->reconnected (consumer TAO_ENV_ARG_PARAMETER); + this->supplier_admin_->reconnected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPullConsumer* consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->supplier_admin_->disconnected (consumer TAO_ENV_ARG_PARAMETER); + this->supplier_admin_->disconnected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->consumer_admin_->connected (supplier TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->connected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->consumer_admin_->reconnected (supplier TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->reconnected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->consumer_admin_->disconnected (supplier TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->disconnected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPullSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->consumer_admin_->connected (supplier TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->connected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPullSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->consumer_admin_->reconnected (supplier TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->reconnected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPullSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->consumer_admin_->disconnected (supplier TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->disconnected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; } CosEventChannelAdmin::ConsumerAdmin_ptr -TAO_CEC_EventChannel::for_consumers (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_EventChannel::for_consumers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->consumer_admin_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->consumer_admin_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } CosEventChannelAdmin::SupplierAdmin_ptr -TAO_CEC_EventChannel::for_suppliers (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_EventChannel::for_suppliers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->supplier_admin_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->supplier_admin_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_CEC_EventChannel::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_EventChannel::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h index 825280e394f..71d438ce9f9 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h @@ -117,11 +117,11 @@ public: /// Start the internal threads (if any), etc. /// After this call the EC can be used. - virtual void activate (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Shutdown any internal threads, cleanup all the internal /// structures, flush all the messages, etc. - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Access the dispatching module.... TAO_CEC_Dispatching* dispatching (void) const; @@ -183,32 +183,32 @@ public: /// Used to inform the EC that a Consumer has connected or /// disconnected from it. virtual void connected (TAO_CEC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void reconnected (TAO_CEC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void disconnected (TAO_CEC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void connected (TAO_CEC_ProxyPullConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void reconnected (TAO_CEC_ProxyPullConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void disconnected (TAO_CEC_ProxyPullConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); /// Used to inform the EC that a Supplier has connected or /// disconnected from it. virtual void connected (TAO_CEC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void reconnected (TAO_CEC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void disconnected (TAO_CEC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void connected (TAO_CEC_ProxyPullSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void reconnected (TAO_CEC_ProxyPullSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void disconnected (TAO_CEC_ProxyPullSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Simple flags to control the EC behavior, set by the application // at construction time. @@ -232,17 +232,17 @@ public: /// The default implementation is: /// this->consumer_admin ()->_this (env); virtual CosEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (TAO_ENV_SINGLE_ARG_DECL) + for_consumers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// The default implementation is: /// this->supplier_admin ()->_this (env); virtual CosEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (TAO_ENV_SINGLE_ARG_DECL) + for_suppliers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Commit suicide. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp index edefea7c31f..52fe306124f 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp @@ -38,16 +38,16 @@ TAO_CEC_Event_Loader::~TAO_CEC_Event_Loader (void) int TAO_CEC_Event_Loader::init (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // ORB initialization boiler plate... this->orb_= - CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = - this->create_object (this->orb_.in (), argc, argv TAO_ENV_ARG_PARAMETER); + this->create_object (this->orb_.in (), argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -63,7 +63,7 @@ TAO_CEC_Event_Loader::init (int argc, char *argv[]) CORBA::Object_ptr TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY @@ -125,15 +125,15 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, // POA initialization and activation ... CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -151,17 +151,17 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, this->factory_, this->terminate_flag_); - this->ec_impl_->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->ec_impl_->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CosEventChannelAdmin::EventChannel_var event_channel = - this->ec_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->ec_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (ior_file != 0) { CORBA::String_var ior = - orb->object_to_string (event_channel.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (event_channel.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; FILE *file = ACE_OS::fopen (ior_file, "w"); ACE_OS::fprintf (file, "%s\n", ior.in ()); @@ -176,12 +176,12 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, { CORBA::Object_var obj = orb->resolve_initial_references ("NameService" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->naming_context_ = CosNaming::NamingContext::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->channel_name_.length (1); @@ -191,14 +191,14 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, { this->naming_context_->rebind (this->channel_name_, event_channel.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else { this->naming_context_->bind (this->channel_name_, event_channel.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -219,30 +219,30 @@ TAO_CEC_Event_Loader::fini (void) // + Since it was activated with _this() you have to do the // canonical: // get_object_id - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Release the resources of the Event Channel - this->ec_impl_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->ec_impl_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Deactivate the EC PortableServer::POA_var poa = - this->ec_impl_->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->ec_impl_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this->ec_impl_ TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this->ec_impl_ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Unbind the Naming Service if (this->bind_to_naming_service_) { this->naming_context_->unbind (this->channel_name_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h index af490dc459f..f9d23daca61 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h @@ -49,7 +49,7 @@ public: */ CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); //@} diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp index 6cbad8bdcd8..bec500f45bf 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp @@ -63,20 +63,20 @@ TAO_CEC_MT_Dispatching::shutdown (void) void TAO_CEC_MT_Dispatching::push (TAO_CEC_ProxyPushSupplier* proxy, const CORBA::Any& event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Any event_copy = event; - this->push_nocopy (proxy, event_copy TAO_ENV_ARG_PARAMETER); + this->push_nocopy (proxy, event_copy ACE_ENV_ARG_PARAMETER); } void TAO_CEC_MT_Dispatching::push_nocopy (TAO_CEC_ProxyPushSupplier* proxy, CORBA::Any& event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Double checked locking.... if (this->active_ == 0) this->activate (); - this->task_.push (proxy, event TAO_ENV_ARG_PARAMETER); + this->task_.push (proxy, event ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h index 22b00e1c42e..e6c8fc6bf7d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h @@ -48,10 +48,10 @@ public: virtual void shutdown (void); virtual void push (TAO_CEC_ProxyPushSupplier* proxy, const CORBA::Any & event - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (TAO_CEC_ProxyPushSupplier* proxy, CORBA::Any& event - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: /// Use our own thread manager. diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp index 49022892370..5e7eccaa6ae 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp @@ -32,13 +32,13 @@ TAO_CEC_ProxyPullConsumer::~TAO_CEC_ProxyPullConsumer (void) } CosEventChannelAdmin::ProxyPullConsumer_ptr -TAO_CEC_ProxyPullConsumer::activate (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_ProxyPullConsumer::activate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventChannelAdmin::ProxyPullConsumer_var result; ACE_TRY { - result = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + result = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -50,18 +50,18 @@ TAO_CEC_ProxyPullConsumer::activate (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_CEC_ProxyPullConsumer::deactivate (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_ProxyPullConsumer::deactivate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -82,7 +82,7 @@ TAO_CEC_ProxyPullConsumer::deactivate (TAO_ENV_SINGLE_ARG_DECL) CORBA::Any* TAO_CEC_ProxyPullConsumer::try_pull_from_supplier ( CORBA::Boolean_out has_event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { has_event = 0; CosEventComm::PullSupplier_var supplier; @@ -106,7 +106,7 @@ TAO_CEC_ProxyPullConsumer::try_pull_from_supplier ( CORBA::Any_var any; ACE_TRY { - any = supplier->try_pull (has_event TAO_ENV_ARG_PARAMETER); + any = supplier->try_pull (has_event ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) @@ -114,7 +114,7 @@ TAO_CEC_ProxyPullConsumer::try_pull_from_supplier ( TAO_CEC_SupplierControl *control = this->event_channel_->supplier_control (); - control->supplier_not_exist (this TAO_ENV_ARG_PARAMETER); + control->supplier_not_exist (this ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) @@ -124,7 +124,7 @@ TAO_CEC_ProxyPullConsumer::try_pull_from_supplier ( control->system_exception (this, sysex - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -137,7 +137,7 @@ TAO_CEC_ProxyPullConsumer::try_pull_from_supplier ( CORBA::Any* TAO_CEC_ProxyPullConsumer::pull_from_supplier ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) { CosEventComm::PullSupplier_var supplier; { @@ -160,7 +160,7 @@ TAO_CEC_ProxyPullConsumer::pull_from_supplier ( CORBA::Any_var any; ACE_TRY { - any = supplier->pull (TAO_ENV_SINGLE_ARG_PARAMETER); + any = supplier->pull (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -175,7 +175,7 @@ TAO_CEC_ProxyPullConsumer::pull_from_supplier ( CORBA::Boolean TAO_CEC_ProxyPullConsumer::supplier_non_existent ( CORBA::Boolean_out disconnected - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD_THROW_EX ( ACE_Lock, ace_mon, *this->lock_, @@ -191,14 +191,14 @@ TAO_CEC_ProxyPullConsumer::supplier_non_existent ( } #if (TAO_HAS_MINIMUM_CORBA == 0) - return this->supplier_->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->supplier_->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); #else return 0; #endif /* TAO_HAS_MINIMUM_CORBA */ } void -TAO_CEC_ProxyPullConsumer::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_ProxyPullConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL) { CosEventComm::PullSupplier_var supplier; @@ -212,7 +212,7 @@ TAO_CEC_ProxyPullConsumer::shutdown (TAO_ENV_SINGLE_ARG_DECL) supplier = this->supplier_._retn (); } - this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (supplier.in ())) @@ -220,7 +220,7 @@ TAO_CEC_ProxyPullConsumer::shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { - supplier->disconnect_pull_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier->disconnect_pull_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -263,7 +263,7 @@ TAO_CEC_ProxyPullConsumer::_decr_refcnt (void) void TAO_CEC_ProxyPullConsumer::connect_pull_supplier ( CosEventComm::PullSupplier_ptr pull_supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected)) { @@ -298,7 +298,7 @@ TAO_CEC_ProxyPullConsumer::connect_pull_supplier ( // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); ACE_CHECK; - this->event_channel_->disconnected (this TAO_ENV_ARG_PARAMETER); + this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -311,12 +311,12 @@ TAO_CEC_ProxyPullConsumer::connect_pull_supplier ( } // Notify the event channel... - this->event_channel_->connected (this TAO_ENV_ARG_PARAMETER); + this->event_channel_->connected (this ACE_ENV_ARG_PARAMETER); } void TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventComm::PullSupplier_var supplier; @@ -337,14 +337,14 @@ TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer ( } // Notify the event channel... - this->event_channel_->disconnected (this TAO_ENV_ARG_PARAMETER); + this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (this->event_channel_->disconnect_callbacks ()) { ACE_TRY { - supplier->disconnect_pull_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier->disconnect_pull_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -357,19 +357,19 @@ TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer ( } PortableServer::POA_ptr -TAO_CEC_ProxyPullConsumer::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ProxyPullConsumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_CEC_ProxyPullConsumer::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ProxyPullConsumer::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_incr_refcnt (); } void -TAO_CEC_ProxyPullConsumer::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ProxyPullConsumer::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_decr_refcnt (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h index 10c22bd458e..c02dc393684 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h @@ -53,10 +53,10 @@ public: virtual ~TAO_CEC_ProxyPullConsumer (void); /// Activate in the POA - virtual CosEventChannelAdmin::ProxyPullConsumer_ptr activate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosEventChannelAdmin::ProxyPullConsumer_ptr activate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Deactivate from the POA - virtual void deactivate (TAO_ENV_SINGLE_ARG_DECL) + virtual void deactivate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return 0 if no supplier is connected... @@ -68,8 +68,8 @@ public: /// Pulls from the supplier, verifies that it is connected. CORBA::Any* try_pull_from_supplier (CORBA::Boolean_out has_event - TAO_ENV_ARG_DECL); - CORBA::Any* pull_from_supplier (TAO_ENV_SINGLE_ARG_DECL); + ACE_ENV_ARG_DECL); + CORBA::Any* pull_from_supplier (ACE_ENV_SINGLE_ARG_DECL); /** * Invoke the _non_existent() pseudo-operation on the supplier. If @@ -77,10 +77,10 @@ public: * flag. */ CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// The event channel is shutting down - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); /// Increment and decrement the reference count. CORBA::ULong _incr_refcnt (void); @@ -89,16 +89,16 @@ public: // = The CosEventChannelAdmin::ProxyPullConsumer methods... virtual void connect_pull_supplier ( CosEventComm::PullSupplier_ptr pull_supplier - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected)); - virtual void disconnect_pull_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // = The Servant methods - virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); - virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); + virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); protected: /// Set the supplier, used by some implementations to change the diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp index 7f0c235a487..c9cf88c6059 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp @@ -31,13 +31,13 @@ TAO_CEC_ProxyPullSupplier::~TAO_CEC_ProxyPullSupplier (void) } CosEventChannelAdmin::ProxyPullSupplier_ptr -TAO_CEC_ProxyPullSupplier::activate (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_ProxyPullSupplier::activate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventChannelAdmin::ProxyPullSupplier_var result; ACE_TRY { - result = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + result = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -49,18 +49,18 @@ TAO_CEC_ProxyPullSupplier::activate (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_CEC_ProxyPullSupplier::deactivate (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_ProxyPullSupplier::deactivate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -74,7 +74,7 @@ TAO_CEC_ProxyPullSupplier::deactivate (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_CEC_ProxyPullSupplier::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_ProxyPullSupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL) { // Save the consumer we where connected to, we need to send a // disconnect message to it. @@ -90,7 +90,7 @@ TAO_CEC_ProxyPullSupplier::shutdown (TAO_ENV_SINGLE_ARG_DECL) consumer = this->consumer_._retn (); } - this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (consumer.in ())) @@ -98,7 +98,7 @@ TAO_CEC_ProxyPullSupplier::shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { - consumer->disconnect_pull_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer->disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -112,7 +112,7 @@ TAO_CEC_ProxyPullSupplier::shutdown (TAO_ENV_SINGLE_ARG_DECL) CORBA::Boolean TAO_CEC_ProxyPullSupplier::consumer_non_existent ( CORBA::Boolean_out disconnected - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD_THROW_EX ( ACE_Lock, ace_mon, *this->lock_, @@ -132,7 +132,7 @@ TAO_CEC_ProxyPullSupplier::consumer_non_existent ( } #if (TAO_HAS_MINIMUM_CORBA == 0) - return this->consumer_->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->consumer_->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); #else return 0; #endif /* TAO_HAS_MINIMUM_CORBA */ @@ -140,7 +140,7 @@ TAO_CEC_ProxyPullSupplier::consumer_non_existent ( void TAO_CEC_ProxyPullSupplier::push (const CORBA::Any &event - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (this->is_connected () == 0) return; @@ -154,7 +154,7 @@ TAO_CEC_ProxyPullSupplier::push (const CORBA::Any &event } CORBA::Any * -TAO_CEC_ProxyPullSupplier::pull (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_ProxyPullSupplier::pull (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosEventComm::Disconnected)) { @@ -176,7 +176,7 @@ TAO_CEC_ProxyPullSupplier::pull (TAO_ENV_SINGLE_ARG_DECL) CORBA::Any * TAO_CEC_ProxyPullSupplier::try_pull (CORBA::Boolean_out has_event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected)) { has_event = 0; @@ -232,7 +232,7 @@ TAO_CEC_ProxyPullSupplier::_decr_refcnt (void) void TAO_CEC_ProxyPullSupplier::connect_pull_consumer ( CosEventComm::PullConsumer_ptr pull_consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected)) { @@ -264,7 +264,7 @@ TAO_CEC_ProxyPullSupplier::connect_pull_consumer ( // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); ACE_CHECK; - this->event_channel_->reconnected (this TAO_ENV_ARG_PARAMETER); + this->event_channel_->reconnected (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; } return; @@ -276,12 +276,12 @@ TAO_CEC_ProxyPullSupplier::connect_pull_consumer ( } // Notify the event channel... - this->event_channel_->connected (this TAO_ENV_ARG_PARAMETER); + this->event_channel_->connected (this ACE_ENV_ARG_PARAMETER); } void TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventComm::PullConsumer_var consumer; @@ -302,7 +302,7 @@ TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier ( } // Notify the event channel.... - this->event_channel_->disconnected (this TAO_ENV_ARG_PARAMETER); + this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (consumer.in ())) @@ -312,7 +312,7 @@ TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier ( { ACE_TRY { - consumer->disconnect_pull_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer->disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -327,19 +327,19 @@ TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier ( } PortableServer::POA_ptr -TAO_CEC_ProxyPullSupplier::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ProxyPullSupplier::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_CEC_ProxyPullSupplier::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ProxyPullSupplier::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_incr_refcnt (); } void -TAO_CEC_ProxyPullSupplier::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ProxyPullSupplier::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_decr_refcnt (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h index a602d56a722..64627f44280 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h @@ -56,10 +56,10 @@ public: virtual ~TAO_CEC_ProxyPullSupplier (void); /// Activate in the POA - virtual CosEventChannelAdmin::ProxyPullSupplier_ptr activate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosEventChannelAdmin::ProxyPullSupplier_ptr activate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Deactivate from the POA - virtual void deactivate (TAO_ENV_SINGLE_ARG_DECL) + virtual void deactivate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return 0 if no consumer is connected... @@ -74,7 +74,7 @@ public: CosEventComm::PullConsumer_ptr consumer (void) const; /// The event channel is shutting down - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL); /** * Invoke the _non_existent() pseudo-operation on the consumer. If @@ -82,24 +82,24 @@ public: * flag. */ CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Push an event into the queue. void push (const CORBA::Any &event - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // = The CosEventChannelAdmin::ProxyPullSupplier methods... virtual void connect_pull_consumer ( CosEventComm::PullConsumer_ptr pull_consumer - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected)); - virtual CORBA::Any * pull (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CORBA::Any * pull (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected)); virtual CORBA::Any * try_pull (CORBA::Boolean_out has_event - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected)); - virtual void disconnect_pull_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_pull_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); /// Increment and decrement the reference count. @@ -107,9 +107,9 @@ public: CORBA::ULong _decr_refcnt (void); // = The Servant methods - virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); - virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL); - virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); + virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL); + virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL); protected: /// Set the consumer, used by some implementations to change the diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp index fde22699136..b76b417808e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp @@ -32,13 +32,13 @@ TAO_CEC_ProxyPushConsumer::~TAO_CEC_ProxyPushConsumer (void) } CosEventChannelAdmin::ProxyPushConsumer_ptr -TAO_CEC_ProxyPushConsumer::activate (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_ProxyPushConsumer::activate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventChannelAdmin::ProxyPushConsumer_var result; ACE_TRY { - result = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + result = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -50,18 +50,18 @@ TAO_CEC_ProxyPushConsumer::activate (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_CEC_ProxyPushConsumer::deactivate (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_ProxyPushConsumer::deactivate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -77,7 +77,7 @@ TAO_CEC_ProxyPushConsumer::deactivate (TAO_ENV_SINGLE_ARG_DECL) CORBA::Boolean TAO_CEC_ProxyPushConsumer::supplier_non_existent ( CORBA::Boolean_out disconnected - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD_THROW_EX ( ACE_Lock, ace_mon, *this->lock_, @@ -97,14 +97,14 @@ TAO_CEC_ProxyPushConsumer::supplier_non_existent ( } #if (TAO_HAS_MINIMUM_CORBA == 0) - return this->supplier_->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->supplier_->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); #else return 0; #endif /* TAO_HAS_MINIMUM_CORBA */ } void -TAO_CEC_ProxyPushConsumer::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_ProxyPushConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL) { CosEventComm::PushSupplier_var supplier; @@ -119,7 +119,7 @@ TAO_CEC_ProxyPushConsumer::shutdown (TAO_ENV_SINGLE_ARG_DECL) this->connected_ = 0; } - this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (supplier.in ())) @@ -127,7 +127,7 @@ TAO_CEC_ProxyPushConsumer::shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { - supplier->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -171,7 +171,7 @@ TAO_CEC_ProxyPushConsumer::_decr_refcnt (void) void TAO_CEC_ProxyPushConsumer::connect_push_supplier ( CosEventComm::PushSupplier_ptr push_supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected)) { @@ -202,7 +202,7 @@ TAO_CEC_ProxyPushConsumer::connect_push_supplier ( // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); ACE_CHECK; - this->event_channel_->disconnected (this TAO_ENV_ARG_PARAMETER); + this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -216,12 +216,12 @@ TAO_CEC_ProxyPushConsumer::connect_push_supplier ( } // Notify the event channel... - this->event_channel_->connected (this TAO_ENV_ARG_PARAMETER); + this->event_channel_->connected (this ACE_ENV_ARG_PARAMETER); } void TAO_CEC_ProxyPushConsumer::push (const CORBA::Any& event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_CEC_ProxyPushConsumer_Guard ace_mon (this->lock_, @@ -232,13 +232,13 @@ TAO_CEC_ProxyPushConsumer::push (const CORBA::Any& event return; this->event_channel_->consumer_admin ()->push (event - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_CEC_ProxyPushConsumer::disconnect_push_consumer ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventComm::PushSupplier_var supplier; @@ -259,7 +259,7 @@ TAO_CEC_ProxyPushConsumer::disconnect_push_consumer ( } // Notify the event channel... - this->event_channel_->disconnected (this TAO_ENV_ARG_PARAMETER); + this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (supplier.in ())) @@ -269,7 +269,7 @@ TAO_CEC_ProxyPushConsumer::disconnect_push_consumer ( { ACE_TRY { - supplier->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -282,19 +282,19 @@ TAO_CEC_ProxyPushConsumer::disconnect_push_consumer ( } PortableServer::POA_ptr -TAO_CEC_ProxyPushConsumer::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ProxyPushConsumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_CEC_ProxyPushConsumer::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ProxyPushConsumer::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_incr_refcnt (); } void -TAO_CEC_ProxyPushConsumer::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ProxyPushConsumer::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_decr_refcnt (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h index 433c5f71dee..11f903f48ed 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h @@ -53,10 +53,10 @@ public: virtual ~TAO_CEC_ProxyPushConsumer (void); /// Activate in the POA - virtual CosEventChannelAdmin::ProxyPushConsumer_ptr activate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosEventChannelAdmin::ProxyPushConsumer_ptr activate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Deactivate from the POA - virtual void deactivate (TAO_ENV_SINGLE_ARG_DECL) + virtual void deactivate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return 0 if no supplier is connected... @@ -72,10 +72,10 @@ public: * flag. */ CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// The event channel is shutting down - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); /// Increment and decrement the reference count. CORBA::ULong _incr_refcnt (void); @@ -84,19 +84,19 @@ public: // = The CosEventChannelAdmin::ProxyPushConsumer methods... virtual void connect_push_supplier ( CosEventComm::PushSupplier_ptr push_supplier - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected)); virtual void push (const CORBA::Any& event - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // = The Servant methods - virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); - virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); + virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); protected: /// Set the supplier, used by some implementations to change the diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp index e6b129f6bb3..e96d67bf03e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp @@ -32,13 +32,13 @@ TAO_CEC_ProxyPushSupplier::~TAO_CEC_ProxyPushSupplier (void) } CosEventChannelAdmin::ProxyPushSupplier_ptr -TAO_CEC_ProxyPushSupplier::activate (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_ProxyPushSupplier::activate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventChannelAdmin::ProxyPushSupplier_var result; ACE_TRY { - result = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + result = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -50,18 +50,18 @@ TAO_CEC_ProxyPushSupplier::activate (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_CEC_ProxyPushSupplier::deactivate (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_ProxyPushSupplier::deactivate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -75,7 +75,7 @@ TAO_CEC_ProxyPushSupplier::deactivate (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_CEC_ProxyPushSupplier::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_ProxyPushSupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL) { // Save the consumer we where connected to, we need to send a // disconnect message to it. @@ -91,7 +91,7 @@ TAO_CEC_ProxyPushSupplier::shutdown (TAO_ENV_SINGLE_ARG_DECL) consumer = this->consumer_._retn (); } - this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (consumer.in ())) @@ -99,7 +99,7 @@ TAO_CEC_ProxyPushSupplier::shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { - consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -114,7 +114,7 @@ typedef TAO_ESF_Proxy_RefCount_Guardrefcount_, this->event_channel_, @@ -134,7 +134,7 @@ TAO_CEC_ProxyPushSupplier::push (const CORBA::Any &event ACE_GUARD (TAO_CEC_Unlock, ace_mon, reverse_lock); this->event_channel_->dispatching ()->push (this, event - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -142,7 +142,7 @@ TAO_CEC_ProxyPushSupplier::push (const CORBA::Any &event void TAO_CEC_ProxyPushSupplier::push_nocopy (CORBA::Any &event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Destroy_Guard auto_destroy (this->refcount_, this->event_channel_, @@ -162,7 +162,7 @@ TAO_CEC_ProxyPushSupplier::push_nocopy (CORBA::Any &event ACE_GUARD (TAO_CEC_Unlock, ace_mon, reverse_lock); this->event_channel_->dispatching ()->push_nocopy (this, event - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -200,7 +200,7 @@ TAO_CEC_ProxyPushSupplier::_decr_refcnt (void) void TAO_CEC_ProxyPushSupplier::connect_push_consumer ( CosEventComm::PushConsumer_ptr push_consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected, CosEventChannelAdmin::TypeError)) @@ -236,7 +236,7 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer ( // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); ACE_CHECK; - this->event_channel_->reconnected (this TAO_ENV_ARG_PARAMETER); + this->event_channel_->reconnected (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; } return; @@ -247,12 +247,12 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer ( } // Notify the event channel... - this->event_channel_->connected (this TAO_ENV_ARG_PARAMETER); + this->event_channel_->connected (this ACE_ENV_ARG_PARAMETER); } void TAO_CEC_ProxyPushSupplier::disconnect_push_supplier ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventComm::PushConsumer_var consumer; @@ -273,14 +273,14 @@ TAO_CEC_ProxyPushSupplier::disconnect_push_supplier ( } // Notify the event channel.... - this->event_channel_->disconnected (this TAO_ENV_ARG_PARAMETER); + this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (this->event_channel_->disconnect_callbacks ()) { ACE_TRY { - consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -296,7 +296,7 @@ TAO_CEC_ProxyPushSupplier::disconnect_push_supplier ( void TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CosEventComm::PushConsumer_var consumer; { @@ -315,7 +315,7 @@ TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event ACE_TRY { - consumer->push (event TAO_ENV_ARG_PARAMETER); + consumer->push (event ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used) @@ -323,7 +323,7 @@ TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event TAO_CEC_ConsumerControl *control = this->event_channel_->consumer_control (); - control->consumer_not_exist (this TAO_ENV_ARG_PARAMETER); + control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) @@ -333,7 +333,7 @@ TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event control->system_exception (this, sysex - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -346,7 +346,7 @@ TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event void TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer ( const CORBA::Any& event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CosEventComm::PushConsumer_var consumer; { @@ -360,7 +360,7 @@ TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer ( ACE_TRY { - consumer->push (event TAO_ENV_ARG_PARAMETER); + consumer->push (event ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used) @@ -368,7 +368,7 @@ TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer ( TAO_CEC_ConsumerControl *control = this->event_channel_->consumer_control (); - control->consumer_not_exist (this TAO_ENV_ARG_PARAMETER); + control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) @@ -378,7 +378,7 @@ TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer ( control->system_exception (this, sysex - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -391,7 +391,7 @@ TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer ( CORBA::Boolean TAO_CEC_ProxyPushSupplier::consumer_non_existent ( CORBA::Boolean_out disconnected - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD_THROW_EX ( ACE_Lock, ace_mon, *this->lock_, @@ -407,26 +407,26 @@ TAO_CEC_ProxyPushSupplier::consumer_non_existent ( } #if (TAO_HAS_MINIMUM_CORBA == 0) - return this->consumer_->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->consumer_->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); #else return 0; #endif /* TAO_HAS_MINIMUM_CORBA */ } PortableServer::POA_ptr -TAO_CEC_ProxyPushSupplier::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ProxyPushSupplier::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_CEC_ProxyPushSupplier::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ProxyPushSupplier::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_incr_refcnt (); } void -TAO_CEC_ProxyPushSupplier::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ProxyPushSupplier::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_decr_refcnt (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h index a3bcddab675..c83f3ac5679 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h @@ -54,10 +54,10 @@ public: virtual ~TAO_CEC_ProxyPushSupplier (void); /// Activate in the POA - virtual CosEventChannelAdmin::ProxyPushSupplier_ptr activate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosEventChannelAdmin::ProxyPushSupplier_ptr activate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Deactivate from the POA - virtual void deactivate (TAO_ENV_SINGLE_ARG_DECL) + virtual void deactivate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return 0 if no consumer is connected... @@ -72,19 +72,19 @@ public: CosEventComm::PushConsumer_ptr consumer (void) const; /// The event channel is shutting down - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL); /// Internal methods to push an event to each consumer. virtual void push (const CORBA::Any &event - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (CORBA::Any &event - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Pushes to the consumer, verifies that it is connected. void push_to_consumer (const CORBA::Any &event - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void reactive_push_to_consumer (const CORBA::Any &event - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /** * Invoke the _non_existent() pseudo-operation on the consumer. If @@ -92,16 +92,16 @@ public: * flag. */ CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // = The CosEventChannelAdmin::ProxyPushSupplier methods... virtual void connect_push_consumer ( CosEventComm::PushConsumer_ptr push_consumer - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected, CosEventChannelAdmin::TypeError)); - virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); /// Increment and decrement the reference count. @@ -109,9 +109,9 @@ public: CORBA::ULong _decr_refcnt (void); // = The Servant methods - virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); - virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL); - virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); + virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL); + virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL); protected: /// Set the consumer, used by some implementations to change the diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h index 1b49e6ccb4c..17a9b861a61 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h @@ -51,11 +51,11 @@ public: #if 0 /// Some strategies may want to keep track of connected consumers. virtual void connected (TAO_CEC_ProxyPullConsumer * - TAO_ENV_ARG_DECL_NOT_USED) = 0; + ACE_ENV_ARG_DECL_NOT_USED) = 0; virtual void reconnected (TAO_CEC_ProxyPullConsumer * - TAO_ENV_ARG_DECL_NOT_USED) = 0; + ACE_ENV_ARG_DECL_NOT_USED) = 0; virtual void diconnected (TAO_CEC_ProxyPullConsumer * - TAO_ENV_ARG_DECL_NOT_USED) = 0; + ACE_ENV_ARG_DECL_NOT_USED) = 0; #endif /* 0 */ }; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp index 538bda35e5f..e69cc13e61d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp @@ -34,16 +34,16 @@ TAO_CEC_Reactive_ConsumerControl::~TAO_CEC_Reactive_ConsumerControl (void) void TAO_CEC_Reactive_ConsumerControl::query_consumers ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) { TAO_CEC_Ping_Push_Consumer push_worker (this); this->event_channel_->consumer_admin ()->for_each (&push_worker - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; TAO_CEC_Ping_Pull_Consumer pull_worker (this); this->event_channel_->consumer_admin ()->for_each (&pull_worker - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -59,26 +59,26 @@ TAO_CEC_Reactive_ConsumerControl::handle_timeout ( CORBA::PolicyTypeSeq types; CORBA::PolicyList_var policies = this->policy_current_->get_policy_overrides (types - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Change the timeout this->policy_current_->set_policy_overrides (this->policy_list_, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Query the state of the consumers... - this->query_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->query_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->policy_current_->set_policy_overrides (policies.in (), CORBA::SET_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (CORBA::ULong i = 0; i != policies->length (); ++i) { - policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -105,12 +105,12 @@ TAO_CEC_Reactive_ConsumerControl::activate (void) // Get the PolicyCurrent object CORBA::Object_var tmp = this->orb_->resolve_initial_references ("PolicyCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->policy_current_ = CORBA::PolicyCurrent::_narrow (tmp.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Pre-compute the policy list to the set the right timeout @@ -125,7 +125,7 @@ TAO_CEC_Reactive_ConsumerControl::activate (void) this->orb_->create_policy ( Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -148,11 +148,11 @@ TAO_CEC_Reactive_ConsumerControl::shutdown (void) void TAO_CEC_Reactive_ConsumerControl::consumer_not_exist ( TAO_CEC_ProxyPushSupplier *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { - proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -167,11 +167,11 @@ TAO_CEC_Reactive_ConsumerControl::consumer_not_exist ( void TAO_CEC_Reactive_ConsumerControl::consumer_not_exist ( TAO_CEC_ProxyPullSupplier *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { - proxy->disconnect_pull_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_pull_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -187,7 +187,7 @@ void TAO_CEC_Reactive_ConsumerControl::system_exception ( TAO_CEC_ProxyPushSupplier *proxy, CORBA::SystemException & /* exception */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -201,7 +201,7 @@ TAO_CEC_Reactive_ConsumerControl::system_exception ( // return; // Anything else is serious, including timeouts... - proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -232,24 +232,24 @@ TAO_CEC_ConsumerControl_Adapter::handle_timeout ( void TAO_CEC_Ping_Push_Consumer::work (TAO_CEC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { CORBA::Boolean disconnected; CORBA::Boolean non_existent = supplier->consumer_non_existent (disconnected - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (non_existent && !disconnected) { - this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER); + this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) { - this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER); + this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::TRANSIENT, transient) @@ -263,7 +263,7 @@ TAO_CEC_Ping_Push_Consumer::work (TAO_CEC_ProxyPushSupplier *supplier // && exception->minor () == 0x54410085) // return; - this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER); + this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -277,24 +277,24 @@ TAO_CEC_Ping_Push_Consumer::work (TAO_CEC_ProxyPushSupplier *supplier void TAO_CEC_Ping_Pull_Consumer::work (TAO_CEC_ProxyPullSupplier *supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { CORBA::Boolean disconnected; CORBA::Boolean non_existent = supplier->consumer_non_existent (disconnected - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (non_existent && !disconnected) { - this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER); + this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) { - this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER); + this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::TRANSIENT, transient) @@ -308,7 +308,7 @@ TAO_CEC_Ping_Pull_Consumer::work (TAO_CEC_ProxyPullSupplier *supplier // && exception->minor () == 0x54410085) // return; - this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER); + this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h index c6ab0973fdd..6020bc61659 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h @@ -86,17 +86,17 @@ public: virtual int activate (void); virtual int shutdown (void); virtual void consumer_not_exist (TAO_CEC_ProxyPushSupplier *proxy - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void consumer_not_exist (TAO_CEC_ProxyPullSupplier *proxy - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void system_exception (TAO_CEC_ProxyPushSupplier *proxy, CORBA::SystemException & - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); private: /// Check if the consumers still exists. It is a helper method for /// handle_timeout() to isolate the exceptions. - void query_consumers (TAO_ENV_SINGLE_ARG_DECL); + void query_consumers (ACE_ENV_SINGLE_ARG_DECL); private: /// The polling rate @@ -129,7 +129,7 @@ public: TAO_CEC_Ping_Push_Consumer (TAO_CEC_ConsumerControl *control); virtual void work (TAO_CEC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: TAO_CEC_ConsumerControl *control_; @@ -143,7 +143,7 @@ public: TAO_CEC_Ping_Pull_Consumer (TAO_CEC_ConsumerControl *control); virtual void work (TAO_CEC_ProxyPullSupplier *supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: TAO_CEC_ConsumerControl *control_; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp index 2270576d96a..fd272fcf314 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp @@ -42,29 +42,29 @@ TAO_CEC_Reactive_Pulling_Strategy::handle_timeout ( CORBA::PolicyTypeSeq types; CORBA::PolicyList_var policies = this->policy_current_->get_policy_overrides (types - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Change the timeout this->policy_current_->set_policy_overrides (this->policy_list_, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; TAO_CEC_Pull_Event worker (this->event_channel_->consumer_admin (), this->event_channel_->supplier_control ()); this->event_channel_->supplier_admin ()->for_each (&worker - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->policy_current_->set_policy_overrides (policies.in (), CORBA::SET_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (CORBA::ULong i = 0; i != policies->length (); ++i) { - policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -91,12 +91,12 @@ TAO_CEC_Reactive_Pulling_Strategy::activate (void) // Get the PolicyCurrent object CORBA::Object_var tmp = this->orb_->resolve_initial_references ("PolicyCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->policy_current_ = CORBA::PolicyCurrent::_narrow (tmp.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Pre-compute the policy list to the set the right timeout @@ -111,7 +111,7 @@ TAO_CEC_Reactive_Pulling_Strategy::activate (void) this->orb_->create_policy ( Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -149,7 +149,7 @@ TAO_CEC_Pulling_Strategy_Adapter::handle_timeout ( void TAO_CEC_Pull_Event::work (TAO_CEC_ProxyPullConsumer *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Boolean has_event = 0; CORBA::Any_var any; @@ -157,7 +157,7 @@ TAO_CEC_Pull_Event::work (TAO_CEC_ProxyPullConsumer *consumer ACE_TRY { any = consumer->try_pull_from_supplier (has_event - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -169,7 +169,7 @@ TAO_CEC_Pull_Event::work (TAO_CEC_ProxyPullConsumer *consumer if (has_event) { - this->consumer_admin_->push (any.in () TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->push (any.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h index e72af9018fd..77cdcb69b4e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h @@ -112,7 +112,7 @@ public: TAO_CEC_SupplierControl *control); virtual void work (TAO_CEC_ProxyPullConsumer *consumer - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: /// Used to propagate the events. diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp index 75651b761dc..c7a9465d8d9 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp @@ -35,16 +35,16 @@ TAO_CEC_Reactive_SupplierControl::~TAO_CEC_Reactive_SupplierControl (void) void TAO_CEC_Reactive_SupplierControl::query_suppliers ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) { TAO_CEC_Ping_Push_Supplier push_worker (this); this->event_channel_->supplier_admin ()->for_each (&push_worker - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; TAO_CEC_Ping_Pull_Supplier pull_worker (this); this->event_channel_->supplier_admin ()->for_each (&pull_worker - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -60,26 +60,26 @@ TAO_CEC_Reactive_SupplierControl::handle_timeout ( CORBA::PolicyTypeSeq types; CORBA::PolicyList_var policies = this->policy_current_->get_policy_overrides (types - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Change the timeout this->policy_current_->set_policy_overrides (this->policy_list_, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Query the state of the suppliers... - this->query_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->query_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->policy_current_->set_policy_overrides (policies.in (), CORBA::SET_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (CORBA::ULong i = 0; i != policies->length (); ++i) { - policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -106,12 +106,12 @@ TAO_CEC_Reactive_SupplierControl::activate (void) // Get the PolicyCurrent object CORBA::Object_var tmp = this->orb_->resolve_initial_references ("PolicyCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->policy_current_ = CORBA::PolicyCurrent::_narrow (tmp.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Pre-compute the policy list to the set the right timeout @@ -126,7 +126,7 @@ TAO_CEC_Reactive_SupplierControl::activate (void) this->orb_->create_policy ( Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -149,11 +149,11 @@ TAO_CEC_Reactive_SupplierControl::shutdown (void) void TAO_CEC_Reactive_SupplierControl::supplier_not_exist ( TAO_CEC_ProxyPushConsumer *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { - proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -166,11 +166,11 @@ TAO_CEC_Reactive_SupplierControl::supplier_not_exist ( void TAO_CEC_Reactive_SupplierControl::supplier_not_exist ( TAO_CEC_ProxyPullConsumer *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { - proxy->disconnect_pull_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -184,7 +184,7 @@ void TAO_CEC_Reactive_SupplierControl::system_exception ( TAO_CEC_ProxyPullConsumer *proxy, CORBA::SystemException & /* exception */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -198,7 +198,7 @@ TAO_CEC_Reactive_SupplierControl::system_exception ( // return; // Anything else is serious, including timeouts... - proxy->disconnect_pull_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -229,24 +229,24 @@ TAO_CEC_SupplierControl_Adapter::handle_timeout ( void TAO_CEC_Ping_Push_Supplier::work (TAO_CEC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { CORBA::Boolean disconnected; CORBA::Boolean non_existent = consumer->supplier_non_existent (disconnected - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (non_existent && !disconnected) { - this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER); + this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) { - this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER); + this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::TRANSIENT, transient) @@ -261,7 +261,7 @@ TAO_CEC_Ping_Push_Supplier::work (TAO_CEC_ProxyPushConsumer *consumer // return; // Anything else is serious, including timeouts... - this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER); + this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -275,24 +275,24 @@ TAO_CEC_Ping_Push_Supplier::work (TAO_CEC_ProxyPushConsumer *consumer void TAO_CEC_Ping_Pull_Supplier::work (TAO_CEC_ProxyPullConsumer *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { CORBA::Boolean disconnected; CORBA::Boolean non_existent = consumer->supplier_non_existent (disconnected - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (non_existent && !disconnected) { - this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER); + this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) { - this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER); + this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::TRANSIENT, transient) @@ -307,7 +307,7 @@ TAO_CEC_Ping_Pull_Supplier::work (TAO_CEC_ProxyPullConsumer *consumer // return; // Anything else is serious, including timeouts... - this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER); + this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h index 278d23130d8..f0a4ba4eba9 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h @@ -86,17 +86,17 @@ public: virtual int activate (void); virtual int shutdown (void); virtual void supplier_not_exist (TAO_CEC_ProxyPushConsumer *proxy - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void supplier_not_exist (TAO_CEC_ProxyPullConsumer *proxy - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void system_exception (TAO_CEC_ProxyPullConsumer *proxy, CORBA::SystemException & - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); private: /// Check if the suppliers still exists. It is a helper method for /// handle_timeout() to isolate the exceptions. - void query_suppliers (TAO_ENV_SINGLE_ARG_DECL); + void query_suppliers (ACE_ENV_SINGLE_ARG_DECL); private: /// The polling rate @@ -129,7 +129,7 @@ public: TAO_CEC_Ping_Push_Supplier (TAO_CEC_SupplierControl *control); virtual void work (TAO_CEC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: TAO_CEC_SupplierControl *control_; @@ -143,7 +143,7 @@ public: TAO_CEC_Ping_Pull_Supplier (TAO_CEC_SupplierControl *control); virtual void work (TAO_CEC_ProxyPullConsumer *consumer - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: TAO_CEC_SupplierControl *control_; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp index 7ec53139c38..fb7b6ba79aa 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp @@ -32,75 +32,75 @@ TAO_CEC_SupplierAdmin::~TAO_CEC_SupplierAdmin (void) } PortableServer::POA_ptr -TAO_CEC_SupplierAdmin::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_SupplierAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void TAO_CEC_SupplierAdmin::connected (TAO_CEC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->push_admin_.connected (consumer TAO_ENV_ARG_PARAMETER); + this->push_admin_.connected (consumer ACE_ENV_ARG_PARAMETER); } void TAO_CEC_SupplierAdmin::reconnected (TAO_CEC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->push_admin_.reconnected (consumer TAO_ENV_ARG_PARAMETER); + this->push_admin_.reconnected (consumer ACE_ENV_ARG_PARAMETER); } void TAO_CEC_SupplierAdmin::disconnected (TAO_CEC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->push_admin_.disconnected (consumer TAO_ENV_ARG_PARAMETER); + this->push_admin_.disconnected (consumer ACE_ENV_ARG_PARAMETER); } void TAO_CEC_SupplierAdmin::connected (TAO_CEC_ProxyPullConsumer *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->pull_admin_.connected (consumer TAO_ENV_ARG_PARAMETER); + this->pull_admin_.connected (consumer ACE_ENV_ARG_PARAMETER); } void TAO_CEC_SupplierAdmin::reconnected (TAO_CEC_ProxyPullConsumer *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->pull_admin_.reconnected (consumer TAO_ENV_ARG_PARAMETER); + this->pull_admin_.reconnected (consumer ACE_ENV_ARG_PARAMETER); } void TAO_CEC_SupplierAdmin::disconnected (TAO_CEC_ProxyPullConsumer *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->pull_admin_.disconnected (consumer TAO_ENV_ARG_PARAMETER); + this->pull_admin_.disconnected (consumer ACE_ENV_ARG_PARAMETER); } void -TAO_CEC_SupplierAdmin::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_SupplierAdmin::shutdown (ACE_ENV_SINGLE_ARG_DECL) { - this->push_admin_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->push_admin_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->pull_admin_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->pull_admin_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } CosEventChannelAdmin::ProxyPushConsumer_ptr -TAO_CEC_SupplierAdmin::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_SupplierAdmin::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->push_admin_.obtain (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->push_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER); } CosEventChannelAdmin::ProxyPullConsumer_ptr -TAO_CEC_SupplierAdmin::obtain_pull_consumer (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_SupplierAdmin::obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->pull_admin_.obtain (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->pull_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER); } // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h index 5dbc4252c95..c9a06913059 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h @@ -58,40 +58,40 @@ public: /// For each elements call work()>. void for_each (TAO_ESF_Worker *worker - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// For each elements call work()>. void for_each (TAO_ESF_Worker *worker - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Keep track of connected consumers. virtual void connected (TAO_CEC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void reconnected (TAO_CEC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void disconnected (TAO_CEC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void connected (TAO_CEC_ProxyPullConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void reconnected (TAO_CEC_ProxyPullConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void disconnected (TAO_CEC_ProxyPullConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); /// The event channel is shutting down, inform all the consumers of /// this - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); // = The CosEventChannelAdmin::SupplierAdmin methods... virtual CosEventChannelAdmin::ProxyPushConsumer_ptr - obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CosEventChannelAdmin::ProxyPullConsumer_ptr - obtain_pull_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // = The PortableServer::ServantBase methods - virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); private: /// The Event Channel we belong to diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i index 43b2cfbab3d..dc20a41a684 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i @@ -3,15 +3,15 @@ ACE_INLINE void TAO_CEC_SupplierAdmin:: for_each (TAO_ESF_Worker *worker - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->push_admin_.for_each (worker TAO_ENV_ARG_PARAMETER); + this->push_admin_.for_each (worker ACE_ENV_ARG_PARAMETER); } ACE_INLINE void TAO_CEC_SupplierAdmin:: for_each (TAO_ESF_Worker *worker - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->pull_admin_.for_each (worker TAO_ENV_ARG_PARAMETER); + this->pull_admin_.for_each (worker ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp index c0856651a75..c87f08c65aa 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp @@ -30,20 +30,20 @@ TAO_CEC_SupplierControl::shutdown (void) void TAO_CEC_SupplierControl::supplier_not_exist (TAO_CEC_ProxyPushConsumer * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_CEC_SupplierControl::supplier_not_exist (TAO_CEC_ProxyPullConsumer * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_CEC_SupplierControl::system_exception (TAO_CEC_ProxyPullConsumer *, CORBA::SystemException & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h index 6e92fbcda70..5374a09b73d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h @@ -63,7 +63,7 @@ public: * CORBA::OBJECT_NOT_EXIST exception has been raised). */ virtual void supplier_not_exist (TAO_CEC_ProxyPushConsumer *proxy - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); /** * Invoked by helper classes when they detect that a supplier does @@ -71,12 +71,12 @@ public: * CORBA::OBJECT_NOT_EXIST exception has been raised). */ virtual void supplier_not_exist (TAO_CEC_ProxyPullConsumer *proxy - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); /// Some system exception was rasied while trying to push an event. virtual void system_exception (TAO_CEC_ProxyPullConsumer *proxy, CORBA::SystemException & - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp index 011fe07d0ea..44b02a11e47 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp @@ -29,7 +29,7 @@ TAO_ESF_Copy_On_Read:: template void TAO_ESF_Copy_On_Read:: for_each (TAO_ESF_Worker *worker - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // @@ Use an allocator for this memory... PROXY **proxies = 0; @@ -58,7 +58,7 @@ TAO_ESF_Copy_On_Read:: for (PROXY **j = proxies; j != proxies + size; ++j) { - worker->work (*j TAO_ENV_ARG_PARAMETER); + worker->work (*j ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; (*j)->_decr_refcnt (); } @@ -81,42 +81,42 @@ TAO_ESF_Copy_On_Read:: template void TAO_ESF_Copy_On_Read:: connected (PROXY *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); proxy->_incr_refcnt (); - this->collection_.connected (proxy TAO_ENV_ARG_PARAMETER); + this->collection_.connected (proxy ACE_ENV_ARG_PARAMETER); } template void TAO_ESF_Copy_On_Read:: reconnected (PROXY *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); proxy->_incr_refcnt (); - this->collection_.reconnected (proxy TAO_ENV_ARG_PARAMETER); + this->collection_.reconnected (proxy ACE_ENV_ARG_PARAMETER); } template void TAO_ESF_Copy_On_Read:: disconnected (PROXY *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); - this->collection_.disconnected (proxy TAO_ENV_ARG_PARAMETER); + this->collection_.disconnected (proxy ACE_ENV_ARG_PARAMETER); } template void TAO_ESF_Copy_On_Read:: - shutdown (TAO_ENV_SINGLE_ARG_DECL) + shutdown (ACE_ENV_SINGLE_ARG_DECL) { ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); - this->collection_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->collection_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); } #endif /* TAO_ESF_COPY_ON_READ_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h index 5f1b3e1e100..98578fe4fb5 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h @@ -41,14 +41,14 @@ public: // = The TAO_ESF_Proxy_Collection methods virtual void for_each (TAO_ESF_Worker *worker - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void connected (PROXY *proxy - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void reconnected (PROXY *proxy - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void disconnected (PROXY *proxy - TAO_ENV_ARG_DECL); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); + ACE_ENV_ARG_DECL); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL); private: COLLECTION collection_; diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp index 1ecba5d20e3..160bd3cabc4 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp @@ -66,7 +66,7 @@ TAO_ESF_Copy_On_Write:: template void TAO_ESF_Copy_On_Write:: for_each (TAO_ESF_Worker *worker - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Read_Guard ace_mon (this->mutex_, this->collection_); @@ -74,7 +74,7 @@ TAO_ESF_Copy_On_Write:: ITERATOR end = ace_mon.collection->collection.end (); for (ITERATOR i = ace_mon.collection->collection.begin (); i != end; ++i) { - worker->work (*i TAO_ENV_ARG_PARAMETER); + worker->work (*i ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -82,7 +82,7 @@ TAO_ESF_Copy_On_Write:: template void TAO_ESF_Copy_On_Write:: connected (PROXY *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Write_Guard ace_mon (this->mutex_, this->cond_, @@ -91,13 +91,13 @@ TAO_ESF_Copy_On_Write:: this->collection_); proxy->_incr_refcnt (); - ace_mon.copy->collection.connected (proxy TAO_ENV_ARG_PARAMETER); + ace_mon.copy->collection.connected (proxy ACE_ENV_ARG_PARAMETER); } template void TAO_ESF_Copy_On_Write:: reconnected (PROXY *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Write_Guard ace_mon (this->mutex_, this->cond_, @@ -106,13 +106,13 @@ TAO_ESF_Copy_On_Write:: this->collection_); proxy->_incr_refcnt (); - ace_mon.copy->collection.reconnected (proxy TAO_ENV_ARG_PARAMETER); + ace_mon.copy->collection.reconnected (proxy ACE_ENV_ARG_PARAMETER); } template void TAO_ESF_Copy_On_Write:: disconnected (PROXY *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Write_Guard ace_mon (this->mutex_, this->cond_, @@ -120,12 +120,12 @@ TAO_ESF_Copy_On_Write:: this->writing_, this->collection_); - ace_mon.copy->collection.disconnected (proxy TAO_ENV_ARG_PARAMETER); + ace_mon.copy->collection.disconnected (proxy ACE_ENV_ARG_PARAMETER); } template void TAO_ESF_Copy_On_Write:: - shutdown (TAO_ENV_SINGLE_ARG_DECL) + shutdown (ACE_ENV_SINGLE_ARG_DECL) { // We need to perform a copy to follow the protocol. Write_Guard ace_mon (this->mutex_, @@ -134,7 +134,7 @@ TAO_ESF_Copy_On_Write:: this->writing_, this->collection_); - ace_mon.copy->collection.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + ace_mon.copy->collection.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); } template diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h index 8e646428cb0..52f2303f730 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h @@ -126,14 +126,14 @@ public: // = The TAO_ESF_Proxy methods virtual void for_each (TAO_ESF_Worker *worker - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void connected (PROXY *proxy - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void reconnected (PROXY *proxy - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void disconnected (PROXY *proxy - TAO_ENV_ARG_DECL); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); + ACE_ENV_ARG_DECL); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL); private: typedef TAO_ESF_Copy_On_Write_Collection Collection; diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp index 564e6d08805..3344bc33cab 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp @@ -46,14 +46,14 @@ TAO_ESF_Delayed_Changes:: template void TAO_ESF_Delayed_Changes:: for_each (TAO_ESF_Worker *worker - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD (Busy_Lock, ace_mon, this->lock_); ITERATOR end = this->collection_.end (); for (ITERATOR i = this->collection_.begin (); i != end; ++i) { - worker->work (*i TAO_ENV_ARG_PARAMETER); + worker->work (*i ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -108,7 +108,7 @@ TAO_ESF_Delayed_Changes:: template void TAO_ESF_Delayed_Changes:: connected (PROXY *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_, CORBA::INTERNAL ()); @@ -118,7 +118,7 @@ TAO_ESF_Delayed_Changes:: if (this->busy_count_ == 0) { // We can add the object immediately - this->connected_i (proxy TAO_ENV_ARG_PARAMETER); + this->connected_i (proxy ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else @@ -135,7 +135,7 @@ TAO_ESF_Delayed_Changes:: template void TAO_ESF_Delayed_Changes:: reconnected (PROXY *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_, CORBA::INTERNAL ()); @@ -145,7 +145,7 @@ TAO_ESF_Delayed_Changes:: if (this->busy_count_ == 0) { // We can reconnect the object immediately - this->reconnected_i (proxy TAO_ENV_ARG_PARAMETER); + this->reconnected_i (proxy ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else @@ -162,7 +162,7 @@ TAO_ESF_Delayed_Changes:: template void TAO_ESF_Delayed_Changes:: disconnected (PROXY *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_, CORBA::INTERNAL ()); @@ -171,7 +171,7 @@ TAO_ESF_Delayed_Changes:: if (this->busy_count_ == 0) { // We can remove the object immediately - this->disconnected_i (proxy TAO_ENV_ARG_PARAMETER); + this->disconnected_i (proxy ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else @@ -187,7 +187,7 @@ TAO_ESF_Delayed_Changes:: template void TAO_ESF_Delayed_Changes:: - shutdown (TAO_ENV_SINGLE_ARG_DECL) + shutdown (ACE_ENV_SINGLE_ARG_DECL) { ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_, CORBA::INTERNAL ()); @@ -196,7 +196,7 @@ TAO_ESF_Delayed_Changes:: if (this->busy_count_ == 0) { // We can shutdown the object immediately - this->shutdown_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->shutdown_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } else diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h index 7c28ba64540..175066320f3 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h @@ -93,12 +93,12 @@ public: int execute_delayed_operations (void); void connected_i (PROXY *proxy - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void reconnected_i (PROXY *proxy - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void disconnected_i (PROXY *proxy - TAO_ENV_ARG_DECL); - void shutdown_i (TAO_ENV_SINGLE_ARG_DECL); + ACE_ENV_ARG_DECL); + void shutdown_i (ACE_ENV_SINGLE_ARG_DECL); typedef TAO_ESF_Connected_Command,PROXY> Connected_Command; typedef TAO_ESF_Reconnected_Command,PROXY> Reconnected_Command; @@ -107,14 +107,14 @@ public: // = The TAO_ESF_Proxy methods virtual void for_each (TAO_ESF_Worker *worker - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void connected (PROXY *proxy - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void reconnected (PROXY *proxy - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void disconnected (PROXY *proxy - TAO_ENV_ARG_DECL); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); + ACE_ENV_ARG_DECL); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL); private: COLLECTION collection_; diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i index 964625575f9..7ba390a202f 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i @@ -3,30 +3,30 @@ template void TAO_ESF_Delayed_Changes:: connected_i (PROXY *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->collection_.connected (proxy TAO_ENV_ARG_PARAMETER); + this->collection_.connected (proxy ACE_ENV_ARG_PARAMETER); } template void TAO_ESF_Delayed_Changes:: reconnected_i (PROXY *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->collection_.reconnected (proxy TAO_ENV_ARG_PARAMETER); + this->collection_.reconnected (proxy ACE_ENV_ARG_PARAMETER); } template void TAO_ESF_Delayed_Changes:: disconnected_i (PROXY *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->collection_.disconnected (proxy TAO_ENV_ARG_PARAMETER); + this->collection_.disconnected (proxy ACE_ENV_ARG_PARAMETER); } template void TAO_ESF_Delayed_Changes:: - shutdown_i (TAO_ENV_SINGLE_ARG_DECL) + shutdown_i (ACE_ENV_SINGLE_ARG_DECL) { - this->collection_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->collection_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp index 89fa3596658..631c41190c6 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp @@ -18,16 +18,16 @@ TAO_ESF_Connected_Command::execute (void* arg) { if (arg != 0) { - TAO_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV = + ACE_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV = *ACE_static_cast(CORBA::Environment*, arg)); this->target_->connected_i (this->object_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } else { - TAO_ENV_EMIT_CODE (TAO_ENV_DECLARE_NEW_ENV); + ACE_ENV_EMIT_CODE (ACE_DECLARE_NEW_CORBA_ENV); this->target_->connected_i (this->object_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } return 0; @@ -40,16 +40,16 @@ TAO_ESF_Reconnected_Command::execute (void* arg) { if (arg != 0) { - TAO_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV = + ACE_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV = *ACE_static_cast(CORBA::Environment*, arg)); this->target_->reconnected_i (this->object_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } else { - TAO_ENV_EMIT_CODE (TAO_ENV_DECLARE_NEW_ENV); + ACE_ENV_EMIT_CODE (ACE_DECLARE_NEW_CORBA_ENV); this->target_->reconnected_i (this->object_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } return 0; } @@ -61,16 +61,16 @@ TAO_ESF_Disconnected_Command::execute (void* arg) { if (arg != 0) { - TAO_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV = + ACE_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV = *ACE_static_cast(CORBA::Environment*, arg)); this->target_->disconnected_i (this->object_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } else { - TAO_ENV_EMIT_CODE (TAO_ENV_DECLARE_NEW_ENV); + ACE_ENV_EMIT_CODE (ACE_DECLARE_NEW_CORBA_ENV); this->target_->disconnected_i (this->object_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } return 0; } @@ -82,14 +82,14 @@ TAO_ESF_Shutdown_Command::execute (void* arg) { if (arg != 0) { - TAO_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV = + ACE_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV = *ACE_static_cast(CORBA::Environment*, arg)); - this->target_->shutdown_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->target_->shutdown_i (ACE_ENV_SINGLE_ARG_PARAMETER); } else { - TAO_ENV_EMIT_CODE (TAO_ENV_DECLARE_NEW_ENV); - this->target_->shutdown_i (TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_ENV_EMIT_CODE (ACE_DECLARE_NEW_CORBA_ENV); + this->target_->shutdown_i (ACE_ENV_SINGLE_ARG_PARAMETER); } return 0; } diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp index 2fc47be1f6c..28d63858848 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp @@ -31,14 +31,14 @@ TAO_ESF_Immediate_Changes:: template void TAO_ESF_Immediate_Changes:: for_each (TAO_ESF_Worker *worker - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); ITERATOR end = this->collection_.end (); for (ITERATOR i = this->collection_.begin (); i != end; ++i) { - worker->work ((*i) TAO_ENV_ARG_PARAMETER); + worker->work ((*i) ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h index db5b6b2563a..8d08c77b968 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h @@ -33,14 +33,14 @@ public: // = The TAO_ESF_Proxy methods virtual void for_each (TAO_ESF_Worker *worker - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void connected (PROXY *proxy - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void reconnected (PROXY *proxy - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void disconnected (PROXY *proxy - TAO_ENV_ARG_DECL); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); + ACE_ENV_ARG_DECL); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL); private: COLLECTION collection_; diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i index 21bf4981b67..d90394ed395 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i @@ -3,40 +3,40 @@ template void TAO_ESF_Immediate_Changes:: connected (PROXY *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); proxy->_incr_refcnt (); - this->collection_.connected (proxy TAO_ENV_ARG_PARAMETER); + this->collection_.connected (proxy ACE_ENV_ARG_PARAMETER); } template void TAO_ESF_Immediate_Changes:: reconnected (PROXY *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); proxy->_incr_refcnt (); - this->collection_.reconnected (proxy TAO_ENV_ARG_PARAMETER); + this->collection_.reconnected (proxy ACE_ENV_ARG_PARAMETER); } template void TAO_ESF_Immediate_Changes:: disconnected (PROXY *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); - this->collection_.disconnected (proxy TAO_ENV_ARG_PARAMETER); + this->collection_.disconnected (proxy ACE_ENV_ARG_PARAMETER); } template void TAO_ESF_Immediate_Changes:: - shutdown (TAO_ENV_SINGLE_ARG_DECL) + shutdown (ACE_ENV_SINGLE_ARG_DECL) { ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); - this->collection_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->collection_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp index 21123fd2cd9..c514674fda3 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp @@ -29,34 +29,34 @@ TAO_ESF_Peer_Admin:: template void TAO_ESF_Peer_Admin:: peer_connected (PEER *peer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ESF_Peer_Connected worker (peer); - this->for_each (&worker TAO_ENV_ARG_PARAMETER); + this->for_each (&worker ACE_ENV_ARG_PARAMETER); } template void TAO_ESF_Peer_Admin:: peer_reconnected (PEER *peer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ESF_Peer_Reconnected worker (peer); - this->for_each (&worker TAO_ENV_ARG_PARAMETER); + this->for_each (&worker ACE_ENV_ARG_PARAMETER); } template void TAO_ESF_Peer_Admin:: peer_disconnected (PEER *peer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ESF_Peer_Disconnected worker (peer); - this->for_each (&worker TAO_ENV_ARG_PARAMETER); + this->for_each (&worker ACE_ENV_ARG_PARAMETER); } #endif /* TAO_ESF_PEER_ADMIN_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h index 256e342e17a..646fab48906 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h @@ -38,17 +38,17 @@ * the PROXY interface must implement: * * @verbatim - * void connected (PEER *peer TAO_ENV_ARG_DECL_NOT_USED) throw (); - * void reconnected (PEER *peer TAO_ENV_ARG_DECL_NOT_USED) throw (); - * void disconnected (PEER *peer TAO_ENV_ARG_DECL_NOT_USED) throw (); + * void connected (PEER *peer ACE_ENV_ARG_DECL_NOT_USED) throw (); + * void reconnected (PEER *peer ACE_ENV_ARG_DECL_NOT_USED) throw (); + * void disconnected (PEER *peer ACE_ENV_ARG_DECL_NOT_USED) throw (); * @endverbatim * * Similarly, the PEER interface must implement: * * @verbatim - * void connected (PROXY *proxy TAO_ENV_ARG_DECL_NOT_USED) throw (); - * void reconnected (PROXY *proxy TAO_ENV_ARG_DECL_NOT_USED) throw (); - * void disconnected (PROXY *proxy TAO_ENV_ARG_DECL_NOT_USED) throw (); + * void connected (PROXY *proxy ACE_ENV_ARG_DECL_NOT_USED) throw (); + * void reconnected (PROXY *proxy ACE_ENV_ARG_DECL_NOT_USED) throw (); + * void disconnected (PROXY *proxy ACE_ENV_ARG_DECL_NOT_USED) throw (); * @endverbatim */ template @@ -67,7 +67,7 @@ public: * The default implementation is a no-op. */ virtual void peer_connected (PEER *peer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -77,7 +77,7 @@ public: * method */ virtual void peer_reconnected (PEER *peer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -86,7 +86,7 @@ public: * proxy. */ virtual void peer_disconnected (PEER *peer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp index 81f2ea5d27a..ad0678ae0a7 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp @@ -13,12 +13,12 @@ ACE_RCSID(ESF, ESF_Peer_Workers, "$Id$") template void TAO_ESF_Peer_Connected::work (P *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - proxy->connected (this->peer_ TAO_ENV_ARG_PARAMETER); + proxy->connected (this->peer_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Shouldn't happen, just following the discipline - this->peer_->connected (proxy TAO_ENV_ARG_PARAMETER); + this->peer_->connected (proxy ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Shouldn't happen, just following the discipline } @@ -26,12 +26,12 @@ TAO_ESF_Peer_Connected::work (P *proxy template void TAO_ESF_Peer_Reconnected::work (P *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - proxy->reconnected (this->peer_ TAO_ENV_ARG_PARAMETER); + proxy->reconnected (this->peer_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Shouldn't happen, just following the discipline - this->peer_->reconnected (proxy TAO_ENV_ARG_PARAMETER); + this->peer_->reconnected (proxy ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Shouldn't happen, just following the discipline } @@ -39,12 +39,12 @@ TAO_ESF_Peer_Reconnected::work (P *proxy template void TAO_ESF_Peer_Disconnected::work (P *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - proxy->disconnected (this->peer_ TAO_ENV_ARG_PARAMETER); + proxy->disconnected (this->peer_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Shouldn't happen, just following the discipline - this->peer_->disconnected (proxy TAO_ENV_ARG_PARAMETER); + this->peer_->disconnected (proxy ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Shouldn't happen, just following the discipline } diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h index e69984da721..9998a29d19f 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h @@ -33,7 +33,7 @@ public: TAO_ESF_Peer_Connected (PEER *peer); void work (PROXY *proxy - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: PEER* peer_; @@ -56,7 +56,7 @@ public: TAO_ESF_Peer_Reconnected (PEER *peer); void work (PROXY *proxy - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: PEER* peer_; @@ -79,7 +79,7 @@ public: TAO_ESF_Peer_Disconnected (PEER *peer); void work (PROXY *proxy - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: PEER* peer_; diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp index 062b06869aa..a4bbb416902 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp @@ -30,7 +30,7 @@ TAO_ESF_Proxy_Admin:: template INTERFACE* TAO_ESF_Proxy_Admin:: - obtain (TAO_ENV_SINGLE_ARG_DECL) + obtain (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PROXY* proxy; @@ -39,10 +39,10 @@ TAO_ESF_Proxy_Admin:: PortableServer::ServantBase_var holder = proxy; ACE_TYPENAME PROXY::_var_type result = - proxy->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (INTERFACE::_nil ()); - this->collection_->connected (proxy TAO_ENV_ARG_PARAMETER); + this->collection_->connected (proxy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (INTERFACE::_nil ()); return result._retn (); @@ -50,21 +50,21 @@ TAO_ESF_Proxy_Admin:: template void TAO_ESF_Proxy_Admin:: - shutdown (TAO_ENV_SINGLE_ARG_DECL) + shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ESF_Shutdown_Proxy worker; - this->collection_->for_each (&worker TAO_ENV_ARG_PARAMETER); + this->collection_->for_each (&worker ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Cannot happen, just following the discipline. - this->collection_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->collection_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); } template void TAO_ESF_Proxy_Admin:: connected (PROXY * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -72,24 +72,24 @@ TAO_ESF_Proxy_Admin:: template void TAO_ESF_Proxy_Admin:: reconnected (PROXY *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->collection_->reconnected (proxy TAO_ENV_ARG_PARAMETER); + this->collection_->reconnected (proxy ACE_ENV_ARG_PARAMETER); } template void TAO_ESF_Proxy_Admin:: disconnected (PROXY *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - proxy->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Cannot happen, just following the discipline. ACE_TRY { - this->collection_->disconnected (proxy TAO_ENV_ARG_PARAMETER); + this->collection_->disconnected (proxy ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h index a76275f083b..dfe39ce311e 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h @@ -53,7 +53,7 @@ * // The T_var for the IDL interface implemented by the PROXY. * * PROXY::_ptr_type - * PROXY::activate (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) throw (); + * PROXY::activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) throw (); * // activate the proxy and return the object reference * @endverbatim * @@ -70,7 +70,7 @@ public: /// Iterate over its internal collection. void for_each (TAO_ESF_Worker *worker - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // @TODO We should use INTERFACE::_ptr_type or PROXY::_ptr_type, but @@ -80,7 +80,7 @@ public: // code is supposed to run under TAO only. /// Create a new PROXY and activate it. virtual INTERFACE* - obtain (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + obtain (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -88,7 +88,7 @@ public: * down. Invoke on all the proxies, cleanup the * collection and prepare to terminate. */ - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -97,7 +97,7 @@ public: * The default implementation is a no-op. */ virtual void connected (PROXY *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -107,7 +107,7 @@ public: * method */ virtual void reconnected (PROXY *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -116,7 +116,7 @@ public: * proxy. */ virtual void disconnected (PROXY *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i index be00cdad82e..9eec0894754 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i @@ -3,8 +3,8 @@ template ACE_INLINE void TAO_ESF_Proxy_Admin:: for_each (TAO_ESF_Worker

*worker - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->collection_->for_each (worker TAO_ENV_ARG_PARAMETER); + this->collection_->for_each (worker ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h index b04cbe9f3b7..0337ec87245 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h @@ -129,12 +129,12 @@ public: * This encapsulates */ virtual void for_each (TAO_ESF_Worker *worker - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; /// Insert a new element into the collection. The collection assumes /// ownership of the element. virtual void connected (PROXY *proxy - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; /** * Insert an element into the collection. No errors can be raised @@ -144,14 +144,14 @@ public: * collection. */ virtual void reconnected (PROXY *proxy - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; /// Remove an element from the collection. virtual void disconnected (PROXY *proxy - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; /// The EC is shutting down, must release all the elements. - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) = 0; + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) = 0; }; // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp index e871ce15a7d..04702e9feed 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp @@ -19,7 +19,7 @@ TAO_ESF_Proxy_List:: template void TAO_ESF_Proxy_List::connected (PROXY *proxy - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { int r = this->impl_.insert (proxy); if (r == 0) @@ -40,7 +40,7 @@ TAO_ESF_Proxy_List::connected (PROXY *proxy template void TAO_ESF_Proxy_List::reconnected (PROXY *proxy - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { int r = this->impl_.insert (proxy); if (r == 0) @@ -65,7 +65,7 @@ TAO_ESF_Proxy_List::reconnected (PROXY *proxy template void TAO_ESF_Proxy_List::disconnected (PROXY *proxy - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { int r = this->impl_.remove (proxy); if (r != 0) @@ -78,7 +78,7 @@ TAO_ESF_Proxy_List::disconnected (PROXY *proxy } template void -TAO_ESF_Proxy_List::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ESF_Proxy_List::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { Iterator end = this->impl_.end (); for (Iterator i = this->impl_.begin (); i != end; ++i) diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h index 85d6d3f9914..4a2410b1a70 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h @@ -50,19 +50,19 @@ public: /// Insert a new element to the collection void connected (PROXY * - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); /// Insert a new element that could be there already. void reconnected (PROXY * - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); /// Remove an element from the collection void disconnected (PROXY * - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); /// Shutdown the collection, i.e. remove all elements and release /// resources - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); private: /// The underlying implementation object diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp index 002cc934635..9e6993882d8 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp @@ -19,7 +19,7 @@ TAO_ESF_Proxy_RB_Tree:: template void TAO_ESF_Proxy_RB_Tree::connected (PROXY *proxy - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { int r = this->impl_.bind (proxy, 1); if (r == 0) @@ -40,7 +40,7 @@ TAO_ESF_Proxy_RB_Tree::connected (PROXY *proxy template void TAO_ESF_Proxy_RB_Tree::reconnected (PROXY *proxy - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { int r = this->impl_.rebind (proxy, 1); if (r == 0) @@ -63,7 +63,7 @@ TAO_ESF_Proxy_RB_Tree::reconnected (PROXY *proxy template void TAO_ESF_Proxy_RB_Tree::disconnected (PROXY *proxy - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { int r = this->impl_.unbind (proxy); if (r != 0) @@ -76,7 +76,7 @@ TAO_ESF_Proxy_RB_Tree::disconnected (PROXY *proxy } template void -TAO_ESF_Proxy_RB_Tree::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ESF_Proxy_RB_Tree::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { Iterator end = this->impl_.end (); for (Iterator i = this->impl_.begin (); i != end; ++i) diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h index c957b46209a..ccaa98f8010 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h @@ -74,18 +74,18 @@ public: /// Insert a new element to the collection void connected (PROXY * - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); /// Insert a new element that could be there already. void reconnected (PROXY * - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); /// Remove an element from the collection void disconnected (PROXY * - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); /// Shutdown the collection, i.e. remove all elements and release /// resources - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); private: /// The underlying implementation object diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp index 21627fef89f..6058198ef9e 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp @@ -13,11 +13,11 @@ ACE_RCSID(ESF, ESF_Shutdown_Proxy, "$Id$") template void TAO_ESF_Shutdown_Proxy::work (PROXY *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { - proxy->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h index 69b3de4dc73..feffd2ccb3a 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h @@ -27,7 +27,7 @@ public: TAO_ESF_Shutdown_Proxy (void); void work (PROXY *proxy - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); }; // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h index c555be82e53..fe282efe565 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h @@ -35,7 +35,7 @@ public: /// Callback interface. virtual void work (Object *object - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp index 77181c7c351..dd3d08881af 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp @@ -41,7 +41,7 @@ TAO_ETCL_Literal_Constraint::TAO_ETCL_Literal_Constraint (CORBA::Any * any) CORBA::TCKind corba_type = CORBA::tk_null; ACE_TRY { - corba_type = type->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + corba_type = type->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -59,14 +59,14 @@ TAO_ETCL_Literal_Constraint::TAO_ETCL_Literal_Constraint (CORBA::Any * any) this->op_.integer_ = 0; if (corba_type == CORBA::tk_short) - { - CORBA::Short sh; - any_ref >>= sh; - this->op_.integer_ = (CORBA::Long) sh; - } + { + CORBA::Short sh; + any_ref >>= sh; + this->op_.integer_ = (CORBA::Long) sh; + } else { - any_ref >>= this->op_.integer_; + any_ref >>= this->op_.integer_; } break; @@ -74,24 +74,24 @@ TAO_ETCL_Literal_Constraint::TAO_ETCL_Literal_Constraint (CORBA::Any * any) this->op_.uinteger_ = 0; if (corba_type == CORBA::tk_ushort) - { - CORBA::UShort sh; - any_ref >>= sh; - this->op_.uinteger_ = (CORBA::ULong) sh; - } + { + CORBA::UShort sh; + any_ref >>= sh; + this->op_.uinteger_ = (CORBA::ULong) sh; + } else { - any_ref >>= this->op_.uinteger_; + any_ref >>= this->op_.uinteger_; } break; case TAO_ETCL_DOUBLE: if (corba_type == CORBA::tk_float) - { - CORBA::Float fl; + { + CORBA::Float fl; (*any) >>= fl; - this->op_.double_ = (CORBA::Double) fl; - } + this->op_.double_ = (CORBA::Double) fl; + } else { (*any) >>= this->op_.double_; @@ -100,15 +100,15 @@ TAO_ETCL_Literal_Constraint::TAO_ETCL_Literal_Constraint (CORBA::Any * any) break; case TAO_ETCL_BOOLEAN: { - CORBA_Any::to_boolean tmp (this->op_.bool_); + CORBA_Any::to_boolean tmp (this->op_.bool_); (*any) >>= tmp; } break; case TAO_ETCL_STRING: { - const char* s; - any_ref >>= s; - this->op_.str_ = CORBA::string_dup (s); + const char* s; + any_ref >>= s; + this->op_.str_ = CORBA::string_dup (s); } break; case TAO_ETCL_COMPONENT: @@ -300,17 +300,17 @@ TAO_ETCL_Literal_Constraint::comparable_type (CORBA::TypeCode_ptr type) CORBA::TCKind kind = CORBA::tk_null; ACE_TRY { - kind = type->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + kind = type->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::TypeCode_var tmp = CORBA::TypeCode::_duplicate (type); while (kind == CORBA::tk_alias) { - tmp = tmp->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); + tmp = tmp->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - kind = tmp->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + kind = tmp->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -510,7 +510,7 @@ TAO_ETCL_Literal_Constraint::operator>= (const TAO_ETCL_Literal_Constraint & rhs switch (widest_type) { case TAO_ETCL_STRING: - return_value = + return_value = (ACE_OS::strcmp ((const char*) *this, (const char*) rhs) >= 0); break; case TAO_ETCL_DOUBLE: @@ -539,19 +539,19 @@ TAO_ETCL_Literal_Constraint::operator+ (const TAO_ETCL_Literal_Constraint & rhs) { case TAO_ETCL_DOUBLE: { - CORBA::Double result = (CORBA::Double) *this + (CORBA::Double) rhs; - return TAO_ETCL_Literal_Constraint ((CORBA::Double) result); + CORBA::Double result = (CORBA::Double) *this + (CORBA::Double) rhs; + return TAO_ETCL_Literal_Constraint ((CORBA::Double) result); } case TAO_ETCL_INTEGER: case TAO_ETCL_SIGNED: { - CORBA::Long result = (CORBA::Long) *this + (CORBA::Long) rhs; - return TAO_ETCL_Literal_Constraint ((CORBA::Long) result); + CORBA::Long result = (CORBA::Long) *this + (CORBA::Long) rhs; + return TAO_ETCL_Literal_Constraint ((CORBA::Long) result); } case TAO_ETCL_UNSIGNED: { - CORBA::ULong result = (CORBA::ULong) *this + (CORBA::ULong) rhs; - return TAO_ETCL_Literal_Constraint ((CORBA::ULong) result); + CORBA::ULong result = (CORBA::ULong) *this + (CORBA::ULong) rhs; + return TAO_ETCL_Literal_Constraint ((CORBA::ULong) result); } default: return TAO_ETCL_Literal_Constraint ((CORBA::Long) 0); @@ -567,19 +567,19 @@ TAO_ETCL_Literal_Constraint::operator- (const TAO_ETCL_Literal_Constraint & rhs) { case TAO_ETCL_DOUBLE: { - CORBA::Double result = (CORBA::Double) *this - (CORBA::Double) rhs; - return TAO_ETCL_Literal_Constraint ((CORBA::Double) result); + CORBA::Double result = (CORBA::Double) *this - (CORBA::Double) rhs; + return TAO_ETCL_Literal_Constraint ((CORBA::Double) result); } case TAO_ETCL_INTEGER: case TAO_ETCL_SIGNED: { - CORBA::Long result = (CORBA::Long) *this - (CORBA::Long) rhs; - return TAO_ETCL_Literal_Constraint ((CORBA::Long) result); + CORBA::Long result = (CORBA::Long) *this - (CORBA::Long) rhs; + return TAO_ETCL_Literal_Constraint ((CORBA::Long) result); } case TAO_ETCL_UNSIGNED: { - CORBA::ULong result = (CORBA::ULong) *this - (CORBA::ULong) rhs; - return TAO_ETCL_Literal_Constraint ((CORBA::ULong) result); + CORBA::ULong result = (CORBA::ULong) *this - (CORBA::ULong) rhs; + return TAO_ETCL_Literal_Constraint ((CORBA::ULong) result); } default: return TAO_ETCL_Literal_Constraint ((CORBA::Long) 0); @@ -595,19 +595,19 @@ TAO_ETCL_Literal_Constraint::operator* (const TAO_ETCL_Literal_Constraint & rhs) { case TAO_ETCL_DOUBLE: { - CORBA::Double result = (CORBA::Double) *this * (CORBA::Double) rhs; - return TAO_ETCL_Literal_Constraint ((CORBA::Double) result); + CORBA::Double result = (CORBA::Double) *this * (CORBA::Double) rhs; + return TAO_ETCL_Literal_Constraint ((CORBA::Double) result); } case TAO_ETCL_INTEGER: case TAO_ETCL_SIGNED: { - CORBA::Long result = (CORBA::Long) *this * (CORBA::Long) rhs; - return TAO_ETCL_Literal_Constraint ((CORBA::Long) result); + CORBA::Long result = (CORBA::Long) *this * (CORBA::Long) rhs; + return TAO_ETCL_Literal_Constraint ((CORBA::Long) result); } case TAO_ETCL_UNSIGNED: { - CORBA::ULong result = (CORBA::ULong) *this * (CORBA::ULong) rhs; - return TAO_ETCL_Literal_Constraint ((CORBA::ULong) result); + CORBA::ULong result = (CORBA::ULong) *this * (CORBA::ULong) rhs; + return TAO_ETCL_Literal_Constraint ((CORBA::ULong) result); } default: return TAO_ETCL_Literal_Constraint ((CORBA::Long) 0); @@ -623,19 +623,19 @@ TAO_ETCL_Literal_Constraint::operator/ (const TAO_ETCL_Literal_Constraint & rhs) { case TAO_ETCL_DOUBLE: { - CORBA::Double result = (CORBA::Double) *this / (CORBA::Double) rhs; - return TAO_ETCL_Literal_Constraint ((CORBA::Double) result); + CORBA::Double result = (CORBA::Double) *this / (CORBA::Double) rhs; + return TAO_ETCL_Literal_Constraint ((CORBA::Double) result); } case TAO_ETCL_INTEGER: case TAO_ETCL_SIGNED: { - CORBA::Long result = (CORBA::Long) *this / (CORBA::Long) rhs; - return TAO_ETCL_Literal_Constraint ((CORBA::Long) result); + CORBA::Long result = (CORBA::Long) *this / (CORBA::Long) rhs; + return TAO_ETCL_Literal_Constraint ((CORBA::Long) result); } case TAO_ETCL_UNSIGNED: { - CORBA::ULong result = (CORBA::ULong) *this / (CORBA::ULong) rhs; - return TAO_ETCL_Literal_Constraint ((CORBA::ULong) result); + CORBA::ULong result = (CORBA::ULong) *this / (CORBA::ULong) rhs; + return TAO_ETCL_Literal_Constraint ((CORBA::ULong) result); } default: return TAO_ETCL_Literal_Constraint ((CORBA::Long) 0); @@ -648,12 +648,12 @@ TAO_ETCL_Literal_Constraint::operator- (void) switch (this->type_) { case TAO_ETCL_DOUBLE: - return TAO_ETCL_Literal_Constraint (- this->op_.double_); + return TAO_ETCL_Literal_Constraint (- this->op_.double_); case TAO_ETCL_INTEGER: case TAO_ETCL_SIGNED: - return TAO_ETCL_Literal_Constraint (- this->op_.integer_); + return TAO_ETCL_Literal_Constraint (- this->op_.integer_); case TAO_ETCL_UNSIGNED: - return TAO_ETCL_Literal_Constraint (- (CORBA::Long) this->op_.uinteger_); + return TAO_ETCL_Literal_Constraint (- (CORBA::Long) this->op_.uinteger_); default: return TAO_ETCL_Literal_Constraint ((CORBA::Long) 0); } @@ -661,7 +661,7 @@ TAO_ETCL_Literal_Constraint::operator- (void) TAO_Literal_Type TAO_ETCL_Literal_Constraint::widest_type ( - const TAO_ETCL_Literal_Constraint & rhs + const TAO_ETCL_Literal_Constraint & rhs ) { TAO_Literal_Type rhs_type = rhs.expr_type (); @@ -676,11 +676,11 @@ TAO_ETCL_Literal_Constraint::widest_type ( { if (rhs_type > this->type_) { - return_value = rhs_type; + return_value = rhs_type; } else { - return_value = this->type_; + return_value = this->type_; } } diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp index 62f0d7a8402..21d3100981f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp @@ -152,11 +152,11 @@ int ACE_ES_Dispatching_Base::dispatch_event (ACE_ES_Dispatch_Request *request, u_long &command_action) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Forward the request. - up_->push (request TAO_ENV_ARG_PARAMETER); + up_->push (request ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -241,9 +241,9 @@ ACE_ES_Priority_Dispatching::initialize_queues (void) void ACE_ES_Priority_Dispatching::connected (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - down_->connected (consumer TAO_ENV_ARG_PARAMETER); + down_->connected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; // This code does dynamic allocation of channel dispatch threads. @@ -255,7 +255,7 @@ ACE_ES_Priority_Dispatching::connected (ACE_Push_Consumer_Proxy *consumer // We have to tell the lower portions of the channel about the // consumer first. This is so that any changes to the consumer's // qos will take effect when we get the dispatch priority. - down_->connected (consumer TAO_ENV_ARG_PARAMETER); + down_->connected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; RtecScheduler::OS_Priority priority = @@ -338,7 +338,7 @@ ACE_ES_Priority_Dispatching::disconnected (ACE_Push_Consumer_Proxy *consumer) // has been dynamically allocated by the filtering module. void ACE_ES_Priority_Dispatching::push (ACE_ES_Dispatch_Request *request - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TIMEPROBE (TAO_DISPATCHING_MODULES_PUSH_SOURCE_TYPE_CORRELATION_MODULE); @@ -355,14 +355,14 @@ ACE_ES_Priority_Dispatching::push (ACE_ES_Dispatch_Request *request thread_priority, subpriority, preemption_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #else ACE_Scheduler_Factory::server ()->priority (request->rt_info (), thread_priority, subpriority, preemption_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #endif ACE_TIMEPROBE (TAO_DISPATCHING_MODULES_PRIORITY_DISPATCHING_PUSH_PRIORITY_OBTAINED); ACE_CHECK; @@ -619,7 +619,7 @@ ACE_ES_Dispatch_Queue::open_queue (RtecScheduler::Period_t &period, "ACE_ES_Dispatch_Queue::open_queue"), -1); case 0: { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY {// @@ TODO: Handle exceptions... #if 1 @@ -634,7 +634,7 @@ ACE_ES_Dispatch_Queue::open_queue (RtecScheduler::Period_t &period, ORBSVCS_Time::zero (), 1, RtecScheduler::OPERATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #else ACE_Scheduler_Factory::server()->set (rt_info_, RtecScheduler::VERY_HIGH_CRITICALITY, @@ -646,7 +646,7 @@ ACE_ES_Dispatch_Queue::open_queue (RtecScheduler::Period_t &period, ORBSVCS_Time::zero (), 1, RtecScheduler::OPERATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #endif ACE_TRY_CHECK; } @@ -686,7 +686,7 @@ ACE_ES_EFD_Dispatching::ACE_ES_EFD_Dispatching (ACE_EventChannel *channel) void ACE_ES_EFD_Dispatching::push (ACE_ES_Dispatch_Request *request - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { // If it's a request to forward an event, it needs a reference to us // to call dispatch_event. @@ -727,11 +727,11 @@ ACE_ES_RTU_Dispatching::dispatch_event (ACE_ES_Dispatch_Request *request, // Store the priority of the task currently running. channel_->rtu_manager ()->priority (request->priority ()); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Forward the request. - up_->push (request TAO_ENV_ARG_PARAMETER); + up_->push (request ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -759,10 +759,10 @@ ACE_ES_RTU_Dispatching::dispatch_event (ACE_ES_Dispatch_Request *request, void ACE_ES_RTU_Dispatching::push (ACE_ES_Dispatch_Request *request - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // First enqueue the message in the proper queue. - ACE_ES_Priority_Dispatching::push (request TAO_ENV_ARG_PARAMETER); + ACE_ES_Priority_Dispatching::push (request ACE_ENV_ARG_PARAMETER); ACE_CHECK; // If the current event is higher priority (lower value) than the diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h index 30f14e7fd21..ab82394c9ec 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h +++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h @@ -64,11 +64,11 @@ public: // Link to adjacent modules. virtual void connected (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Forward down_. virtual void disconnecting (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Forward down_. virtual void disconnected (ACE_Push_Consumer_Proxy *consumer); @@ -79,7 +79,7 @@ public: // void disconnecting (ACE_Push_Supplier_Proxy *supplier); virtual void push (ACE_ES_Dispatch_Request *request - TAO_ENV_ARG_DECL_NOT_USED) = 0; + ACE_ENV_ARG_DECL_NOT_USED) = 0; // Forward up_. virtual int dispatch_event (ACE_ES_Dispatch_Request *request, @@ -386,7 +386,7 @@ public: // Delete queues. void connected (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Allocate any needed dispatching resources for this consumers // priority. @@ -398,7 +398,7 @@ public: // void disconnecting (ACE_Push_Supplier_Proxy *supplier); virtual void push (ACE_ES_Dispatch_Request *request - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Enqueues the request on the appropriate Dispatch Queue. virtual void activate (int threads_per_queue); @@ -471,7 +471,7 @@ public: // the dispatching base constructor. virtual void push (ACE_ES_Dispatch_Request *request - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Forward up_. }; @@ -495,7 +495,7 @@ public: // policy. virtual void push (ACE_ES_Dispatch_Request *request - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Calls ACE_ES_Priority_Dispatching::push and then checks if // preemption is necessary. }; diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i index cc6c5d64243..e2091091c6d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i +++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i @@ -156,9 +156,9 @@ ACE_ES_Dispatching_Base::open (ACE_ES_Consumer_Module *up, ACE_INLINE void ACE_ES_Dispatching_Base::connected (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - down_->connected (consumer TAO_ENV_ARG_PARAMETER); + down_->connected (consumer ACE_ENV_ARG_PARAMETER); } ACE_INLINE void @@ -170,9 +170,9 @@ ACE_ES_Dispatching_Base::disconnected (ACE_Push_Consumer_Proxy *consumer) ACE_INLINE void ACE_ES_Dispatching_Base::disconnecting (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - down_->disconnecting (consumer TAO_ENV_ARG_PARAMETER); + down_->disconnecting (consumer ACE_ENV_ARG_PARAMETER); } ACE_INLINE void diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp index 624920c3b4e..a22b6ca2963 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp @@ -29,7 +29,7 @@ TAO_ECG_Mcast_EH::~TAO_ECG_Mcast_EH (void) int TAO_ECG_Mcast_EH::open (RtecEventChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // @@ TODO Think about the exception safety (or lack thereof) of // this code, what if the following operations fail? @@ -44,13 +44,13 @@ TAO_ECG_Mcast_EH::open (RtecEventChannelAdmin::EventChannel_ptr ec // its lifetime. RtecEventChannelAdmin::Observer_var obs = - this->observer_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->observer_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_TRY { this->handle_ = - this->ec_->append_observer (obs.in () TAO_ENV_ARG_PARAMETER); + this->ec_->append_observer (obs.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } ACE_CATCH(CORBA::SystemException, ex) @@ -60,12 +60,12 @@ TAO_ECG_Mcast_EH::open (RtecEventChannelAdmin::EventChannel_ptr ec // we should encapsulate it in a Deactivator. PortableServer::POA_var poa = - this->observer_._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->observer_._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); PortableServer::ObjectId_var id = - poa->servant_to_id (&this->observer_ TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (&this->observer_ ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_RE_THROW; @@ -77,26 +77,26 @@ TAO_ECG_Mcast_EH::open (RtecEventChannelAdmin::EventChannel_ptr ec } int -TAO_ECG_Mcast_EH::close (TAO_ENV_SINGLE_ARG_DECL) +TAO_ECG_Mcast_EH::close (ACE_ENV_SINGLE_ARG_DECL) { if (this->handle_ == 0) return 0; RtecEventChannelAdmin::Observer_Handle h = this->handle_; this->handle_ = 0; - this->ec_->remove_observer (h TAO_ENV_ARG_PARAMETER); + this->ec_->remove_observer (h ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // @@ TODO If the first operation raises an exception then the // second one never executes!!! { PortableServer::POA_var poa = - this->observer_._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->observer_._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); PortableServer::ObjectId_var id = - poa->servant_to_id (&this->observer_ TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (&this->observer_ ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } @@ -144,7 +144,7 @@ void TAO_ECG_Mcast_EH::compute_required_subscriptions ( const RtecEventChannelAdmin::ConsumerQOS& sub, Address_Set& multicast_addresses - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong count = sub.dependencies.length (); @@ -170,7 +170,7 @@ TAO_ECG_Mcast_EH::compute_required_subscriptions ( // opportunity to recover it. // + Close the MCast Event Handler completely, too much policy // for this level. - this->receiver_->get_addr (header, addr TAO_ENV_ARG_PARAMETER); + this->receiver_->get_addr (header, addr ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_INET_Addr inet_addr (addr.port, addr.ipaddr); @@ -299,7 +299,7 @@ TAO_ECG_Mcast_EH::add_new_subscriptions ( void TAO_ECG_Mcast_EH::update_consumer ( const RtecEventChannelAdmin::ConsumerQOS& sub - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ TODO This function turned out to be too long, we need to break @@ -310,7 +310,7 @@ TAO_ECG_Mcast_EH::update_consumer ( Address_Set multicast_addresses; - this->compute_required_subscriptions (sub, multicast_addresses TAO_ENV_ARG_PARAMETER); + this->compute_required_subscriptions (sub, multicast_addresses ACE_ENV_ARG_PARAMETER); ACE_CHECK; // 2) To conserve OS and network resources we first unsubscribe from @@ -329,7 +329,7 @@ TAO_ECG_Mcast_EH::update_consumer ( void TAO_ECG_Mcast_EH::update_supplier (const RtecEventChannelAdmin::SupplierQOS& - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Do nothing @@ -345,19 +345,19 @@ TAO_ECG_Mcast_EH::Observer::Observer (TAO_ECG_Mcast_EH* eh) void TAO_ECG_Mcast_EH::Observer::update_consumer ( const RtecEventChannelAdmin::ConsumerQOS& sub - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->eh_->update_consumer (sub TAO_ENV_ARG_PARAMETER); + this->eh_->update_consumer (sub ACE_ENV_ARG_PARAMETER); } void TAO_ECG_Mcast_EH::Observer::update_supplier ( const RtecEventChannelAdmin::SupplierQOS& pub - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->eh_->update_supplier (pub TAO_ENV_ARG_PARAMETER); + this->eh_->update_supplier (pub ACE_ENV_ARG_PARAMETER); } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h index a4f52be104d..fa9fc0dd703 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h @@ -59,24 +59,24 @@ public: * reactor. */ int open (RtecEventChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** * Remove ourselves from the event channel, unsubscribe from the * multicast groups, close the sockets and unsubscribe from the * reactor. */ - int close (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + int close (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Reactor callbacks virtual int handle_input (ACE_HANDLE fd); /// The Observer methods void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -100,11 +100,11 @@ public: // The Observer methods virtual void update_consumer ( const RtecEventChannelAdmin::ConsumerQOS& sub - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void update_supplier ( const RtecEventChannelAdmin::SupplierQOS& pub - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -134,7 +134,7 @@ private: void compute_required_subscriptions ( const RtecEventChannelAdmin::ConsumerQOS& sub, Address_Set& multicast_addresses - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Delete the list of multicast addresses that we need not diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp index 33a372afecc..eac9230d22c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp @@ -61,7 +61,7 @@ void TAO_ECG_UDP_Sender::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec, RtecUDPAdmin::AddrServer_ptr addr_server, TAO_ECG_UDP_Out_Endpoint* endpoint - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { this->lcl_ec_ = RtecEventChannelAdmin::EventChannel::_duplicate (lcl_ec); @@ -83,23 +83,23 @@ TAO_ECG_UDP_Sender::mtu (CORBA::ULong new_mtu) } void -TAO_ECG_UDP_Sender::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_ECG_UDP_Sender::shutdown (ACE_ENV_SINGLE_ARG_DECL) { - this->close (TAO_ENV_SINGLE_ARG_PARAMETER); + this->close (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->lcl_ec_ = RtecEventChannelAdmin::EventChannel::_nil (); } void TAO_ECG_UDP_Sender::open (RtecEventChannelAdmin::ConsumerQOS& sub - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // ACE_DEBUG ((LM_DEBUG, "ECG (%t) Open gateway\n")); if (CORBA::is_nil (this->lcl_ec_.in ())) return; if (!CORBA::is_nil (this->supplier_proxy_.in ())) - this->close (TAO_ENV_SINGLE_ARG_PARAMETER); + this->close (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (sub.dependencies.length () == 0) @@ -109,15 +109,15 @@ TAO_ECG_UDP_Sender::open (RtecEventChannelAdmin::ConsumerQOS& sub //ACE_SupplierQOS_Factory::debug (pub); RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - this->lcl_ec_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->lcl_ec_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = - consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventComm::PushConsumer_var consumer_ref = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; //ACE_DEBUG ((LM_DEBUG, "ECG (%t) Gateway/Consumer ")); @@ -125,35 +125,35 @@ TAO_ECG_UDP_Sender::open (RtecEventChannelAdmin::ConsumerQOS& sub this->supplier_proxy_->connect_push_consumer (consumer_ref.in (), sub - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_ECG_UDP_Sender::close (TAO_ENV_SINGLE_ARG_DECL) +TAO_ECG_UDP_Sender::close (ACE_ENV_SINGLE_ARG_DECL) { // ACE_DEBUG ((LM_DEBUG, "ECG (%t) Closing gateway\n")); if (CORBA::is_nil (this->supplier_proxy_.in ())) return; - this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = RtecEventChannelAdmin::ProxyPushSupplier::_nil (); PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_ECG_UDP_Sender::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ECG_UDP_Sender::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -163,7 +163,7 @@ TAO_ECG_UDP_Sender::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "ECG_UDP_Sender::push - \n")); @@ -192,11 +192,11 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events RtecUDPAdmin::UDP_Addr udp_addr; this->addr_server_->get_addr (header, udp_addr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->send_event (udp_addr, e - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // That's it, no need to continue... @@ -219,7 +219,7 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events // Grab the right mcast group for this event... RtecUDPAdmin::UDP_Addr udp_addr; this->addr_server_->get_addr (e.header, udp_addr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; Destination_Map::ENTRY *entry; @@ -249,11 +249,11 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events ++k) { this->marshal_one_event (events[(*k)], cdr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } this->send_cdr_stream ((*j).ext_id_, cdr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -269,7 +269,7 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events void TAO_ECG_UDP_Sender::marshal_one_event (const RtecEventComm::Event& e, TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // We need to modify the TTL field, but copying the entire event // would be wasteful; instead we create a new header and only @@ -285,7 +285,7 @@ TAO_ECG_UDP_Sender::marshal_one_event (const RtecEventComm::Event& e, void TAO_ECG_UDP_Sender::send_event (const RtecUDPAdmin::UDP_Addr& udp_addr, const RtecEventComm::Event& e - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // This is the CDR stream used to marshal the event... TAO_OutputCDR cdr; @@ -295,17 +295,17 @@ TAO_ECG_UDP_Sender::send_event (const RtecUDPAdmin::UDP_Addr& udp_addr, // marshal without any extra copies. cdr.write_ulong (1); - this->marshal_one_event (e, cdr TAO_ENV_ARG_PARAMETER); + this->marshal_one_event (e, cdr ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->send_cdr_stream (udp_addr, cdr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ECG_UDP_Sender::send_cdr_stream (const RtecUDPAdmin::UDP_Addr& udp_addr, TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // @@ TODO precompute this when the MTU changes... CORBA::ULong max_fragment_payload = this->mtu () - @@ -364,7 +364,7 @@ TAO_ECG_UDP_Sender::send_cdr_stream (const RtecUDPAdmin::UDP_Addr& udp_addr, fragment_count, iov, iovcnt - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; fragment_id++; fragment_offset += max_fragment_payload; @@ -392,7 +392,7 @@ TAO_ECG_UDP_Sender::send_cdr_stream (const RtecUDPAdmin::UDP_Addr& udp_addr, fragment_count, iov, iovcnt - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; fragment_id++; fragment_offset += max_fragment_payload; @@ -413,7 +413,7 @@ TAO_ECG_UDP_Sender::send_cdr_stream (const RtecUDPAdmin::UDP_Addr& udp_addr, fragment_count, iov, iovcnt - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; fragment_id++; fragment_offset += fragment_size; @@ -437,7 +437,7 @@ TAO_ECG_UDP_Sender::send_cdr_stream (const RtecUDPAdmin::UDP_Addr& udp_addr, fragment_count, iov, iovcnt - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; fragment_id++; fragment_offset += fragment_size; @@ -460,7 +460,7 @@ TAO_ECG_UDP_Sender::send_fragment (const RtecUDPAdmin::UDP_Addr& udp_addr, CORBA::ULong fragment_count, iovec iov[], int iovcnt - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::ULong header[TAO_ECG_UDP_Protocol::ECG_HEADER_SIZE / sizeof(CORBA::ULong) diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h index 7757cbce581..a039adeb648 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h @@ -59,7 +59,7 @@ public: void init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec, RtecUDPAdmin::AddrServer_ptr addr_server, TAO_ECG_UDP_Out_Endpoint *endpoint - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** * The sender may need to fragment the message, otherwise the @@ -72,20 +72,20 @@ public: /// Disconnect and shutdown the sender, no further connections will /// work unless init() is called again. - void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Connect (or reconnect) to the EC with the given subscriptions. void open (RtecEventChannelAdmin::ConsumerQOS &sub - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Disconnect from the EC, but reconnection is still possible. - void close (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void close (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// The PushConsumer methods. - virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void push (const RtecEventComm::EventSet &events - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -96,18 +96,18 @@ private: */ void marshal_one_event (const RtecEventComm::Event& e, TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Helper function to marshal and send a single event. void send_event (const RtecUDPAdmin::UDP_Addr& udp_addr, const RtecEventComm::Event& e - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Helper function to send one or more events once they have been /// marshaled into a CDR stream. void send_cdr_stream (const RtecUDPAdmin::UDP_Addr& udp_addr, TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /** * Send one fragment, the first entry in the iovec is used to send @@ -123,7 +123,7 @@ private: CORBA::ULong fragment_count, iovec iov[], int iovcnt - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** * Count the number of fragments that will be required to send the diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp index 7efa43f67b9..f9562d11194 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp @@ -59,12 +59,12 @@ TAO_EC_And_Filter::size (void) const int TAO_EC_And_Filter::filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ChildrenIterator end = this->end (); for (ChildrenIterator i = this->begin (); i != end; ++i) { - int n = (*i)->filter (event, qos_info TAO_ENV_ARG_PARAMETER); + int n = (*i)->filter (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (n == 0) return 0; @@ -73,7 +73,7 @@ TAO_EC_And_Filter::filter (const RtecEventComm::EventSet& event, // All children accepted the event, push up... if (this->parent () != 0) { - this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -83,12 +83,12 @@ TAO_EC_And_Filter::filter (const RtecEventComm::EventSet& event, int TAO_EC_And_Filter::filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ChildrenIterator end = this->end (); for (ChildrenIterator i = this->begin (); i != end; ++i) { - int n = (*i)->filter_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + int n = (*i)->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (n == 0) return 0; @@ -97,7 +97,7 @@ TAO_EC_And_Filter::filter_nocopy (RtecEventComm::EventSet& event, // All children accepted the event, push up... if (this->parent () != 0) { - this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -107,14 +107,14 @@ TAO_EC_And_Filter::filter_nocopy (RtecEventComm::EventSet& event, void TAO_EC_And_Filter::push (const RtecEventComm::EventSet&, TAO_EC_QOS_Info& - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_And_Filter::push_nocopy (RtecEventComm::EventSet&, TAO_EC_QOS_Info& - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } @@ -165,7 +165,7 @@ int TAO_EC_And_Filter::add_dependencies ( const RtecEventComm::EventHeader&, const TAO_EC_QOS_Info& - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h index cd510858f4e..631198f7014 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h @@ -51,22 +51,22 @@ public: virtual int size (void) const; virtual int filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void clear (void); virtual CORBA::ULong max_event_size (void) const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); typedef unsigned int Word; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp index 5725d9bf671..b1b7b1ca222 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp @@ -25,7 +25,7 @@ TAO_EC_Filter* TAO_EC_Basic_Filter_Builder::build ( TAO_EC_ProxyPushSupplier *supplier, RtecEventChannelAdmin::ConsumerQOS& qos - TAO_ENV_ARG_DECL_NOT_USED) const + ACE_ENV_ARG_DECL_NOT_USED) const { CORBA::ULong pos = 0; return this->recursive_build (supplier, qos, pos); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h index 38d4c5fb386..ddbfcfe1bbd 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h @@ -47,7 +47,7 @@ public: // = The TAO_EC_Filter_Builder methods... TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier, RtecEventChannelAdmin::ConsumerQOS& qos - TAO_ENV_ARG_DECL) const; + ACE_ENV_ARG_DECL) const; private: /// Recursively build the filter tree. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp index c958f40e5e5..da2d0e66069 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp @@ -45,7 +45,7 @@ TAO_EC_Bitmask_Filter::size (void) const int TAO_EC_Bitmask_Filter::filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (event.length () != 1) return 0; @@ -54,13 +54,13 @@ TAO_EC_Bitmask_Filter::filter (const RtecEventComm::EventSet& event, || (event[0].header.source & this->source_mask_) == 0) return 0; - return this->child_->filter (event, qos_info TAO_ENV_ARG_PARAMETER); + return this->child_->filter (event, qos_info ACE_ENV_ARG_PARAMETER); } int TAO_EC_Bitmask_Filter::filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (event.length () != 1) return 0; @@ -69,25 +69,25 @@ TAO_EC_Bitmask_Filter::filter_nocopy (RtecEventComm::EventSet& event, || (event[0].header.source & this->source_mask_) == 0) return 0; - return this->child_->filter_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + return this->child_->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); } void TAO_EC_Bitmask_Filter::push (const RtecEventComm::EventSet &event, TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->parent () != 0) - this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER); } void TAO_EC_Bitmask_Filter::push_nocopy (RtecEventComm::EventSet &event, TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->parent () != 0) - this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); } void @@ -117,7 +117,7 @@ int TAO_EC_Bitmask_Filter::add_dependencies ( const RtecEventComm::EventHeader&, const TAO_EC_QOS_Info & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h index 69984a309ef..f617b1a7f53 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h @@ -68,22 +68,22 @@ public: virtual int size (void) const; virtual int filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void clear (void); virtual CORBA::ULong max_event_size (void) const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: ACE_UNIMPLEMENTED_FUNC (TAO_EC_Bitmask_Filter diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp index bc5b04a77c1..913e5ce35ce 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp @@ -83,14 +83,14 @@ TAO_EC_Conjunction_Filter::size (void) const int TAO_EC_Conjunction_Filter::filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ChildrenIterator end = this->end (); for (this->current_child_ = this->begin (); this->current_child_ != end; ++this->current_child_) { - int n = (*this->current_child_)->filter (event, qos_info TAO_ENV_ARG_PARAMETER); + int n = (*this->current_child_)->filter (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (n != 0) return n; @@ -101,14 +101,14 @@ TAO_EC_Conjunction_Filter::filter (const RtecEventComm::EventSet& event, int TAO_EC_Conjunction_Filter::filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ChildrenIterator end = this->end (); for (ChildrenIterator i = this->begin (); i != end; ++i) { - int n = (*i)->filter_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + int n = (*i)->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (n != 0) return n; @@ -119,7 +119,7 @@ TAO_EC_Conjunction_Filter::filter_nocopy (RtecEventComm::EventSet& event, void TAO_EC_Conjunction_Filter::push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Long pos = this->current_child_ - this->begin (); int w = pos / bits_per_word; @@ -135,15 +135,15 @@ TAO_EC_Conjunction_Filter::push (const RtecEventComm::EventSet& event, this->event_[l + i] = event[i]; } if (this->all_received () && this->parent () != 0) - this->parent ()->push_nocopy (this->event_, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push_nocopy (this->event_, qos_info ACE_ENV_ARG_PARAMETER); } void TAO_EC_Conjunction_Filter::push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->push (event, qos_info TAO_ENV_ARG_PARAMETER); + this->push (event, qos_info ACE_ENV_ARG_PARAMETER); } void @@ -203,7 +203,7 @@ int TAO_EC_Conjunction_Filter::add_dependencies ( const RtecEventComm::EventHeader&, const TAO_EC_QOS_Info& - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h index bf49e8a52e3..b2788d196a2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h @@ -53,22 +53,22 @@ public: virtual int size (void) const; virtual int filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void clear (void); virtual CORBA::ULong max_event_size (void) const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); typedef unsigned int Word; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp index ddcfd4faa5f..90f84370770 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp @@ -26,14 +26,14 @@ TAO_EC_ConsumerAdmin::~TAO_EC_ConsumerAdmin (void) } RtecEventChannelAdmin::ProxyPushSupplier_ptr -TAO_EC_ConsumerAdmin::obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_ConsumerAdmin::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->obtain (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->obtain (ACE_ENV_SINGLE_ARG_PARAMETER); } PortableServer::POA_ptr -TAO_EC_ConsumerAdmin::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EC_ConsumerAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h index cac71634fde..7914fc9f6c2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h @@ -38,7 +38,7 @@ class TAO_EC_ProxyPushConsumer; *

Memory Management

* It does not assume ownership of the TAO_EC_Event_Channel object; * but it *does* assume ownership of the TAO_EC_ProxyPushSupplier_Set - * object. + * object. * *

Locking

* No provisions for locking, access must be serialized externally. @@ -60,11 +60,11 @@ public: // = The RtecEventChannelAdmin::ConsumerAdmin methods... virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr - obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // = The PortableServer::ServantBase methods - virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); private: /// Store the default POA. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp index 654bb82e8e8..0d0a8be8ed3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp @@ -30,14 +30,14 @@ TAO_EC_ConsumerControl::shutdown (void) void TAO_EC_ConsumerControl::consumer_not_exist (TAO_EC_ProxyPushSupplier * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_ConsumerControl::system_exception (TAO_EC_ProxyPushSupplier *, CORBA::SystemException & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h index 1af9cbbfe63..1d39d13cf24 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h @@ -56,12 +56,12 @@ public: * reclaim all the resources attached to that object. */ virtual void consumer_not_exist (TAO_EC_ProxyPushSupplier *proxy - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); /// Some system exception was rasied while trying to push an event. virtual void system_exception (TAO_EC_ProxyPushSupplier *proxy, CORBA::SystemException & - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp index dce14cd6423..97b182299fe 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp @@ -59,14 +59,14 @@ TAO_EC_Disjunction_Filter::size (void) const int TAO_EC_Disjunction_Filter::filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ChildrenIterator end = this->end (); for (ChildrenIterator i = this->begin (); i != end; ++i) { - int n = (*i)->filter (event, qos_info TAO_ENV_ARG_PARAMETER); + int n = (*i)->filter (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (n != 0) return n; @@ -77,14 +77,14 @@ TAO_EC_Disjunction_Filter::filter (const RtecEventComm::EventSet& event, int TAO_EC_Disjunction_Filter::filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ChildrenIterator end = this->end (); for (ChildrenIterator i = this->begin (); i != end; ++i) { - int n = (*i)->filter (event, qos_info TAO_ENV_ARG_PARAMETER); + int n = (*i)->filter (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (n != 0) return n; @@ -95,19 +95,19 @@ TAO_EC_Disjunction_Filter::filter_nocopy (RtecEventComm::EventSet& event, void TAO_EC_Disjunction_Filter::push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->parent () != 0) - this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER); } void TAO_EC_Disjunction_Filter::push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->parent () != 0) - this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); } void @@ -157,7 +157,7 @@ int TAO_EC_Disjunction_Filter::add_dependencies ( const RtecEventComm::EventHeader&, const TAO_EC_QOS_Info & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h index 02e2752af51..e450d1c4a8c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h @@ -52,22 +52,22 @@ public: virtual int size (void) const; virtual int filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void clear (void); virtual CORBA::ULong max_event_size (void) const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: ACE_UNIMPLEMENTED_FUNC (TAO_EC_Disjunction_Filter diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp index b1195799e0e..71f099ef2f3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp @@ -34,9 +34,9 @@ TAO_EC_Reactive_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - proxy->reactive_push_to_consumer (consumer, event TAO_ENV_ARG_PARAMETER); + proxy->reactive_push_to_consumer (consumer, event ACE_ENV_ARG_PARAMETER); } void @@ -44,7 +44,7 @@ TAO_EC_Reactive_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, RtecEventComm::EventSet& event, TAO_EC_QOS_Info& - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - proxy->reactive_push_to_consumer (consumer, event TAO_ENV_ARG_PARAMETER); + proxy->reactive_push_to_consumer (consumer, event ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h index 9ed29c5a12d..3aa53499fd4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h @@ -64,12 +64,12 @@ public: RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet &event, TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0; + ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0; virtual void push_nocopy (TAO_EC_ProxyPushSupplier *proxy, RtecEventComm::PushConsumer_ptr consumer, RtecEventComm::EventSet &event, TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0; + ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0; }; // **************************************************************** @@ -96,12 +96,12 @@ public: RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet &event, TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void push_nocopy (TAO_EC_ProxyPushSupplier *proxy, RtecEventComm::PushConsumer_ptr consumer, RtecEventComm::EventSet &event, TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp index 79303ce3ebb..cb0a9a28d24 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp @@ -42,7 +42,7 @@ TAO_EC_Dispatching_Task::svc (void) continue; } - int result = command->execute (TAO_ENV_SINGLE_ARG_PARAMETER); + int result = command->execute (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Message_Block::release (mb); @@ -64,7 +64,7 @@ void TAO_EC_Dispatching_Task::push (TAO_EC_ProxyPushSupplier *proxy, RtecEventComm::PushConsumer_ptr consumer, RtecEventComm::EventSet& event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->allocator_ == 0) this->allocator_ = ACE_Allocator::instance (); @@ -93,7 +93,7 @@ TAO_EC_Dispatch_Command::~TAO_EC_Dispatch_Command (void) // **************************************************************** int -TAO_EC_Shutdown_Task_Command::execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EC_Shutdown_Task_Command::execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return -1; } @@ -106,11 +106,11 @@ TAO_EC_Push_Command::~TAO_EC_Push_Command (void) } int -TAO_EC_Push_Command::execute (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_Push_Command::execute (ACE_ENV_SINGLE_ARG_DECL) { this->proxy_->push_to_consumer (this->consumer_.in (), this->event_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h index dd2cd77fc51..21f03a332c4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h @@ -59,7 +59,7 @@ public: virtual void push (TAO_EC_ProxyPushSupplier *proxy, RtecEventComm::PushConsumer_ptr consumer, RtecEventComm::EventSet& event - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: /// An per-task allocator @@ -88,7 +88,7 @@ public: virtual ~TAO_EC_Dispatch_Command (void); /// Command callback - virtual int execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) = 0; + virtual int execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) = 0; }; // **************************************************************** @@ -100,7 +100,7 @@ public: TAO_EC_Shutdown_Task_Command (ACE_Allocator *mb_allocator = 0); /// Command callback - virtual int execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + virtual int execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); }; // **************************************************************** @@ -119,7 +119,7 @@ public: virtual ~TAO_EC_Push_Command (void); /// Command callback - virtual int execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + virtual int execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); private: /// The proxy diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp index 94e1737e919..24c4a9ab38a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp @@ -101,7 +101,7 @@ TAO_EC_Event_Channel::~TAO_EC_Event_Channel (void) } void -TAO_EC_Event_Channel::activate (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EC_Event_Channel::activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->dispatching_->activate (); this->timeout_generator_->activate (); @@ -110,7 +110,7 @@ TAO_EC_Event_Channel::activate (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } void -TAO_EC_Event_Channel::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_Event_Channel::shutdown (ACE_ENV_SINGLE_ARG_DECL) { this->dispatching_->shutdown (); this->timeout_generator_->shutdown (); @@ -118,144 +118,144 @@ TAO_EC_Event_Channel::shutdown (TAO_ENV_SINGLE_ARG_DECL) this->consumer_control_->shutdown (); PortableServer::POA_var consumer_poa = - this->consumer_admin_->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_admin_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var consumer_id = - consumer_poa->servant_to_id (this->consumer_admin_ TAO_ENV_ARG_PARAMETER); + consumer_poa->servant_to_id (this->consumer_admin_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; - consumer_poa->deactivate_object (consumer_id.in () TAO_ENV_ARG_PARAMETER); + consumer_poa->deactivate_object (consumer_id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::POA_var supplier_poa = - this->supplier_admin_->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_admin_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var supplier_id = - supplier_poa->servant_to_id (this->supplier_admin_ TAO_ENV_ARG_PARAMETER); + supplier_poa->servant_to_id (this->supplier_admin_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; - supplier_poa->deactivate_object (supplier_id.in () TAO_ENV_ARG_PARAMETER); + supplier_poa->deactivate_object (supplier_id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier_admin_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_admin_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->consumer_admin_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_admin_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void TAO_EC_Event_Channel::connected (TAO_EC_ProxyPushConsumer* consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->consumer_admin_->peer_connected (consumer TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->peer_connected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier_admin_->connected (consumer TAO_ENV_ARG_PARAMETER); + this->supplier_admin_->connected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->observer_strategy_->connected (consumer TAO_ENV_ARG_PARAMETER); + this->observer_strategy_->connected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_EC_Event_Channel::reconnected (TAO_EC_ProxyPushConsumer* consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->consumer_admin_->peer_reconnected (consumer TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->peer_reconnected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier_admin_->reconnected (consumer TAO_ENV_ARG_PARAMETER); + this->supplier_admin_->reconnected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->observer_strategy_->connected (consumer TAO_ENV_ARG_PARAMETER); + this->observer_strategy_->connected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_EC_Event_Channel::disconnected (TAO_EC_ProxyPushConsumer* consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->consumer_admin_->peer_disconnected (consumer TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->peer_disconnected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier_admin_->disconnected (consumer TAO_ENV_ARG_PARAMETER); + this->supplier_admin_->disconnected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->observer_strategy_->disconnected (consumer TAO_ENV_ARG_PARAMETER); + this->observer_strategy_->disconnected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_EC_Event_Channel::connected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->supplier_admin_->peer_connected (supplier TAO_ENV_ARG_PARAMETER); + this->supplier_admin_->peer_connected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->consumer_admin_->connected (supplier TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->connected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->observer_strategy_->connected (supplier TAO_ENV_ARG_PARAMETER); + this->observer_strategy_->connected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_EC_Event_Channel::reconnected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->supplier_admin_->peer_reconnected (supplier TAO_ENV_ARG_PARAMETER); + this->supplier_admin_->peer_reconnected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->consumer_admin_->reconnected (supplier TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->reconnected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->observer_strategy_->connected (supplier TAO_ENV_ARG_PARAMETER); + this->observer_strategy_->connected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_EC_Event_Channel::disconnected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->supplier_admin_->peer_disconnected (supplier TAO_ENV_ARG_PARAMETER); + this->supplier_admin_->peer_disconnected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->consumer_admin_->disconnected (supplier TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->disconnected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->observer_strategy_->disconnected (supplier TAO_ENV_ARG_PARAMETER); + this->observer_strategy_->disconnected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; } RtecEventChannelAdmin::ConsumerAdmin_ptr -TAO_EC_Event_Channel::for_consumers (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_Event_Channel::for_consumers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->consumer_admin_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->consumer_admin_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } RtecEventChannelAdmin::SupplierAdmin_ptr -TAO_EC_Event_Channel::for_suppliers (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_Event_Channel::for_suppliers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->supplier_admin_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->supplier_admin_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_EC_Event_Channel::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_Event_Channel::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); } RtecEventChannelAdmin::Observer_Handle TAO_EC_Event_Channel::append_observer ( RtecEventChannelAdmin::Observer_ptr observer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)) { - return this->observer_strategy_->append_observer (observer TAO_ENV_ARG_PARAMETER); + return this->observer_strategy_->append_observer (observer ACE_ENV_ARG_PARAMETER); } void TAO_EC_Event_Channel::remove_observer ( RtecEventChannelAdmin::Observer_Handle handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER)) { - this->observer_strategy_->remove_observer (handle TAO_ENV_ARG_PARAMETER); + this->observer_strategy_->remove_observer (handle ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h index e731eb6fb4e..b095cfaebe9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h @@ -120,11 +120,11 @@ public: /// Start the internal threads (if any), etc. /// After this call the EC can be used. - virtual void activate (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Shutdown any internal threads, cleanup all the internal /// structures, flush all the messages, etc. - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Access the dispatching module.... TAO_EC_Dispatching* dispatching (void) const; @@ -188,20 +188,20 @@ public: /// Used to inform the EC that a Consumer has connected or /// disconnected from it. virtual void connected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void reconnected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void disconnected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); /// Used to inform the EC that a Supplier has connected or /// disconnected from it. virtual void connected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void reconnected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void disconnected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Simple flags to control the EC behavior, set by the application // at construction time. @@ -226,31 +226,31 @@ public: // = The RtecEventChannelAdmin::EventChannel methods... /// The default implementation is: - /// this->consumer_admin ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + /// this->consumer_admin ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER); virtual RtecEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (TAO_ENV_SINGLE_ARG_DECL) + for_consumers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// The default implementation is: - /// this->supplier_admin ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + /// this->supplier_admin ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER); virtual RtecEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (TAO_ENV_SINGLE_ARG_DECL) + for_suppliers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Commit suicide. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual RtecEventChannelAdmin::Observer_Handle append_observer (RtecEventChannelAdmin::Observer_ptr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)); virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp index f2e738b5b2b..aebd91da40b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp @@ -38,7 +38,7 @@ TAO_EC_Filter::size (void) const void TAO_EC_Filter::get_qos_info (TAO_EC_QOS_Info& - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); @@ -49,11 +49,11 @@ TAO_EC_Filter::get_qos_info (TAO_EC_QOS_Info& int TAO_EC_Null_Filter::filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // This is a leaf, no need to query any children, and we accept all // events, so push it. - this->push (event, qos_info TAO_ENV_ARG_PARAMETER); + this->push (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return 1; } @@ -61,11 +61,11 @@ TAO_EC_Null_Filter::filter (const RtecEventComm::EventSet& event, int TAO_EC_Null_Filter::filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // This is a leaf, no need to query any children, and we accept all // events, so push it. - this->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + this->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return 1; } @@ -73,19 +73,19 @@ TAO_EC_Null_Filter::filter_nocopy (RtecEventComm::EventSet& event, void TAO_EC_Null_Filter::push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->parent () != 0) - this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER); } void TAO_EC_Null_Filter::push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->parent () != 0) - this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); } void @@ -113,7 +113,7 @@ int TAO_EC_Null_Filter::add_dependencies ( const RtecEventComm::EventHeader &, const TAO_EC_QOS_Info & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return 0; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h index a9d6c03e718..a3cb7a22850 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h @@ -86,10 +86,10 @@ public: */ virtual int filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; virtual int filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; /** * This is called by the children when they accept an event and @@ -99,10 +99,10 @@ public: */ virtual void push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; /// Clear any saved state, must reset and assume no events have been /// received. @@ -134,7 +134,7 @@ public: */ virtual int add_dependencies (const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; /** * Obtain the QOS information for this filter, the default @@ -143,7 +143,7 @@ public: * Returns 0 on success and -1 on failure */ virtual void get_qos_info (TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: /// The parent... @@ -175,22 +175,22 @@ public: // TAO_EC_Filter. virtual int filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void clear (void); virtual CORBA::ULong max_event_size (void) const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); }; // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp index fdb29f3ccbb..8b8cc5ddbe7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp @@ -23,7 +23,7 @@ TAO_EC_Filter* TAO_EC_Null_Filter_Builder::build ( TAO_EC_ProxyPushSupplier *, RtecEventChannelAdmin::ConsumerQOS& - TAO_ENV_ARG_DECL_NOT_USED) const + ACE_ENV_ARG_DECL_NOT_USED) const { return new TAO_EC_Null_Filter; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h index 7a81a583244..d267399000a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h @@ -47,7 +47,7 @@ public: virtual TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier, RtecEventChannelAdmin::ConsumerQOS& qos - TAO_ENV_ARG_DECL) const = 0; + ACE_ENV_ARG_DECL) const = 0; }; @@ -72,7 +72,7 @@ public: // = The TAO_EC_Filter_Builder methods... TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier, RtecEventChannelAdmin::ConsumerQOS& qos - TAO_ENV_ARG_DECL) const; + ACE_ENV_ARG_DECL) const; }; // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp index 87f78dfc03f..ef141efbfb1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp @@ -70,17 +70,17 @@ TAO_EC_Gateway_IIOP::~TAO_EC_Gateway_IIOP (void) void TAO_EC_Gateway_IIOP::init (RtecEventChannelAdmin::EventChannel_ptr rmt_ec, RtecEventChannelAdmin::EventChannel_ptr lcl_ec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); - this->init_i (rmt_ec, lcl_ec TAO_ENV_ARG_PARAMETER); + this->init_i (rmt_ec, lcl_ec ACE_ENV_ARG_PARAMETER); } void TAO_EC_Gateway_IIOP::init_i (RtecEventChannelAdmin::EventChannel_ptr rmt_ec, RtecEventChannelAdmin::EventChannel_ptr lcl_ec - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (!CORBA::is_nil (this->rmt_ec_.in ())) return; @@ -92,16 +92,16 @@ TAO_EC_Gateway_IIOP::init_i (RtecEventChannelAdmin::EventChannel_ptr rmt_ec, } void -TAO_EC_Gateway_IIOP::close (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_Gateway_IIOP::close (ACE_ENV_SINGLE_ARG_DECL) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); - this->close_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->close_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_EC_Gateway_IIOP::close_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_Gateway_IIOP::close_i (ACE_ENV_SINGLE_ARG_DECL) { // ACE_DEBUG ((LM_DEBUG, "ECG (%t) Closing gateway\n")); @@ -116,7 +116,7 @@ TAO_EC_Gateway_IIOP::close_i (TAO_ENV_SINGLE_ARG_DECL) continue; ACE_TRY { - consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -132,7 +132,7 @@ TAO_EC_Gateway_IIOP::close_i (TAO_ENV_SINGLE_ARG_DECL) if (!CORBA::is_nil (this->default_consumer_proxy_.in ())) { - this->default_consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + this->default_consumer_proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->default_consumer_proxy_ = @@ -141,7 +141,7 @@ TAO_EC_Gateway_IIOP::close_i (TAO_ENV_SINGLE_ARG_DECL) if (!CORBA::is_nil (this->supplier_proxy_.in ())) { - this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = @@ -152,7 +152,7 @@ TAO_EC_Gateway_IIOP::close_i (TAO_ENV_SINGLE_ARG_DECL) void TAO_EC_Gateway_IIOP::update_consumer ( const RtecEventChannelAdmin::ConsumerQOS& c_qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (c_qos.dependencies.length () <= 1) @@ -167,15 +167,15 @@ TAO_EC_Gateway_IIOP::update_consumer ( return; } - this->update_consumer_i (c_qos TAO_ENV_ARG_PARAMETER); + this->update_consumer_i (c_qos ACE_ENV_ARG_PARAMETER); } void TAO_EC_Gateway_IIOP::update_consumer_i ( const RtecEventChannelAdmin::ConsumerQOS& c_qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->close_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->close_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (this->lcl_ec_.in ()) @@ -186,7 +186,7 @@ TAO_EC_Gateway_IIOP::update_consumer_i ( // = Connect as a supplier to the local EC RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - this->lcl_ec_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->lcl_ec_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Change the RT_Info in the consumer QoS. @@ -222,7 +222,7 @@ TAO_EC_Gateway_IIOP::update_consumer_i ( //ACE_DEBUG ((LM_DEBUG, // "ECG (%t) binding source %d\n", // sid)); - proxy = supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy = supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_map_.bind (sid, proxy); } @@ -237,7 +237,7 @@ TAO_EC_Gateway_IIOP::update_consumer_i ( // Obtain a reference to our supplier personality... RtecEventComm::PushSupplier_var supplier_ref = - this->supplier_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // For each subscription by source build the set of publications @@ -281,7 +281,7 @@ TAO_EC_Gateway_IIOP::update_consumer_i ( // ACE_SupplierQOS_Factory::debug (pub); (*j).int_id_->connect_push_supplier (supplier_ref.in (), pub - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -316,12 +316,12 @@ TAO_EC_Gateway_IIOP::update_consumer_i ( // Obtain a reference to our supplier personality... RtecEventComm::PushSupplier_var supplier_ref = - this->supplier_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Obtain the consumer.... this->default_consumer_proxy_ = - supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; pub.publications.length (c); @@ -329,23 +329,23 @@ TAO_EC_Gateway_IIOP::update_consumer_i ( // ACE_SupplierQOS_Factory::debug (pub); this->default_consumer_proxy_->connect_push_supplier (supplier_ref.in (), pub - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - this->rmt_ec_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->rmt_ec_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = - consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_is_active_ = 1; RtecEventComm::PushConsumer_var consumer_ref = - this->consumer_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // ACE_DEBUG ((LM_DEBUG, "ECG (%P|%t) Gateway/Consumer ")); @@ -353,7 +353,7 @@ TAO_EC_Gateway_IIOP::update_consumer_i ( this->supplier_proxy_->connect_push_consumer (consumer_ref.in (), sub - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -361,14 +361,14 @@ TAO_EC_Gateway_IIOP::update_consumer_i ( void TAO_EC_Gateway_IIOP::update_supplier ( const RtecEventChannelAdmin::SupplierQOS& - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Do nothing... } void -TAO_EC_Gateway_IIOP::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EC_Gateway_IIOP::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { // ACE_DEBUG ((LM_DEBUG, // "ECG (%t): Supplier-consumer received " @@ -376,7 +376,7 @@ TAO_EC_Gateway_IIOP::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } void -TAO_EC_Gateway_IIOP::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EC_Gateway_IIOP::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { // ACE_DEBUG ((LM_DEBUG, // "ECG (%t): Supplier received " @@ -385,7 +385,7 @@ TAO_EC_Gateway_IIOP::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // ACE_DEBUG ((LM_DEBUG, "TAO_EC_Gateway_IIOP::push (%P|%t) - \n")); @@ -429,7 +429,7 @@ TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events out[0].header.ttl--; // ACE_DEBUG ((LM_DEBUG, "ECG: event sent to proxy\n")); - proxy->push (out TAO_ENV_ARG_PARAMETER); + proxy->push (out ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -441,7 +441,7 @@ TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events if (this->busy_count_ == 0 && this->update_posted_ != 0) { this->update_posted_ = 0; - this->update_consumer_i (this->c_qos_ TAO_ENV_ARG_PARAMETER); + this->update_consumer_i (this->c_qos_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -449,22 +449,22 @@ TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events } int -TAO_EC_Gateway_IIOP::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_Gateway_IIOP::shutdown (ACE_ENV_SINGLE_ARG_DECL) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, -1); - this->close_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->close_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (this->supplier_is_active_) { PortableServer::POA_var poa = - this->supplier_._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); PortableServer::ObjectId_var id = - poa->servant_to_id (&this->supplier_ TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (&this->supplier_ ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->supplier_is_active_ = 0; } @@ -472,12 +472,12 @@ TAO_EC_Gateway_IIOP::shutdown (TAO_ENV_SINGLE_ARG_DECL) if (this->consumer_is_active_) { PortableServer::POA_var poa = - this->consumer_._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); PortableServer::ObjectId_var id = - poa->servant_to_id (&this->consumer_ TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (&this->consumer_ ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->consumer_is_active_ = 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h index 35f630050e1..19f97e9268e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h @@ -49,7 +49,7 @@ public: /// The gateway must disconnect from all the relevant event channels, /// or any other communication media (such as multicast groups). - virtual void close (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) = 0; + virtual void close (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) = 0; /// Obtain and modify the observer handle. void observer_handle (RtecEventChannelAdmin::Observer_Handle h); @@ -100,42 +100,42 @@ public: /// ECs it will connect to, void init (RtecEventChannelAdmin::EventChannel_ptr rmt_ec, RtecEventChannelAdmin::EventChannel_ptr lcl_ec - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// The channel is disconnecting. - void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// The channel is disconnecting. - void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// This is the Consumer side behavior, it pushes the events to the /// local event channel. void push (const RtecEventComm::EventSet &events - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Disconnect and shutdown the gateway - int shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + int shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // The following methods are documented in the base class. - virtual void close (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void close (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: - void close_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + void close_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); void update_consumer_i (const RtecEventChannelAdmin::ConsumerQOS& sub - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); protected: /// Do the real work in init() void init_i (RtecEventChannelAdmin::EventChannel_ptr rmt_ec, RtecEventChannelAdmin::EventChannel_ptr lcl_ec - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); protected: /// Lock to synchronize internal changes diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp index a4baa6b4b42..879701a3ee7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp @@ -21,11 +21,11 @@ TAO_EC_Gateway_Sched::init (RtecEventChannelAdmin::EventChannel_ptr rmt_ec, RtecScheduler::Scheduler_ptr lcl_sched, const char* lcl_name, const char* rmt_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); - this->init_i (rmt_ec, lcl_ec TAO_ENV_ARG_PARAMETER); + this->init_i (rmt_ec, lcl_ec ACE_ENV_ARG_PARAMETER); ACE_CHECK; // @@ Should we throw a system exception here? @@ -36,7 +36,7 @@ TAO_EC_Gateway_Sched::init (RtecEventChannelAdmin::EventChannel_ptr rmt_ec, ACE_THROW (CORBA::BAD_PARAM ()); this->rmt_info_ = - rmt_sched->create (rmt_name TAO_ENV_ARG_PARAMETER); + rmt_sched->create (rmt_name ACE_ENV_ARG_PARAMETER); ACE_CHECK; // @@ TODO Many things are hard-coded in the RT_Info here. @@ -54,11 +54,11 @@ TAO_EC_Gateway_Sched::init (RtecEventChannelAdmin::EventChannel_ptr rmt_ec, time, 0, RtecScheduler::OPERATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->lcl_info_ = - lcl_sched->create (lcl_name TAO_ENV_ARG_PARAMETER); + lcl_sched->create (lcl_name ACE_ENV_ARG_PARAMETER); ACE_CHECK; tv = ACE_Time_Value (0, 500); @@ -71,6 +71,6 @@ TAO_EC_Gateway_Sched::init (RtecEventChannelAdmin::EventChannel_ptr rmt_ec, time, 1, RtecScheduler::REMOTE_DEPENDANT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h index d93e98634de..2452c13b8b7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h @@ -48,7 +48,7 @@ public: RtecScheduler::Scheduler_ptr lcl_sched, const char* lcl_name, const char* rmt_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); }; #include "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp index 7b447516105..544bf3a1891 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp @@ -197,7 +197,7 @@ TAO_ECG_UDP_Request_Entry::fragment_buffer (CORBA::ULong fragment_offset) void TAO_ECG_UDP_Request_Entry::decode (RtecEventComm::EventSet& event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_InputCDR cdr (&this->payload_, ACE_static_cast(int,this->byte_order_)); @@ -234,7 +234,7 @@ TAO_ECG_UDP_Receiver::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec, ACE_Reactor *reactor, const ACE_Time_Value &expire_interval, int max_timeout - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { this->ignore_from_ = ignore_from; @@ -258,13 +258,13 @@ TAO_ECG_UDP_Receiver::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec, void TAO_ECG_UDP_Receiver::open (RtecEventChannelAdmin::SupplierQOS& pub - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (CORBA::is_nil (this->lcl_ec_.in ())) return; if (!CORBA::is_nil (this->consumer_proxy_.in ())) - this->close (TAO_ENV_SINGLE_ARG_PARAMETER); + this->close (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (pub.publications.length () == 0) @@ -272,15 +272,15 @@ TAO_ECG_UDP_Receiver::open (RtecEventChannelAdmin::SupplierQOS& pub // = Connect as a supplier to the local EC RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - this->lcl_ec_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->lcl_ec_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_ = - supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventComm::PushSupplier_var supplier_ref = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // ACE_DEBUG ((LM_DEBUG, "ECG_UDP_Receiver (%t) Gateway/Supplier ")); @@ -288,35 +288,35 @@ TAO_ECG_UDP_Receiver::open (RtecEventChannelAdmin::SupplierQOS& pub this->consumer_proxy_->connect_push_supplier (supplier_ref.in (), pub - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_ECG_UDP_Receiver::close (TAO_ENV_SINGLE_ARG_DECL) +TAO_ECG_UDP_Receiver::close (ACE_ENV_SINGLE_ARG_DECL) { // ACE_DEBUG ((LM_DEBUG, "ECG (%t) Closing gateway\n")); if (CORBA::is_nil (this->consumer_proxy_.in ())) return; - this->consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_ = RtecEventChannelAdmin::ProxyPushConsumer::_nil (); PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_ECG_UDP_Receiver::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ECG_UDP_Receiver::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -325,9 +325,9 @@ TAO_ECG_UDP_Receiver::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED } void -TAO_ECG_UDP_Receiver::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_ECG_UDP_Receiver::shutdown (ACE_ENV_SINGLE_ARG_DECL) { - this->close (TAO_ENV_SINGLE_ARG_PARAMETER); + this->close (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->lcl_ec_ = RtecEventChannelAdmin::EventChannel::_nil (); @@ -511,14 +511,14 @@ TAO_ECG_UDP_Receiver::handle_input (ACE_SOCK_Dgram& dgram) return 0; } - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { RtecEventComm::EventSet event; - entry->int_id_->decode (event TAO_ENV_ARG_PARAMETER); + entry->int_id_->decode (event ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->consumer_proxy_->push (event TAO_ENV_ARG_PARAMETER); + this->consumer_proxy_->push (event ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // ACE_DEBUG ((LM_DEBUG, @@ -539,9 +539,9 @@ TAO_ECG_UDP_Receiver::handle_input (ACE_SOCK_Dgram& dgram) void TAO_ECG_UDP_Receiver::get_addr (const RtecEventComm::EventHeader& header, RtecUDPAdmin::UDP_Addr_out addr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->addr_server_->get_addr (header, addr TAO_ENV_ARG_PARAMETER); + this->addr_server_->get_addr (header, addr ACE_ENV_ARG_PARAMETER); } int diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h index ca2b9d534a3..c854a6abbd5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h @@ -201,7 +201,7 @@ public: /// Decode the events, the message must be complete. void decode (RtecEventComm::EventSet& event - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Increment the timeout counter... void inc_timeout (void); @@ -299,17 +299,17 @@ public: ACE_Reactor *reactor, const ACE_Time_Value &expire_interval, int max_timeout - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Disconnect and shutdown the gateway, no further connectsions - void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Connect to the EC using the given publications lists. void open (RtecEventChannelAdmin::SupplierQOS& pub - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Disconnect to the EC. - virtual void close (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void close (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /** * The Event_Handlers call this method when data is available at the @@ -324,13 +324,13 @@ public: const void* act); // The PushSupplier method. - virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Call the RtecUDPAdmin::AddrServer void get_addr (const RtecEventComm::EventHeader& header, RtecUDPAdmin::UDP_Addr_out addr - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); private: /// The remote and the local EC, so we can reconnect when the list changes. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp index 40323210aa1..5463f77f0c1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp @@ -14,7 +14,7 @@ void TAO_EC_Group_Scheduling::add_proxy_supplier_dependencies ( TAO_EC_ProxyPushSupplier *, TAO_EC_ProxyPushConsumer * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } @@ -22,12 +22,12 @@ void TAO_EC_Group_Scheduling::schedule_event (const RtecEventComm::EventSet &event, TAO_EC_ProxyPushConsumer *, TAO_EC_Supplier_Filter *filter - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_EC_QOS_Info event_info; // @@ yuck... filter->push_scheduled_event (ACE_const_cast (RtecEventComm::EventSet&, event), event_info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h index dc2eeb96d49..0b7b6f318be 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h @@ -37,11 +37,11 @@ public: virtual void add_proxy_supplier_dependencies ( TAO_EC_ProxyPushSupplier *supplier, TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void schedule_event (const RtecEventComm::EventSet &event, TAO_EC_ProxyPushConsumer *consumer, TAO_EC_Supplier_Filter *filter - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: ACE_UNIMPLEMENTED_FUNC (TAO_EC_Group_Scheduling diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp index 9106c478843..a93cd3cf893 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp @@ -68,10 +68,10 @@ TAO_EC_MT_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecEventComm::EventSet event_copy = event; - this->push_nocopy (proxy, consumer, event_copy, qos_info TAO_ENV_ARG_PARAMETER); + this->push_nocopy (proxy, consumer, event_copy, qos_info ACE_ENV_ARG_PARAMETER); } void @@ -79,11 +79,11 @@ TAO_EC_MT_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, RtecEventComm::EventSet& event, TAO_EC_QOS_Info& - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Double checked locking.... if (this->active_ == 0) this->activate (); - this->task_.push (proxy, consumer, event TAO_ENV_ARG_PARAMETER); + this->task_.push (proxy, consumer, event ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h index 97165aecb7b..43d1db1820d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h @@ -52,12 +52,12 @@ public: RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: /// Use our own thread manager. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp index 627c32801f0..5b9cf65242b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp @@ -45,7 +45,7 @@ TAO_EC_Masked_Type_Filter::size (void) const int TAO_EC_Masked_Type_Filter::filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (event.length () != 1) return 0; @@ -56,7 +56,7 @@ TAO_EC_Masked_Type_Filter::filter (const RtecEventComm::EventSet& event, if (this->parent () != 0) { - this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } return 1; @@ -65,7 +65,7 @@ TAO_EC_Masked_Type_Filter::filter (const RtecEventComm::EventSet& event, int TAO_EC_Masked_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (event.length () != 1) return 0; @@ -76,7 +76,7 @@ TAO_EC_Masked_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event, if (this->parent () != 0) { - this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } return 1; @@ -85,14 +85,14 @@ TAO_EC_Masked_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event, void TAO_EC_Masked_Type_Filter::push (const RtecEventComm::EventSet &, TAO_EC_QOS_Info & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_Masked_Type_Filter::push_nocopy (RtecEventComm::EventSet &, TAO_EC_QOS_Info & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } @@ -122,7 +122,7 @@ int TAO_EC_Masked_Type_Filter::add_dependencies ( const RtecEventComm::EventHeader&, const TAO_EC_QOS_Info & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h index 6a2b6d12317..d28bb93cdcb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h @@ -53,22 +53,22 @@ public: virtual int size (void) const; virtual int filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void clear (void); virtual CORBA::ULong max_event_size (void) const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: ACE_UNIMPLEMENTED_FUNC (TAO_EC_Masked_Type_Filter diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp index bed3ab7655b..eb79fe48cd5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp @@ -41,14 +41,14 @@ TAO_EC_Negation_Filter::size (void) const int TAO_EC_Negation_Filter::filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { int n = - this->child_->filter (event, qos_info TAO_ENV_ARG_PARAMETER); + this->child_->filter (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (this->parent () != 0 && n == 0) { - this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } return 1; @@ -57,14 +57,14 @@ TAO_EC_Negation_Filter::filter (const RtecEventComm::EventSet& event, int TAO_EC_Negation_Filter::filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { int n = - this->child_->filter_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + this->child_->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (this->parent () != 0 && n == 0) { - this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } return 1; @@ -73,14 +73,14 @@ TAO_EC_Negation_Filter::filter_nocopy (RtecEventComm::EventSet& event, void TAO_EC_Negation_Filter::push (const RtecEventComm::EventSet&, TAO_EC_QOS_Info& - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_Negation_Filter::push_nocopy (RtecEventComm::EventSet&, TAO_EC_QOS_Info& - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } @@ -107,7 +107,7 @@ int TAO_EC_Negation_Filter::add_dependencies ( const RtecEventComm::EventHeader&, const TAO_EC_QOS_Info & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h index caee63f3b70..f23700ef739 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h @@ -51,22 +51,22 @@ public: virtual int size (void) const; virtual int filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void clear (void); virtual CORBA::ULong max_event_size (void) const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: ACE_UNIMPLEMENTED_FUNC (TAO_EC_Negation_Filter diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp index 5c78bc13fbf..d99b8ae69ea 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp @@ -14,7 +14,7 @@ void TAO_EC_Null_Scheduling::add_proxy_supplier_dependencies ( TAO_EC_ProxyPushSupplier *, TAO_EC_ProxyPushConsumer * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } @@ -22,7 +22,7 @@ void TAO_EC_Null_Scheduling::schedule_event (const RtecEventComm::EventSet &event, TAO_EC_ProxyPushConsumer *, TAO_EC_Supplier_Filter *filter - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { for (CORBA::ULong j = 0; j < event.length (); ++j) { @@ -33,7 +33,7 @@ TAO_EC_Null_Scheduling::schedule_event (const RtecEventComm::EventSet &event, TAO_EC_QOS_Info event_info; filter->push_scheduled_event (single_event, event_info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h index afcb63f7a0b..6ea335511d0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h @@ -38,11 +38,11 @@ public: virtual void add_proxy_supplier_dependencies ( TAO_EC_ProxyPushSupplier *supplier, TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void schedule_event (const RtecEventComm::EventSet &event, TAO_EC_ProxyPushConsumer *consumer, TAO_EC_Supplier_Filter *filter - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: ACE_UNIMPLEMENTED_FUNC (TAO_EC_Null_Scheduling diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp index 6ea6950d196..777b034a758 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp @@ -25,7 +25,7 @@ TAO_EC_ObserverStrategy::~TAO_EC_ObserverStrategy (void) RtecEventChannelAdmin::Observer_Handle TAO_EC_Null_ObserverStrategy::append_observer ( RtecEventChannelAdmin::Observer_ptr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, @@ -39,7 +39,7 @@ TAO_EC_Null_ObserverStrategy::append_observer ( void TAO_EC_Null_ObserverStrategy::remove_observer ( RtecEventChannelAdmin::Observer_Handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, @@ -50,25 +50,25 @@ TAO_EC_Null_ObserverStrategy::remove_observer ( void TAO_EC_Null_ObserverStrategy::connected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_Null_ObserverStrategy::disconnected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_Null_ObserverStrategy::connected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_Null_ObserverStrategy::disconnected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } @@ -83,7 +83,7 @@ TAO_EC_Basic_ObserverStrategy::~TAO_EC_Basic_ObserverStrategy (void) RtecEventChannelAdmin::Observer_Handle TAO_EC_Basic_ObserverStrategy::append_observer ( RtecEventChannelAdmin::Observer_ptr obs - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, @@ -106,15 +106,15 @@ TAO_EC_Basic_ObserverStrategy::append_observer ( } RtecEventChannelAdmin::ConsumerQOS c_qos; - this->fill_qos (c_qos TAO_ENV_ARG_PARAMETER); + this->fill_qos (c_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - obs->update_consumer (c_qos TAO_ENV_ARG_PARAMETER); + obs->update_consumer (c_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); RtecEventChannelAdmin::SupplierQOS s_qos; - this->fill_qos (s_qos TAO_ENV_ARG_PARAMETER); + this->fill_qos (s_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - obs->update_supplier (s_qos TAO_ENV_ARG_PARAMETER); + obs->update_supplier (s_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return this->handle_generator_; @@ -124,7 +124,7 @@ TAO_EC_Basic_ObserverStrategy::append_observer ( void TAO_EC_Basic_ObserverStrategy::remove_observer ( RtecEventChannelAdmin::Observer_Handle handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, @@ -142,13 +142,13 @@ TAO_EC_Basic_ObserverStrategy::remove_observer ( void TAO_EC_Basic_ObserverStrategy::connected ( TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (consumer->publications ().is_gateway) return; RtecEventChannelAdmin::SupplierQOS s_qos; - this->fill_qos (s_qos TAO_ENV_ARG_PARAMETER); + this->fill_qos (s_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; int size = 0; @@ -176,7 +176,7 @@ TAO_EC_Basic_ObserverStrategy::connected ( for (int i = 0; i != size; ++i) { - copy[i]->update_supplier (s_qos TAO_ENV_ARG_PARAMETER); + copy[i]->update_supplier (s_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -184,13 +184,13 @@ TAO_EC_Basic_ObserverStrategy::connected ( void TAO_EC_Basic_ObserverStrategy::disconnected ( TAO_EC_ProxyPushConsumer* consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (consumer->publications ().is_gateway) return; RtecEventChannelAdmin::SupplierQOS s_qos; - this->fill_qos (s_qos TAO_ENV_ARG_PARAMETER); + this->fill_qos (s_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; int size = 0; @@ -218,7 +218,7 @@ TAO_EC_Basic_ObserverStrategy::disconnected ( for (int i = 0; i != size; ++i) { - copy[i]->update_supplier (s_qos TAO_ENV_ARG_PARAMETER); + copy[i]->update_supplier (s_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -226,13 +226,13 @@ TAO_EC_Basic_ObserverStrategy::disconnected ( void TAO_EC_Basic_ObserverStrategy::connected ( TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (supplier->subscriptions ().is_gateway) return; RtecEventChannelAdmin::ConsumerQOS c_qos; - this->fill_qos (c_qos TAO_ENV_ARG_PARAMETER); + this->fill_qos (c_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; int size = 0; @@ -260,7 +260,7 @@ TAO_EC_Basic_ObserverStrategy::connected ( for (int i = 0; i != size; ++i) { - copy[i]->update_consumer (c_qos TAO_ENV_ARG_PARAMETER); + copy[i]->update_consumer (c_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -268,13 +268,13 @@ TAO_EC_Basic_ObserverStrategy::connected ( void TAO_EC_Basic_ObserverStrategy::disconnected ( TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (supplier->subscriptions ().is_gateway) return; RtecEventChannelAdmin::ConsumerQOS c_qos; - this->fill_qos (c_qos TAO_ENV_ARG_PARAMETER); + this->fill_qos (c_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; int size = 0; @@ -302,7 +302,7 @@ TAO_EC_Basic_ObserverStrategy::disconnected ( for (int i = 0; i != size; ++i) { - copy[i]->update_consumer (c_qos TAO_ENV_ARG_PARAMETER); + copy[i]->update_consumer (c_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -310,12 +310,12 @@ TAO_EC_Basic_ObserverStrategy::disconnected ( void TAO_EC_Basic_ObserverStrategy::fill_qos ( RtecEventChannelAdmin::ConsumerQOS &qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Headers headers; TAO_EC_Accumulate_Supplier_Headers worker (headers); - this->event_channel_->consumer_admin ()->for_each (&worker TAO_ENV_ARG_PARAMETER); + this->event_channel_->consumer_admin ()->for_each (&worker ACE_ENV_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::DependencySet& dep = qos.dependencies; @@ -337,13 +337,13 @@ TAO_EC_Basic_ObserverStrategy::fill_qos ( void TAO_EC_Basic_ObserverStrategy::fill_qos ( RtecEventChannelAdmin::SupplierQOS &qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Headers headers; TAO_EC_Accumulate_Consumer_Headers worker (headers); this->event_channel_->supplier_admin ()->for_each (&worker - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; qos.publications.length (headers.current_size ()); @@ -359,7 +359,7 @@ TAO_EC_Basic_ObserverStrategy::fill_qos ( void TAO_EC_Accumulate_Supplier_Headers::work (TAO_EC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { const RtecEventChannelAdmin::ConsumerQOS& sub = supplier->subscriptions (); @@ -381,7 +381,7 @@ TAO_EC_Accumulate_Supplier_Headers::work (TAO_EC_ProxyPushSupplier *supplier void TAO_EC_Accumulate_Consumer_Headers::work (TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { const RtecEventChannelAdmin::SupplierQOS& pub = consumer->publications (); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h index 1949b1047e9..c36f80e24a0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h @@ -55,7 +55,7 @@ public: /// The basic methods to support the EC strategies. virtual RtecEventChannelAdmin::Observer_Handle append_observer (RtecEventChannelAdmin::Observer_ptr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, @@ -63,7 +63,7 @@ public: = 0; virtual void remove_observer ( RtecEventChannelAdmin::Observer_Handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, @@ -73,16 +73,16 @@ public: /// Used by the EC to inform the ObserverStrategy that a Consumer has /// connected or disconnected from it. virtual void connected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED) = 0; + ACE_ENV_ARG_DECL_NOT_USED) = 0; virtual void disconnected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED) = 0; + ACE_ENV_ARG_DECL_NOT_USED) = 0; /// Used by the EC to inform the ObserverStrategy that a Consumer has /// connected or disconnected from it. virtual void connected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED) = 0; + ACE_ENV_ARG_DECL_NOT_USED) = 0; virtual void disconnected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED) = 0; + ACE_ENV_ARG_DECL_NOT_USED) = 0; }; // **************************************************************** @@ -104,26 +104,26 @@ public: // = The TAO_EC_ObserverStrategy methods. virtual RtecEventChannelAdmin::Observer_Handle append_observer (RtecEventChannelAdmin::Observer_ptr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)); virtual void remove_observer ( RtecEventChannelAdmin::Observer_Handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER)); virtual void connected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void disconnected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void connected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void disconnected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); }; // **************************************************************** @@ -156,26 +156,26 @@ public: // = The TAO_EC_ObserverStrategy methods. virtual RtecEventChannelAdmin::Observer_Handle append_observer (RtecEventChannelAdmin::Observer_ptr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)); virtual void remove_observer ( RtecEventChannelAdmin::Observer_Handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER)); virtual void connected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void disconnected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void connected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void disconnected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); struct Observer_Entry @@ -223,9 +223,9 @@ public: protected: /// Helper functions to compute the consumer and supplier QOS. void fill_qos (RtecEventChannelAdmin::ConsumerQOS &qos - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void fill_qos (RtecEventChannelAdmin::SupplierQOS &qos - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); protected: /// The event channel. @@ -251,7 +251,7 @@ public: TAO_EC_Accumulate_Supplier_Headers (TAO_EC_Basic_ObserverStrategy::Headers &headers); virtual void work (TAO_EC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: TAO_EC_Basic_ObserverStrategy::Headers &headers_; @@ -266,7 +266,7 @@ public: TAO_EC_Accumulate_Consumer_Headers (TAO_EC_Basic_ObserverStrategy::Headers &headers); virtual void work (TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: TAO_EC_Basic_ObserverStrategy::Headers &headers_; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp index 59415cd120a..2b7fa9d3bba 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp @@ -60,7 +60,7 @@ TAO_EC_Per_Supplier_Filter::unbind (TAO_EC_ProxyPushConsumer* consumer) ACE_TRY_NEW_ENV { - this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -72,7 +72,7 @@ TAO_EC_Per_Supplier_Filter::unbind (TAO_EC_ProxyPushConsumer* consumer) void TAO_EC_Per_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); @@ -98,7 +98,7 @@ TAO_EC_Per_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* supplier #if TAO_EC_ENABLE_DEBUG_MESSAGES ACE_DEBUG ((LM_DEBUG, " matched\n")); #endif /* TAO_EC_ENABLED_DEBUG_MESSAGES */ - this->collection_->connected (supplier TAO_ENV_ARG_PARAMETER); + this->collection_->connected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; return; } @@ -110,7 +110,7 @@ TAO_EC_Per_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* supplier void TAO_EC_Per_Supplier_Filter::reconnected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); @@ -131,47 +131,47 @@ TAO_EC_Per_Supplier_Filter::reconnected (TAO_EC_ProxyPushSupplier* supplier if (supplier->can_match (event.header)) { // ACE_DEBUG ((LM_DEBUG, " matched %x\n", supplier)); - this->collection_->connected (supplier TAO_ENV_ARG_PARAMETER); + this->collection_->connected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; return; } } - this->collection_->disconnected (supplier TAO_ENV_ARG_PARAMETER); + this->collection_->disconnected (supplier ACE_ENV_ARG_PARAMETER); } void TAO_EC_Per_Supplier_Filter::disconnected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->collection_->disconnected (supplier TAO_ENV_ARG_PARAMETER); + this->collection_->disconnected (supplier ACE_ENV_ARG_PARAMETER); } void -TAO_EC_Per_Supplier_Filter::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_Per_Supplier_Filter::shutdown (ACE_ENV_SINGLE_ARG_DECL) { - this->collection_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->collection_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); } void TAO_EC_Per_Supplier_Filter::push (const RtecEventComm::EventSet& event, TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_EC_Scheduling_Strategy* scheduling_strategy = this->event_channel_->scheduling_strategy (); scheduling_strategy->schedule_event (event, consumer, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_EC_Per_Supplier_Filter::push_scheduled_event (RtecEventComm::EventSet &event, const TAO_EC_QOS_Info &event_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_EC_Filter_Worker worker (event, event_info); - this->collection_->for_each (&worker TAO_ENV_ARG_PARAMETER); + this->collection_->for_each (&worker ACE_ENV_ARG_PARAMETER); } CORBA::ULong diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h index 3c66a711b74..cc6d6f8f785 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h @@ -51,18 +51,18 @@ public: virtual void bind (TAO_EC_ProxyPushConsumer* consumer); virtual void unbind (TAO_EC_ProxyPushConsumer* consumer); virtual void connected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); + ACE_ENV_ARG_DECL); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void push_scheduled_event (RtecEventComm::EventSet &event, const TAO_EC_QOS_Info &event_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual CORBA::ULong _decr_refcnt (void); virtual CORBA::ULong _incr_refcnt (void); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp index 4a4296b9e19..ed97744f809 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp @@ -25,7 +25,7 @@ TAO_EC_Filter* TAO_EC_Prefix_Filter_Builder::build ( TAO_EC_ProxyPushSupplier *supplier, RtecEventChannelAdmin::ConsumerQOS& qos - TAO_ENV_ARG_DECL_NOT_USED) const + ACE_ENV_ARG_DECL_NOT_USED) const { CORBA::ULong pos = 0; return this->recursive_build (supplier, qos, pos); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h index 9622fb15350..8532908b13b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h @@ -46,7 +46,7 @@ public: // = The TAO_EC_Filter_Builder methods... TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier, RtecEventChannelAdmin::ConsumerQOS& qos - TAO_ENV_ARG_DECL) const; + ACE_ENV_ARG_DECL) const; private: /// Recursively build the filter tree. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp index 6f31edc67ae..2d7a359b555 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp @@ -40,7 +40,7 @@ TAO_EC_Priority_Dispatching::activate (void) ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; for (int i = 0; i < this->ntasks_; ++i) { ACE_TRY @@ -51,7 +51,7 @@ TAO_EC_Priority_Dispatching::activate (void) ACE_OS::sprintf (buf, "Dispatching_Task-%d.us", period); RtecScheduler::handle_t rt_info = - this->scheduler_->create (buf TAO_ENV_ARG_PARAMETER); + this->scheduler_->create (buf ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->scheduler_->set (rt_info, @@ -64,7 +64,7 @@ TAO_EC_Priority_Dispatching::activate (void) 0, // quantum 1, // threads RtecScheduler::OPERATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -113,10 +113,10 @@ TAO_EC_Priority_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecEventComm::EventSet event_copy = event; - this->push_nocopy (proxy, consumer, event_copy, qos_info TAO_ENV_ARG_PARAMETER); + this->push_nocopy (proxy, consumer, event_copy, qos_info ACE_ENV_ARG_PARAMETER); } void @@ -124,7 +124,7 @@ TAO_EC_Priority_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->tasks_ == 0) this->activate (); @@ -137,5 +137,5 @@ TAO_EC_Priority_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, } - this->tasks_[i]->push (proxy, consumer, event TAO_ENV_ARG_PARAMETER); + this->tasks_[i]->push (proxy, consumer, event ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h index f8b78ed2c78..ab0b8acf7e0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h @@ -60,12 +60,12 @@ public: RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: /// Use our own thread manager. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp index 68aab6c9f9c..d57458dac62 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp @@ -20,7 +20,7 @@ void TAO_EC_Priority_Scheduling::add_proxy_supplier_dependencies ( TAO_EC_ProxyPushSupplier *supplier, TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "add_proxy_supplier_dependencies - %x %x\n", supplier, consumer)); @@ -40,11 +40,11 @@ TAO_EC_Priority_Scheduling::add_proxy_supplier_dependencies ( os_priority, p_subpriority, p_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; qos_info.preemption_priority = p_priority; - supplier->add_dependencies (header, qos_info TAO_ENV_ARG_PARAMETER); + supplier->add_dependencies (header, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -53,7 +53,7 @@ void TAO_EC_Priority_Scheduling::schedule_event (const RtecEventComm::EventSet &event, TAO_EC_ProxyPushConsumer *consumer, TAO_EC_Supplier_Filter *filter - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecEventChannelAdmin::SupplierQOS qos = consumer->publications (); @@ -84,13 +84,13 @@ TAO_EC_Priority_Scheduling::schedule_event (const RtecEventComm::EventSet &event os_priority, p_subpriority, p_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; qos_info.preemption_priority = p_priority; } filter->push_scheduled_event (single_event, qos_info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h index 1bce35148a8..c0ac5d9668d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h @@ -45,11 +45,11 @@ public: virtual void add_proxy_supplier_dependencies ( TAO_EC_ProxyPushSupplier *supplier, TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void schedule_event (const RtecEventComm::EventSet &event, TAO_EC_ProxyPushConsumer *consumer, TAO_EC_Supplier_Filter *filter - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: ACE_UNIMPLEMENTED_FUNC (TAO_EC_Priority_Scheduling @@ -58,7 +58,7 @@ private: (const TAO_EC_Priority_Scheduling&)) /// Initialize our RT_Info handle and dependencies - void init_rt_info (TAO_ENV_SINGLE_ARG_DECL); + void init_rt_info (ACE_ENV_SINGLE_ARG_DECL); private: /// The scheduler we are going to use diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp index e8ac866557a..15c63c16b4c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp @@ -39,7 +39,7 @@ TAO_EC_ProxyPushConsumer::~TAO_EC_ProxyPushConsumer (void) CORBA::Boolean TAO_EC_ProxyPushConsumer::supplier_non_existent ( CORBA::Boolean_out disconnected - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Object_var supplier; { @@ -62,7 +62,7 @@ TAO_EC_ProxyPushConsumer::supplier_non_existent ( } #if (TAO_HAS_MINIMUM_CORBA == 0) - return supplier->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + return supplier->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); #else return 0; #endif /* TAO_HAS_MINIMUM_CORBA */ @@ -70,7 +70,7 @@ TAO_EC_ProxyPushConsumer::supplier_non_existent ( void TAO_EC_ProxyPushConsumer::connected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_EC_ProxyPushConsumer_Guard ace_mon (this->lock_, this->refcount_, @@ -79,12 +79,12 @@ TAO_EC_ProxyPushConsumer::connected (TAO_EC_ProxyPushSupplier* supplier if (!ace_mon.locked ()) return; - ace_mon.filter->connected (supplier TAO_ENV_ARG_PARAMETER); + ace_mon.filter->connected (supplier ACE_ENV_ARG_PARAMETER); } void TAO_EC_ProxyPushConsumer::reconnected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_EC_ProxyPushConsumer_Guard ace_mon (this->lock_, this->refcount_, @@ -93,12 +93,12 @@ TAO_EC_ProxyPushConsumer::reconnected (TAO_EC_ProxyPushSupplier* supplier if (!ace_mon.locked ()) return; - ace_mon.filter->reconnected (supplier TAO_ENV_ARG_PARAMETER); + ace_mon.filter->reconnected (supplier ACE_ENV_ARG_PARAMETER); } void TAO_EC_ProxyPushConsumer::disconnected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_EC_ProxyPushConsumer_Guard ace_mon (this->lock_, this->refcount_, @@ -107,29 +107,29 @@ TAO_EC_ProxyPushConsumer::disconnected (TAO_EC_ProxyPushSupplier* supplier if (!ace_mon.locked ()) return; - ace_mon.filter->disconnected (supplier TAO_ENV_ARG_PARAMETER); + ace_mon.filter->disconnected (supplier ACE_ENV_ARG_PARAMETER); } void TAO_EC_ProxyPushConsumer::connected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_ProxyPushConsumer::reconnected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_ProxyPushConsumer::disconnected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void -TAO_EC_ProxyPushConsumer::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_ProxyPushConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL) { RtecEventComm::PushSupplier_var supplier; @@ -144,14 +144,14 @@ TAO_EC_ProxyPushConsumer::shutdown (TAO_ENV_SINGLE_ARG_DECL) if (this->filter_ != 0) { - this->filter_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->filter_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->cleanup_i (); } } - this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (supplier.in ())) @@ -159,7 +159,7 @@ TAO_EC_ProxyPushConsumer::shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { - supplier->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -186,14 +186,14 @@ TAO_EC_ProxyPushConsumer::cleanup_i (void) } RtecEventChannelAdmin::ProxyPushConsumer_ptr -TAO_EC_ProxyPushConsumer::activate (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_ProxyPushConsumer::activate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { RtecEventChannelAdmin::ProxyPushConsumer_var result; ACE_TRY { result = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -205,17 +205,17 @@ TAO_EC_ProxyPushConsumer::activate (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_EC_ProxyPushConsumer::deactivate (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_ProxyPushConsumer::deactivate (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -254,7 +254,7 @@ void TAO_EC_ProxyPushConsumer::connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, const RtecEventChannelAdmin::SupplierQOS& qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::AlreadyConnected)) { @@ -285,7 +285,7 @@ TAO_EC_ProxyPushConsumer::connect_push_supplier ( // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); ACE_CHECK; - this->event_channel_->reconnected (this TAO_ENV_ARG_PARAMETER); + this->event_channel_->reconnected (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -311,12 +311,12 @@ TAO_EC_ProxyPushConsumer::connect_push_supplier ( } // Notify the event channel... - this->event_channel_->connected (this TAO_ENV_ARG_PARAMETER); + this->event_channel_->connected (this ACE_ENV_ARG_PARAMETER); } void TAO_EC_ProxyPushConsumer::push (const RtecEventComm::EventSet& event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_EC_ProxyPushConsumer_Guard ace_mon (this->lock_, @@ -328,13 +328,13 @@ TAO_EC_ProxyPushConsumer::push (const RtecEventComm::EventSet& event // No need to keep the lock, the filter_ class is supposed to be // thread safe.... - ace_mon.filter->push (event, this TAO_ENV_ARG_PARAMETER); + ace_mon.filter->push (event, this ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_EC_ProxyPushConsumer::disconnect_push_consumer ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { RtecEventComm::PushSupplier_var supplier; @@ -356,7 +356,7 @@ TAO_EC_ProxyPushConsumer::disconnect_push_consumer ( } // Notify the event channel... - this->event_channel_->disconnected (this TAO_ENV_ARG_PARAMETER); + this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (supplier.in ())) @@ -368,7 +368,7 @@ TAO_EC_ProxyPushConsumer::disconnect_push_consumer ( { ACE_TRY { - supplier->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -381,19 +381,19 @@ TAO_EC_ProxyPushConsumer::disconnect_push_consumer ( } PortableServer::POA_ptr -TAO_EC_ProxyPushConsumer::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EC_ProxyPushConsumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_EC_ProxyPushConsumer::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EC_ProxyPushConsumer::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_incr_refcnt (); } void -TAO_EC_ProxyPushConsumer::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EC_ProxyPushConsumer::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_decr_refcnt (); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h index 902912a2183..10159ac8bd6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h @@ -62,10 +62,10 @@ public: virtual ~TAO_EC_ProxyPushConsumer (void); /// Activate in the POA - virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr activate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); + virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr activate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Deactivate from the POA - void deactivate (TAO_ENV_SINGLE_ARG_DECL); + void deactivate (ACE_ENV_SINGLE_ARG_DECL); /// Return 0 if no supplier is connected... CORBA::Boolean is_connected (void) const; @@ -83,28 +83,28 @@ public: * flag. */ CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Concrete implementations can use this methods to keep track of /// the consumers interested in this events. virtual void connected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Usually implemented as no-ops, but some configurations may /// require this methods. virtual void connected (TAO_EC_ProxyPushConsumer* consumer - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void reconnected (TAO_EC_ProxyPushConsumer* consumer - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void disconnected (TAO_EC_ProxyPushConsumer* consumer - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// The event channel is shutting down - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); /// The QoS (subscription) used to connect to the EC, assumes the /// locks are held, use with care! @@ -118,19 +118,19 @@ public: virtual void connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, const RtecEventChannelAdmin::SupplierQOS& qos - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::AlreadyConnected)); virtual void push (const RtecEventComm::EventSet& event - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // = The Servant methods - virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); - virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); + virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); protected: /// Set the supplier, used by some implementations to change the diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp index 6ceb4cf2028..be322c6c6a7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp @@ -39,54 +39,54 @@ TAO_EC_ProxyPushSupplier::~TAO_EC_ProxyPushSupplier (void) void TAO_EC_ProxyPushSupplier::connected (TAO_EC_ProxyPushConsumer* consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_EC_Scheduling_Strategy *s = this->event_channel_->scheduling_strategy (); s->add_proxy_supplier_dependencies (this, consumer - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_EC_ProxyPushSupplier::reconnected (TAO_EC_ProxyPushConsumer* consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_EC_Scheduling_Strategy *s = this->event_channel_->scheduling_strategy (); s->add_proxy_supplier_dependencies (this, consumer - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_EC_ProxyPushSupplier::disconnected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_ProxyPushSupplier::connected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_ProxyPushSupplier::reconnected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_ProxyPushSupplier::disconnected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void -TAO_EC_ProxyPushSupplier::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_ProxyPushSupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL) { // Save the consumer we where connected to, we need to send a // disconnect message to it. @@ -106,7 +106,7 @@ TAO_EC_ProxyPushSupplier::shutdown (TAO_ENV_SINGLE_ARG_DECL) this->cleanup_i (); } - this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (consumer.in ())) @@ -114,7 +114,7 @@ TAO_EC_ProxyPushSupplier::shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { - consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -138,14 +138,14 @@ TAO_EC_ProxyPushSupplier::cleanup_i (void) } RtecEventChannelAdmin::ProxyPushSupplier_ptr -TAO_EC_ProxyPushSupplier::activate (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_ProxyPushSupplier::activate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { RtecEventChannelAdmin::ProxyPushSupplier_var result; ACE_TRY { result = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -157,17 +157,17 @@ TAO_EC_ProxyPushSupplier::activate (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_EC_ProxyPushSupplier::deactivate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (()) +TAO_EC_ProxyPushSupplier::deactivate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (()) { ACE_TRY { PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -206,7 +206,7 @@ void TAO_EC_ProxyPushSupplier::connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, const RtecEventChannelAdmin::ConsumerQOS& qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::AlreadyConnected, RtecEventChannelAdmin::TypeError)) @@ -236,7 +236,7 @@ TAO_EC_ProxyPushSupplier::connect_push_consumer ( this->child_ = this->event_channel_->filter_builder ()->build (this, this->qos_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->adopt_child (this->child_); @@ -250,7 +250,7 @@ TAO_EC_ProxyPushSupplier::connect_push_consumer ( // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); ACE_CHECK; - this->event_channel_->reconnected (this TAO_ENV_ARG_PARAMETER); + this->event_channel_->reconnected (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -272,19 +272,19 @@ TAO_EC_ProxyPushSupplier::connect_push_consumer ( this->child_ = this->event_channel_->filter_builder ()->build (this, this->qos_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->adopt_child (this->child_); } // Notify the event channel... - this->event_channel_->connected (this TAO_ENV_ARG_PARAMETER); + this->event_channel_->connected (this ACE_ENV_ARG_PARAMETER); } void TAO_EC_ProxyPushSupplier::disconnect_push_supplier ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { RtecEventComm::PushConsumer_var consumer; @@ -305,7 +305,7 @@ TAO_EC_ProxyPushSupplier::disconnect_push_supplier ( } // Notify the event channel.... - this->event_channel_->disconnected (this TAO_ENV_ARG_PARAMETER); + this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!connected) @@ -317,7 +317,7 @@ TAO_EC_ProxyPushSupplier::disconnect_push_supplier ( { ACE_TRY { - consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -332,7 +332,7 @@ TAO_EC_ProxyPushSupplier::disconnect_push_supplier ( } void -TAO_EC_ProxyPushSupplier::suspend_connection (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_ProxyPushSupplier::suspend_connection (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_THROW_EX ( @@ -345,7 +345,7 @@ TAO_EC_ProxyPushSupplier::suspend_connection (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_EC_ProxyPushSupplier::resume_connection (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_ProxyPushSupplier::resume_connection (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_THROW_EX ( @@ -362,7 +362,7 @@ typedef TAO_ESF_Proxy_RefCount_Guardrefcount_, this->event_channel_, @@ -379,7 +379,7 @@ TAO_EC_ProxyPushSupplier::filter (const RtecEventComm::EventSet& event, return 0; result = - this->child_->filter (event, qos_info TAO_ENV_ARG_PARAMETER); + this->child_->filter (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } return result; @@ -388,7 +388,7 @@ TAO_EC_ProxyPushSupplier::filter (const RtecEventComm::EventSet& event, int TAO_EC_ProxyPushSupplier::filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Destroy_Guard auto_destroy (this->refcount_, this->event_channel_, @@ -405,7 +405,7 @@ TAO_EC_ProxyPushSupplier::filter_nocopy (RtecEventComm::EventSet& event, return 0; result = - this->child_->filter_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + this->child_->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } return result; @@ -414,7 +414,7 @@ TAO_EC_ProxyPushSupplier::filter_nocopy (RtecEventComm::EventSet& event, void TAO_EC_ProxyPushSupplier::push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // The mutex is already held by the caller (usually the filter() // method) @@ -450,7 +450,7 @@ TAO_EC_ProxyPushSupplier::push (const RtecEventComm::EventSet& event, consumer.in (), event, qos_info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -461,7 +461,7 @@ TAO_EC_ProxyPushSupplier::push (const RtecEventComm::EventSet& event, void TAO_EC_ProxyPushSupplier::push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // The mutex is already held by the caller (usually the filter() // method) @@ -496,7 +496,7 @@ TAO_EC_ProxyPushSupplier::push_nocopy (RtecEventComm::EventSet& event, consumer.in (), event, qos_info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -508,7 +508,7 @@ void TAO_EC_ProxyPushSupplier::push_to_consumer ( RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet& event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { { ACE_GUARD_THROW_EX ( @@ -525,7 +525,7 @@ TAO_EC_ProxyPushSupplier::push_to_consumer ( ACE_TRY { - consumer->push (event TAO_ENV_ARG_PARAMETER); + consumer->push (event ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used) @@ -542,7 +542,7 @@ TAO_EC_ProxyPushSupplier::push_to_consumer ( TAO_EC_ConsumerControl *control = this->event_channel_->consumer_control (); - control->consumer_not_exist (this TAO_ENV_ARG_PARAMETER); + control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -562,7 +562,7 @@ TAO_EC_ProxyPushSupplier::push_to_consumer ( control->system_exception (this, sysex - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -577,11 +577,11 @@ void TAO_EC_ProxyPushSupplier::reactive_push_to_consumer ( RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet& event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { - consumer->push (event TAO_ENV_ARG_PARAMETER); + consumer->push (event ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used) @@ -589,7 +589,7 @@ TAO_EC_ProxyPushSupplier::reactive_push_to_consumer ( TAO_EC_ConsumerControl *control = this->event_channel_->consumer_control (); - control->consumer_not_exist (this TAO_ENV_ARG_PARAMETER); + control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) @@ -599,7 +599,7 @@ TAO_EC_ProxyPushSupplier::reactive_push_to_consumer ( control->system_exception (this, sysex - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } ACE_CATCHANY @@ -612,7 +612,7 @@ TAO_EC_ProxyPushSupplier::reactive_push_to_consumer ( CORBA::Boolean TAO_EC_ProxyPushSupplier::consumer_non_existent ( CORBA::Boolean_out disconnected - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Object_var consumer; { @@ -632,7 +632,7 @@ TAO_EC_ProxyPushSupplier::consumer_non_existent ( } #if (TAO_HAS_MINIMUM_CORBA == 0) - return consumer->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + return consumer->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); #else return 0; #endif /* TAO_HAS_MINIMUM_CORBA */ @@ -670,7 +670,7 @@ int TAO_EC_ProxyPushSupplier::add_dependencies ( const RtecEventComm::EventHeader &header, const TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD_THROW_EX ( ACE_Lock, ace_mon, *this->lock_, @@ -679,23 +679,23 @@ TAO_EC_ProxyPushSupplier::add_dependencies ( return this->child_->add_dependencies (header, qos_info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } PortableServer::POA_ptr -TAO_EC_ProxyPushSupplier::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EC_ProxyPushSupplier::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_EC_ProxyPushSupplier::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EC_ProxyPushSupplier::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_incr_refcnt (); } void -TAO_EC_ProxyPushSupplier::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EC_ProxyPushSupplier::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_decr_refcnt (); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h index 7a74c6c5c83..13c6b12a2d5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h @@ -62,10 +62,10 @@ public: virtual ~TAO_EC_ProxyPushSupplier (void); /// Activate in the POA - virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr activate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); + virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr activate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Deactivate from the POA - virtual void deactivate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (()); + virtual void deactivate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (()); /// Return 0 if no consumer is connected... CORBA::Boolean is_connected (void) const; @@ -85,32 +85,32 @@ public: /// Concrete implementations can use this methods to keep track of /// the suppliers that publish its events. virtual void connected (TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void reconnected (TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void disconnected (TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Usually implemented as no-ops, but some configurations may /// require this methods. virtual void connected (TAO_EC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void reconnected (TAO_EC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void disconnected (TAO_EC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// The event channel is shutting down - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL); /// Pushes to the consumer, verifies that it is connected and that it /// is not suspended. void push_to_consumer (RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet &event - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void reactive_push_to_consumer (RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet &event - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /** * Invoke the _non_existent() pseudo-operation on the consumer. If @@ -118,21 +118,21 @@ public: * flag. */ CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // = The RtecEventChannelAdmin::ProxyPushSupplier methods... virtual void connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, const RtecEventChannelAdmin::ConsumerQOS &qos - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::AlreadyConnected, RtecEventChannelAdmin::TypeError)); - virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void suspend_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void suspend_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void resume_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void resume_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); /// Increment and decrement the reference count. @@ -142,27 +142,27 @@ public: // = The TAO_EC_Filter methods, only push() is implemented... virtual int filter (const RtecEventComm::EventSet &event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet &event, TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet &event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet &event, TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void clear (void); virtual CORBA::ULong max_event_size (void) const; virtual int can_match (const RtecEventComm::EventHeader &header) const; virtual int add_dependencies (const RtecEventComm::EventHeader &header, const TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // = The Servant methods - virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); - virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL); - virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); + virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL); + virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL); protected: /// Set the consumer, used by some implementations to change the diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp index 8599a2632bc..7ab7c5e6e20 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp @@ -72,10 +72,10 @@ TAO_EC_RTCORBA_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecEventComm::EventSet event_copy = event; - this->push_nocopy (proxy, consumer, event_copy, qos_info TAO_ENV_ARG_PARAMETER); + this->push_nocopy (proxy, consumer, event_copy, qos_info ACE_ENV_ARG_PARAMETER); } void @@ -83,10 +83,10 @@ TAO_EC_RTCORBA_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, RtecEventComm::EventSet& event, TAO_EC_QOS_Info& - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RTCORBA::Priority current_priority = - this->current_->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER); + this->current_->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; for (CORBA::ULong i = 0; i != this->lanes_.length (); ++i) @@ -98,7 +98,7 @@ TAO_EC_RTCORBA_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, // some... this->tasks_[i].push (proxy, consumer, event - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; break; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h index ab75cb13e33..e5d4508c2b6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h @@ -51,12 +51,12 @@ public: RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: /// The thread pools... diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp index ffeaf1d754f..28e88b335ec 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp @@ -49,17 +49,17 @@ TAO_EC_RTCORBA_Factory::create_dispatching (TAO_EC_Event_Channel *) int argc = 0; CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + CORBA::Object_var obj = orb->resolve_initial_references ("PriorityMappingManager" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::PriorityMappingManager_var priority_mapping_manager = RTCORBA::PriorityMappingManager::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::PriorityMapping *priority_mapping = @@ -67,10 +67,10 @@ TAO_EC_RTCORBA_Factory::create_dispatching (TAO_EC_Event_Channel *) obj = orb->resolve_initial_references ("RTCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); RTCORBA::Current_var current = RTCORBA::Current::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_NEW_RETURN (dispatching, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp index f7e4467928a..659e6f0250b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp @@ -36,11 +36,11 @@ TAO_EC_Reactive_ConsumerControl::~TAO_EC_Reactive_ConsumerControl (void) void TAO_EC_Reactive_ConsumerControl::query_consumers ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) { TAO_EC_Ping_Consumer worker (this); this->event_channel_->consumer_admin ()->for_each (&worker - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -56,26 +56,26 @@ TAO_EC_Reactive_ConsumerControl::handle_timeout ( CORBA::PolicyTypeSeq types; CORBA::PolicyList_var policies = this->policy_current_->get_policy_overrides (types - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Change the timeout this->policy_current_->set_policy_overrides (this->policy_list_, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Query the state of the consumers... - this->query_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->query_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->policy_current_->set_policy_overrides (policies.in (), CORBA::SET_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (CORBA::ULong i = 0; i != policies->length (); ++i) { - policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -102,12 +102,12 @@ TAO_EC_Reactive_ConsumerControl::activate (void) // Get the PolicyCurrent object CORBA::Object_var tmp = this->orb_->resolve_initial_references ("PolicyCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->policy_current_ = CORBA::PolicyCurrent::_narrow (tmp.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Pre-compute the policy list to the set the right timeout @@ -122,7 +122,7 @@ TAO_EC_Reactive_ConsumerControl::activate (void) this->orb_->create_policy ( Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -145,14 +145,14 @@ TAO_EC_Reactive_ConsumerControl::shutdown (void) void TAO_EC_Reactive_ConsumerControl::consumer_not_exist ( TAO_EC_ProxyPushSupplier *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { //ACE_DEBUG ((LM_DEBUG, // "EC_Reactive_ConsumerControl(%P|%t) - " // "Consumer %x does not exists\n", long(proxy))); - proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -168,7 +168,7 @@ void TAO_EC_Reactive_ConsumerControl::system_exception ( TAO_EC_ProxyPushSupplier *proxy, CORBA::SystemException & /* exception */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -182,7 +182,7 @@ TAO_EC_Reactive_ConsumerControl::system_exception ( // return; // Anything else is serious, including timeouts... - proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -213,24 +213,24 @@ TAO_EC_ConsumerControl_Adapter::handle_timeout ( void TAO_EC_Ping_Consumer::work (TAO_EC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { CORBA::Boolean disconnected; CORBA::Boolean non_existent = supplier->consumer_non_existent (disconnected - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (non_existent && !disconnected) { - this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER); + this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) { - this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER); + this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::TRANSIENT, transient) @@ -238,7 +238,7 @@ TAO_EC_Ping_Consumer::work (TAO_EC_ProxyPushSupplier *supplier // This is TAO's minor code for a failed connection, we may // want to be more lenient in the future.. // if (transient.minor () == 0x54410085) - this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER); + this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h index eddff6b86c9..7c363bf9876 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h @@ -81,15 +81,15 @@ public: virtual int activate (void); virtual int shutdown (void); virtual void consumer_not_exist (TAO_EC_ProxyPushSupplier *proxy - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void system_exception (TAO_EC_ProxyPushSupplier *proxy, CORBA::SystemException & - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); private: /// Check if the consumers still exists. It is a helper method for /// handle_timeout() to isolate the exceptions. - void query_consumers (TAO_ENV_SINGLE_ARG_DECL); + void query_consumers (ACE_ENV_SINGLE_ARG_DECL); private: /// The polling rate @@ -122,7 +122,7 @@ public: TAO_EC_Ping_Consumer (TAO_EC_ConsumerControl *control); virtual void work (TAO_EC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: TAO_EC_ConsumerControl *control_; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp index 4104bcca997..bfb106ef3e3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp @@ -36,11 +36,11 @@ TAO_EC_Reactive_SupplierControl::~TAO_EC_Reactive_SupplierControl (void) void TAO_EC_Reactive_SupplierControl::query_suppliers ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) { TAO_EC_Ping_Supplier worker (this); this->event_channel_->supplier_admin ()->for_each (&worker - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -56,26 +56,26 @@ TAO_EC_Reactive_SupplierControl::handle_timeout ( CORBA::PolicyTypeSeq types; CORBA::PolicyList_var policies = this->policy_current_->get_policy_overrides (types - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Change the timeout this->policy_current_->set_policy_overrides (this->policy_list_, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Query the state of the suppliers... - this->query_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->query_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->policy_current_->set_policy_overrides (policies.in (), CORBA::SET_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (CORBA::ULong i = 0; i != policies->length (); ++i) { - policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -102,12 +102,12 @@ TAO_EC_Reactive_SupplierControl::activate (void) // Get the PolicyCurrent object CORBA::Object_var tmp = this->orb_->resolve_initial_references ("PolicyCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->policy_current_ = CORBA::PolicyCurrent::_narrow (tmp.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Pre-compute the policy list to the set the right timeout @@ -122,7 +122,7 @@ TAO_EC_Reactive_SupplierControl::activate (void) this->orb_->create_policy ( Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -145,14 +145,14 @@ TAO_EC_Reactive_SupplierControl::shutdown (void) void TAO_EC_Reactive_SupplierControl::supplier_not_exist ( TAO_EC_ProxyPushConsumer *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { //ACE_DEBUG ((LM_DEBUG, // "EC_Reactive_SupplierControl(%P|%t) - " // "Consumer %x does not exists\n", long(proxy))); - proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -166,7 +166,7 @@ void TAO_EC_Reactive_SupplierControl::system_exception ( TAO_EC_ProxyPushConsumer *proxy, CORBA::SystemException & /* exception */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -180,7 +180,7 @@ TAO_EC_Reactive_SupplierControl::system_exception ( // return; // Anything else is serious, including timeouts... - proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -211,24 +211,24 @@ TAO_EC_SupplierControl_Adapter::handle_timeout ( void TAO_EC_Ping_Supplier::work (TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { CORBA::Boolean disconnected; CORBA::Boolean non_existent = consumer->supplier_non_existent (disconnected - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (non_existent && !disconnected) { - this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER); + this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) { - this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER); + this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::TRANSIENT, transient) @@ -236,7 +236,7 @@ TAO_EC_Ping_Supplier::work (TAO_EC_ProxyPushConsumer *consumer // This is TAO's minor code for a failed connection, we may // want to be more lenient in the future.. // if (transient.minor () == 0x54410085) - this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER); + this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h index ef97e4677df..3eafb702595 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h @@ -81,15 +81,15 @@ public: virtual int activate (void); virtual int shutdown (void); virtual void supplier_not_exist (TAO_EC_ProxyPushConsumer *proxy - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void system_exception (TAO_EC_ProxyPushConsumer *proxy, CORBA::SystemException & - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); private: /// Check if the suppliers still exists. It is a helper method for /// handle_timeout() to isolate the exceptions. - void query_suppliers (TAO_ENV_SINGLE_ARG_DECL); + void query_suppliers (ACE_ENV_SINGLE_ARG_DECL); private: /// The polling rate @@ -122,7 +122,7 @@ public: TAO_EC_Ping_Supplier (TAO_EC_SupplierControl *control); virtual void work (TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: TAO_EC_SupplierControl *control_; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp index 6306943ef3f..7391d41bd8c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp @@ -56,25 +56,25 @@ TAO_EC_Sched_Filter::size (void) const int TAO_EC_Sched_Filter::filter (const RtecEventComm::EventSet &event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - return this->body_->filter (event, qos_info TAO_ENV_ARG_PARAMETER); + return this->body_->filter (event, qos_info ACE_ENV_ARG_PARAMETER); } int TAO_EC_Sched_Filter::filter_nocopy (RtecEventComm::EventSet &event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - return this->body_->filter_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + return this->body_->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); } // This is private, so we can make it inline in the .cpp file... void TAO_EC_Sched_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->init_rt_info (TAO_ENV_SINGLE_ARG_PARAMETER); + this->init_rt_info (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; qos_info.rt_info = this->rt_info_; @@ -94,7 +94,7 @@ TAO_EC_Sched_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info os_priority, p_subpriority, p_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; qos_info.preemption_priority = p_priority; } @@ -104,14 +104,14 @@ TAO_EC_Sched_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info void TAO_EC_Sched_Filter::push (const RtecEventComm::EventSet &event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->parent () != 0) { - this->compute_qos_info (qos_info TAO_ENV_ARG_PARAMETER); + this->compute_qos_info (qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -119,14 +119,14 @@ TAO_EC_Sched_Filter::push (const RtecEventComm::EventSet &event, void TAO_EC_Sched_Filter::push_nocopy (RtecEventComm::EventSet &event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->parent () != 0) { - this->compute_qos_info (qos_info TAO_ENV_ARG_PARAMETER); + this->compute_qos_info (qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -152,25 +152,25 @@ TAO_EC_Sched_Filter::can_match (const RtecEventComm::EventHeader& header) const int TAO_EC_Sched_Filter::add_dependencies (const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->init_rt_info (TAO_ENV_SINGLE_ARG_PARAMETER); + this->init_rt_info (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); int matches = this->body_->add_dependencies (header, qos_info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (matches != 0) { this->scheduler_->add_dependency (this->rt_info_, qos_info.rt_info, 1, RtecBase::TWO_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); RtecScheduler::RT_Info_var info = - this->scheduler_->get (qos_info.rt_info TAO_ENV_ARG_PARAMETER); + this->scheduler_->get (qos_info.rt_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", this->name_.c_str (), @@ -180,7 +180,7 @@ TAO_EC_Sched_Filter::add_dependencies (const RtecEventComm::EventHeader& header, ChildrenIterator end = this->end (); for (ChildrenIterator i = this->begin (); i != end; ++i) { - (*i)->add_dependencies (header, qos_info TAO_ENV_ARG_PARAMETER); + (*i)->add_dependencies (header, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } return 0; @@ -188,16 +188,16 @@ TAO_EC_Sched_Filter::add_dependencies (const RtecEventComm::EventHeader& header, void TAO_EC_Sched_Filter::get_qos_info (TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->init_rt_info (TAO_ENV_SINGLE_ARG_PARAMETER); + this->init_rt_info (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; qos_info.rt_info = this->rt_info_; } void -TAO_EC_Sched_Filter::init_rt_info (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_Sched_Filter::init_rt_info (ACE_ENV_SINGLE_ARG_DECL) { if (this->rt_info_computed_) return; @@ -214,7 +214,7 @@ TAO_EC_Sched_Filter::init_rt_info (TAO_ENV_SINGLE_ARG_DECL) 0, // quantum 0, // threads this->info_type_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; #if 0 @@ -224,17 +224,17 @@ TAO_EC_Sched_Filter::init_rt_info (TAO_ENV_SINGLE_ARG_DECL) TAO_EC_Filter* filter = *i; TAO_EC_QOS_Info child; - filter->get_qos_info (child TAO_ENV_ARG_PARAMETER); + filter->get_qos_info (child ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->scheduler_->add_dependency (this->rt_info_, child.rt_info, 1, RtecBase::TWO_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; RtecScheduler::RT_Info_var info = - this->scheduler_->get (child.rt_info TAO_ENV_ARG_PARAMETER); + this->scheduler_->get (child.rt_info ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", info->entry_point.in (), @@ -250,11 +250,11 @@ TAO_EC_Sched_Filter::init_rt_info (TAO_ENV_SINGLE_ARG_DECL) this->body_info_, 1, RtecBase::TWO_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; RtecScheduler::RT_Info_var info = - this->scheduler_->get (this->body_info_ TAO_ENV_ARG_PARAMETER); + this->scheduler_->get (this->body_info_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", info->entry_point.in (), @@ -267,11 +267,11 @@ TAO_EC_Sched_Filter::init_rt_info (TAO_ENV_SINGLE_ARG_DECL) this->rt_info_, 1, RtecBase::TWO_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; RtecScheduler::RT_Info_var info = - this->scheduler_->get (this->parent_info_ TAO_ENV_ARG_PARAMETER); + this->scheduler_->get (this->parent_info_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", this->name_.c_str (), diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h index 69accbb1460..79c214263cf 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h @@ -64,24 +64,24 @@ public: virtual int size (void) const; virtual int filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void clear (void); virtual CORBA::ULong max_event_size (void) const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void get_qos_info (TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: ACE_UNIMPLEMENTED_FUNC (TAO_EC_Sched_Filter @@ -90,11 +90,11 @@ private: (const TAO_EC_Sched_Filter&)) /// Initialize our RT_Info handle and dependencies - void init_rt_info (TAO_ENV_SINGLE_ARG_DECL); + void init_rt_info (ACE_ENV_SINGLE_ARG_DECL); /// Compute a new qos_info to push up. void compute_qos_info (TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: /// The RT_Info handle for this object diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp index 5f81a9b265a..593fdc01afd 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp @@ -23,25 +23,25 @@ TAO_EC_Filter* TAO_EC_Sched_Filter_Builder::build ( TAO_EC_ProxyPushSupplier *supplier, RtecEventChannelAdmin::ConsumerQOS& qos - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { CORBA::ULong pos = 0; CORBA::Object_var tmp = this->event_channel_->scheduler (); RtecScheduler::Scheduler_var scheduler = - RtecScheduler::Scheduler::_narrow (tmp.in () TAO_ENV_ARG_PARAMETER); + RtecScheduler::Scheduler::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // @@ How do we figure out which parent??? RtecScheduler::handle_t parent_info = - scheduler->lookup ("Dispatching_Task-250000.us" TAO_ENV_ARG_PARAMETER); + scheduler->lookup ("Dispatching_Task-250000.us" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return this->recursive_build (supplier, qos, pos, scheduler.in (), parent_info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } TAO_EC_Filter* @@ -51,7 +51,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( CORBA::ULong& pos, RtecScheduler::Scheduler_ptr scheduler, RtecScheduler::handle_t parent_info - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { const RtecEventComm::Event& e = qos.dependencies[pos].event; @@ -61,11 +61,11 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( ACE_CString name; this->recursive_name (qos, npos, scheduler, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); RtecScheduler::handle_t rt_info = - scheduler->create (name.c_str () TAO_ENV_ARG_PARAMETER); + scheduler->create (name.c_str () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); pos++; // Consume the designator @@ -78,7 +78,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( children[i] = this->recursive_build (supplier, qos, pos, scheduler, rt_info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -94,7 +94,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( RtecScheduler::CONJUNCTION), 0); TAO_EC_QOS_Info qos_info; - filter->get_qos_info (qos_info TAO_ENV_ARG_PARAMETER); + filter->get_qos_info (qos_info ACE_ENV_ARG_PARAMETER); // @@ ACE_CHECK_RETURN (0); return filter; @@ -106,11 +106,11 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( ACE_CString name; this->recursive_name (qos, npos, scheduler, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); RtecScheduler::handle_t rt_info = - scheduler->create (name.c_str () TAO_ENV_ARG_PARAMETER); + scheduler->create (name.c_str () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); pos++; // Consume the designator @@ -123,7 +123,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( children[i] = this->recursive_build (supplier, qos, pos, scheduler, rt_info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } TAO_EC_Sched_Filter *filter; @@ -139,7 +139,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( 0); TAO_EC_QOS_Info qos_info; - filter->get_qos_info (qos_info TAO_ENV_ARG_PARAMETER); + filter->get_qos_info (qos_info ACE_ENV_ARG_PARAMETER); // @@ ACE_CHECK_RETURN (0); return filter; @@ -161,7 +161,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( TAO_EC_QOS_Info qos_info; qos_info.rt_info = - scheduler->create (name.c_str () TAO_ENV_ARG_PARAMETER); + scheduler->create (name.c_str () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Convert the time to the proper units.... @@ -179,14 +179,14 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( 0, // quantum 1, // threads RtecScheduler::OPERATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); scheduler->add_dependency (qos_info.rt_info, parent_info, 1, RtecBase::TWO_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return new TAO_EC_Timeout_Filter (this->event_channel_, @@ -199,14 +199,14 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( RtecScheduler::handle_t body_info = qos.dependencies[pos].rt_info; RtecScheduler::RT_Info_var info = - scheduler->get (body_info TAO_ENV_ARG_PARAMETER); + scheduler->get (body_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_CString name = info->entry_point.in (); name += "#rep"; RtecScheduler::handle_t rt_info = - scheduler->create (name.c_str () TAO_ENV_ARG_PARAMETER); + scheduler->create (name.c_str () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); pos++; @@ -222,7 +222,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( 0); TAO_EC_QOS_Info qos_info; - filter->get_qos_info (qos_info TAO_ENV_ARG_PARAMETER); + filter->get_qos_info (qos_info ACE_ENV_ARG_PARAMETER); // @@ ACE_CHECK_RETURN (0); return filter; @@ -234,7 +234,7 @@ TAO_EC_Sched_Filter_Builder:: recursive_name ( CORBA::ULong& pos, RtecScheduler::Scheduler_ptr scheduler, ACE_CString& name - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { const RtecEventComm::Event& e = qos.dependencies[pos].event; @@ -249,7 +249,7 @@ TAO_EC_Sched_Filter_Builder:: recursive_name ( this->recursive_name (qos, pos, scheduler, child_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (i == 0) @@ -274,7 +274,7 @@ TAO_EC_Sched_Filter_Builder:: recursive_name ( this->recursive_name (qos, pos, scheduler, child_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (i == 0) @@ -305,7 +305,7 @@ TAO_EC_Sched_Filter_Builder:: recursive_name ( RtecScheduler::handle_t body_info = qos.dependencies[pos].rt_info; RtecScheduler::RT_Info_var info = - scheduler->get (body_info TAO_ENV_ARG_PARAMETER); + scheduler->get (body_info ACE_ENV_ARG_PARAMETER); ACE_CHECK; name = info->entry_point.in (); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h index 138c02e7d04..6a3f89b5922 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h @@ -48,7 +48,7 @@ public: // = The TAO_EC_Filter_Builder methods... TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier, RtecEventChannelAdmin::ConsumerQOS& qos - TAO_ENV_ARG_DECL) const; + ACE_ENV_ARG_DECL) const; private: /// Recursively build the filter tree. @@ -57,14 +57,14 @@ private: CORBA::ULong& pos, RtecScheduler::Scheduler_ptr scheduler, RtecScheduler::handle_t parent_info - TAO_ENV_ARG_DECL) const; + ACE_ENV_ARG_DECL) const; /// Build the name recursively... void recursive_name (RtecEventChannelAdmin::ConsumerQOS& qos, CORBA::ULong& pos, RtecScheduler::Scheduler_ptr scheduler, ACE_CString &name - TAO_ENV_ARG_DECL) const; + ACE_ENV_ARG_DECL) const; /// Count the number of children of the current node, i.e. until a /// conjunction or disjunction starts. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h index 041b592542c..6cf200b1d79 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h @@ -49,14 +49,14 @@ public: virtual void add_proxy_supplier_dependencies ( TAO_EC_ProxyPushSupplier *supplier, TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; /// Schedule an event set and deliver them to the filter in the /// desired order and grouping. virtual void schedule_event (const RtecEventComm::EventSet &event, TAO_EC_ProxyPushConsumer *consumer, TAO_EC_Supplier_Filter *filter - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; }; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp index b58780478d0..f01244e6b09 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp @@ -26,14 +26,14 @@ TAO_EC_SupplierAdmin::~TAO_EC_SupplierAdmin (void) } RtecEventChannelAdmin::ProxyPushConsumer_ptr -TAO_EC_SupplierAdmin::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_SupplierAdmin::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->obtain (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->obtain (ACE_ENV_SINGLE_ARG_PARAMETER); } PortableServer::POA_ptr -TAO_EC_SupplierAdmin::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EC_SupplierAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h index 73e32e18315..a2258add619 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h @@ -50,11 +50,11 @@ public: // = The RtecEventChannelAdmin::SupplierAdmin methods... virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr - obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // = The PortableServer::ServantBase methods - virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); private: /// Store the default POA. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp index f80673b22f0..5e93d9f680b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp @@ -30,7 +30,7 @@ TAO_EC_SupplierControl::shutdown (void) void TAO_EC_SupplierControl::supplier_not_exist (TAO_EC_ProxyPushConsumer * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h index 8c1594f11c5..67ee778ea2f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h @@ -56,7 +56,7 @@ public: * CORBA::OBJECT_NOT_EXIST exception has been raised). */ virtual void supplier_not_exist (TAO_EC_ProxyPushConsumer *proxy - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp index 180cf20432c..9267b8c4bbd 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp @@ -18,8 +18,8 @@ TAO_EC_Supplier_Filter::~TAO_EC_Supplier_Filter (void) void TAO_EC_Filter_Worker::work (TAO_EC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_EC_QOS_Info qos_info = this->event_info_; - supplier->filter (this->event_, qos_info TAO_ENV_ARG_PARAMETER); + supplier->filter (this->event_, qos_info ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h index 890f916d85d..0454161f24d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h @@ -90,26 +90,26 @@ public: /// Concrete implementations can use this methods to keep track of /// the consumers interested in this events. virtual void connected (TAO_EC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; virtual void reconnected (TAO_EC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; virtual void disconnected (TAO_EC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; /// The event channel is shutting down. - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) = 0; + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) = 0; /// The ProxyPushConsumer delegates on this class to actually send /// the event. virtual void push (const RtecEventComm::EventSet &event, TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; /// Events are first scheduled by the TAO_EC_Scheduling_Strategy, /// and then pushed through this class again. virtual void push_scheduled_event (RtecEventComm::EventSet &event, const TAO_EC_QOS_Info &event_info - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; /// Increment and decrement the reference count, locking must be /// provided by the user. @@ -126,7 +126,7 @@ public: const TAO_EC_QOS_Info &event_info); virtual void work (TAO_EC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: /// The event we push on each case, use a reference to avoid copies. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp index 0753bd74bcc..1a356171387 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp @@ -66,25 +66,25 @@ TAO_EC_Timeout_Filter::~TAO_EC_Timeout_Filter (void) void TAO_EC_Timeout_Filter::push_to_proxy (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { qos_info.timer_id_ = this->id_; if (this->supplier_ != 0) this->supplier_->filter (event, qos_info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } int TAO_EC_Timeout_Filter::filter (const RtecEventComm::EventSet &event, TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (qos_info.timer_id_ == this->id_ && this->parent () != 0) { - this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return 1; } @@ -94,12 +94,12 @@ TAO_EC_Timeout_Filter::filter (const RtecEventComm::EventSet &event, int TAO_EC_Timeout_Filter::filter_nocopy (RtecEventComm::EventSet &event, TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (qos_info.timer_id_ == this->id_ && this->parent () != 0) { - this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return 1; } @@ -109,14 +109,14 @@ TAO_EC_Timeout_Filter::filter_nocopy (RtecEventComm::EventSet &event, void TAO_EC_Timeout_Filter::push (const RtecEventComm::EventSet&, TAO_EC_QOS_Info& - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_Timeout_Filter::push_nocopy (RtecEventComm::EventSet&, TAO_EC_QOS_Info& - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } @@ -159,7 +159,7 @@ int TAO_EC_Timeout_Filter::add_dependencies ( const RtecEventComm::EventHeader&, const TAO_EC_QOS_Info & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h index a0cb386b195..9240db0d29b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h @@ -57,28 +57,28 @@ public: /// Callback from the Timeout_Generator void push_to_proxy (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // = The TAO_EC_Filter methods, please check the documentation in // TAO_EC_Filter. virtual int filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void clear (void); virtual CORBA::ULong max_event_size (void) const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: ACE_UNIMPLEMENTED_FUNC (TAO_EC_Timeout_Filter diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp index 8ee6be22be4..40552d214d2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp @@ -42,7 +42,7 @@ TAO_EC_Timeout_Adapter::handle_timeout (const ACE_Time_Value & /* tv */, TAO_EC_QOS_Info qos_info = filter->qos_info (); filter->push_to_proxy (single_event, qos_info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp index f4182620759..5e8f5a789bb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp @@ -34,48 +34,48 @@ TAO_EC_Trivial_Supplier_Filter::unbind (TAO_EC_ProxyPushConsumer*) void TAO_EC_Trivial_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_Trivial_Supplier_Filter::reconnected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_Trivial_Supplier_Filter::disconnected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void -TAO_EC_Trivial_Supplier_Filter::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EC_Trivial_Supplier_Filter::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { } void TAO_EC_Trivial_Supplier_Filter::push (const RtecEventComm::EventSet& event, TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_EC_Scheduling_Strategy* scheduling_strategy = this->event_channel_->scheduling_strategy (); scheduling_strategy->schedule_event (event, consumer, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_EC_Trivial_Supplier_Filter::push_scheduled_event (RtecEventComm::EventSet &event, const TAO_EC_QOS_Info &event_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_EC_Filter_Worker worker (event, event_info); this->event_channel_->consumer_admin ()->for_each (&worker - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::ULong diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h index b39fe982298..e0534b2f37a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h @@ -48,18 +48,18 @@ public: virtual void bind (TAO_EC_ProxyPushConsumer* consumer); virtual void unbind (TAO_EC_ProxyPushConsumer* consumer); virtual void connected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); + ACE_ENV_ARG_DECL); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void push_scheduled_event (RtecEventComm::EventSet &event, const TAO_EC_QOS_Info &event_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual CORBA::ULong _decr_refcnt (void); virtual CORBA::ULong _incr_refcnt (void); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp index 5ea4a8cd2b2..04db9a3eb61 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp @@ -16,14 +16,14 @@ TAO_EC_Type_Filter::TAO_EC_Type_Filter (const RtecEventComm::EventHeader& header int TAO_EC_Type_Filter::filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (event.length () != 1) - return this->filter_set (event, qos_info TAO_ENV_ARG_PARAMETER); + return this->filter_set (event, qos_info ACE_ENV_ARG_PARAMETER); if (this->can_match (event[0].header)) { - this->push (event, qos_info TAO_ENV_ARG_PARAMETER); + this->push (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return 1; } @@ -33,14 +33,14 @@ TAO_EC_Type_Filter::filter (const RtecEventComm::EventSet& event, int TAO_EC_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (event.length () != 1) - return this->filter_set (event, qos_info TAO_ENV_ARG_PARAMETER); + return this->filter_set (event, qos_info ACE_ENV_ARG_PARAMETER); if (this->can_match (event[0].header)) { - this->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + this->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return 1; } @@ -50,19 +50,19 @@ TAO_EC_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event, void TAO_EC_Type_Filter::push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->parent () != 0) - this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER); } void TAO_EC_Type_Filter::push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->parent () != 0) - this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); } void @@ -116,7 +116,7 @@ int TAO_EC_Type_Filter::add_dependencies ( const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return this->can_match (header); } @@ -124,7 +124,7 @@ TAO_EC_Type_Filter::add_dependencies ( int TAO_EC_Type_Filter::filter_set (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::ULong maximum = event.length (); if (event.maximum () == 0) @@ -143,7 +143,7 @@ TAO_EC_Type_Filter::filter_set (const RtecEventComm::EventSet& event, if (matched.length () == 0) return 0; - this->push (matched, qos_info TAO_ENV_ARG_PARAMETER); + this->push (matched, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return 1; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h index 9780fab0fd6..cde1c5a8326 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h @@ -41,22 +41,22 @@ public: // TAO_EC_Filter. virtual int filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void clear (void); virtual CORBA::ULong max_event_size (void) const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: ACE_UNIMPLEMENTED_FUNC (TAO_EC_Type_Filter @@ -67,7 +67,7 @@ private: /// Filter an EventSet that contains more than one event. int filter_set (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: /// Encapsulate the type/source that we must match. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp index 06f5cf18acb..ad193b971af 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp @@ -16,7 +16,7 @@ TAO_EC_Simple_AddrServer::~TAO_EC_Simple_AddrServer (void) void TAO_EC_Simple_AddrServer::get_addr (const RtecEventComm::EventHeader& header, RtecUDPAdmin::UDP_Addr_out addr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { addr.ipaddr = header.type; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h index e59d2951f33..b272d2218ab 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h @@ -44,7 +44,7 @@ public: // = The RtecUDPAdmin::AddrServer methods virtual void get_addr (const RtecEventComm::EventHeader& header, RtecUDPAdmin::UDP_Addr_out addr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp index 4d3a5f3bdde..b8a4f3184a8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp @@ -160,7 +160,7 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Event_Channel_Timeprobe_Description, static RtecScheduler::Preemption_Priority_t Preemption_Priority (RtecScheduler::Scheduler_ptr scheduler, RtecScheduler::handle_t rtinfo - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecScheduler::OS_Priority thread_priority; RtecScheduler::Preemption_Subpriority_t subpriority; @@ -174,14 +174,14 @@ Preemption_Priority (RtecScheduler::Scheduler_ptr scheduler, thread_priority, subpriority, preemption_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #else ACE_Scheduler_Factory::server ()->priority (rtinfo, thread_priority, subpriority, preemption_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #endif ACE_CHECK_RETURN (0); return preemption_priority; @@ -231,7 +231,7 @@ public: ACE_Scheduler_MIN_PREEMPTION_PRIORITY; while (iter.advance_dependency () == 0) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { RtecEventComm::EventType &type = (*iter).event.header.type; @@ -242,7 +242,7 @@ public: { RtecScheduler::Preemption_Priority_t q = ::Preemption_Priority (scheduler, (*iter).rt_info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (rt_info_ == 0 || q < p) { @@ -324,11 +324,11 @@ public: virtual int execute (void* /* arg = 0 */) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { ACE_ES_Dispatch_Request *request = request_; - dispatching_module_->push (request TAO_ENV_ARG_PARAMETER); + dispatching_module_->push (request ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; delete this; } @@ -368,7 +368,7 @@ void ACE_Push_Supplier_Proxy::connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, const RtecEventChannelAdmin::SupplierQOS &qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::AlreadyConnected)) { @@ -391,12 +391,12 @@ ACE_Push_Supplier_Proxy::connect_push_supplier ( // not work: it usually results in some form of dead-lock. this->source_id_ = qos_.publications[0].event.header.source; - supplier_module_->connected (this TAO_ENV_ARG_PARAMETER); + supplier_module_->connected (this ACE_ENV_ARG_PARAMETER); } void ACE_Push_Supplier_Proxy::push (const RtecEventComm::EventSet &event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TIMEPROBE (TAO_EVENT_CHANNEL_ENTER_PUSH_SUPPLIER_PROXY_PUSH); @@ -413,14 +413,14 @@ ACE_Push_Supplier_Proxy::push (const RtecEventComm::EventSet &event ACE_const_cast (RtecEventComm::EventSet&, event); this->time_stamp (copy); - this->supplier_module_->push (this, copy TAO_ENV_ARG_PARAMETER); + this->supplier_module_->push (this, copy ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else { RtecEventComm::EventSet copy = event; this->time_stamp (copy); - this->supplier_module_->push (this, copy TAO_ENV_ARG_PARAMETER); + this->supplier_module_->push (this, copy ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -442,14 +442,14 @@ ACE_Push_Supplier_Proxy::time_stamp (RtecEventComm::EventSet& event) void ACE_Push_Supplier_Proxy::disconnect_push_consumer ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TIMEPROBE_PRINT; if (this->connected ()) { this->push_supplier_ = 0; - this->supplier_module_->disconnecting (this TAO_ENV_ARG_PARAMETER); + this->supplier_module_->disconnecting (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -457,10 +457,10 @@ ACE_Push_Supplier_Proxy::disconnect_push_consumer ( void ACE_Push_Supplier_Proxy::shutdown (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - push_supplier_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + push_supplier_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -483,7 +483,7 @@ ACE_Push_Consumer_Proxy::~ACE_Push_Consumer_Proxy (void) void ACE_Push_Consumer_Proxy::push (const RtecEventComm::EventSet &events - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TIMEPROBE (TAO_EVENT_CHANNEL_DELIVER_EVENT_TO_CONSUMER_PROXY); @@ -494,7 +494,7 @@ ACE_Push_Consumer_Proxy::push (const RtecEventComm::EventSet &events return; } - push_consumer_->push (events TAO_ENV_ARG_PARAMETER); + push_consumer_->push (events ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -502,7 +502,7 @@ void ACE_Push_Consumer_Proxy::connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, const RtecEventChannelAdmin::ConsumerQOS &qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::AlreadyConnected, RtecEventChannelAdmin::TypeError)) @@ -523,28 +523,28 @@ ACE_Push_Consumer_Proxy::connect_push_consumer ( // ACE_ConsumerQOS_Factory::debug (qos_); - this->consumer_module_->connected (this TAO_ENV_ARG_PARAMETER); + this->consumer_module_->connected (this ACE_ENV_ARG_PARAMETER); } void ACE_Push_Consumer_Proxy::disconnect_push_supplier ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TIMEPROBE_PRINT; this->push_consumer_ = RtecEventComm::PushConsumer::_nil (); - this->consumer_module_->disconnecting (this TAO_ENV_ARG_PARAMETER); + this->consumer_module_->disconnecting (this ACE_ENV_ARG_PARAMETER); } void -ACE_Push_Consumer_Proxy::suspend_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ACE_Push_Consumer_Proxy::suspend_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { correlation_.suspend (); } void -ACE_Push_Consumer_Proxy::resume_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ACE_Push_Consumer_Proxy::resume_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { correlation_.resume (); @@ -553,10 +553,10 @@ ACE_Push_Consumer_Proxy::resume_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void ACE_Push_Consumer_Proxy::shutdown (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->push_consumer_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + this->push_consumer_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -644,10 +644,10 @@ ACE_EventChannel::~ACE_EventChannel (void) // @@ This should go away, it is too late to raise a CORBA // exception, at this point we should only be cleaning up memory, // not sending messages. - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -674,7 +674,7 @@ ACE_EventChannel::~ACE_EventChannel (void) } void -ACE_EventChannel::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ACE_EventChannel::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { { @@ -767,27 +767,27 @@ ACE_EventChannel::report_disconnect_i (u_long event) void ACE_EventChannel::add_gateway (TAO_EC_Gateway* gw - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - RtecEventChannelAdmin::Observer_var observer = gw->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + RtecEventChannelAdmin::Observer_var observer = gw->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - gw->observer_handle (this->append_observer (observer.in () TAO_ENV_ARG_PARAMETER)); + gw->observer_handle (this->append_observer (observer.in () ACE_ENV_ARG_PARAMETER)); ACE_CHECK; } void ACE_EventChannel::del_gateway (TAO_EC_Gateway* gw - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->remove_observer (gw->observer_handle () TAO_ENV_ARG_PARAMETER); + this->remove_observer (gw->observer_handle () ACE_ENV_ARG_PARAMETER); ACE_CHECK; gw->observer_handle (0); } void -ACE_EventChannel::update_consumer_gwys (TAO_ENV_SINGLE_ARG_DECL) +ACE_EventChannel::update_consumer_gwys (ACE_ENV_SINGLE_ARG_DECL) { Observer_Map observers; { @@ -818,13 +818,13 @@ ACE_EventChannel::update_consumer_gwys (TAO_ENV_SINGLE_ARG_DECL) i != observers.end (); ++i) { - (*i).int_id_.observer->update_consumer (c_qos TAO_ENV_ARG_PARAMETER); + (*i).int_id_.observer->update_consumer (c_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } void -ACE_EventChannel::update_supplier_gwys (TAO_ENV_SINGLE_ARG_DECL) +ACE_EventChannel::update_supplier_gwys (ACE_ENV_SINGLE_ARG_DECL) { Observer_Map observers; { @@ -854,14 +854,14 @@ ACE_EventChannel::update_supplier_gwys (TAO_ENV_SINGLE_ARG_DECL) i != observers.end (); ++i) { - (*i).int_id_.observer->update_supplier (s_qos TAO_ENV_ARG_PARAMETER); + (*i).int_id_.observer->update_supplier (s_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } RtecEventChannelAdmin::Observer_Handle ACE_EventChannel::append_observer (RtecEventChannelAdmin::Observer_ptr obs - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, @@ -882,12 +882,12 @@ ACE_EventChannel::append_observer (RtecEventChannelAdmin::Observer_ptr obs RtecEventChannelAdmin::ConsumerQOS c_qos; this->consumer_module_->fill_qos (c_qos); - obs->update_consumer (c_qos TAO_ENV_ARG_PARAMETER); + obs->update_consumer (c_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); RtecEventChannelAdmin::SupplierQOS s_qos; this->supplier_module_->fill_qos (s_qos); - obs->update_supplier (s_qos TAO_ENV_ARG_PARAMETER); + obs->update_supplier (s_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return entry.handle; @@ -895,7 +895,7 @@ ACE_EventChannel::append_observer (RtecEventChannelAdmin::Observer_ptr obs void ACE_EventChannel::remove_observer (RtecEventChannelAdmin::Observer_Handle h - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, @@ -932,7 +932,7 @@ ACE_EventChannel::schedule_timer (RtecScheduler::handle_t rt_info, RtecScheduler::handle_t timer_rtinfo = this->timer_module ()->rt_info (preemption_priority); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { #if 1 @@ -940,14 +940,14 @@ ACE_EventChannel::schedule_timer (RtecScheduler::handle_t rt_info, timer_rtinfo, 1, RtecBase::ONE_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #else ACE_Scheduler_Factory::server()->add_dependency (rt_info, timer_rtinfo, 1, RtecBase::ONE_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #endif ACE_TRY_CHECK; } @@ -1252,18 +1252,18 @@ ACE_ES_Consumer_Module::open (ACE_ES_Dispatching_Module *down) void ACE_ES_Consumer_Module::connected (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // ACE_DEBUG ((LM_DEBUG, // "EC (%t) Consumer_Module - connecting consumer %x\n", // consumer)); this->channel_->report_connect (ACE_EventChannel::CONSUMER); - this->down_->connected (consumer TAO_ENV_ARG_PARAMETER); + this->down_->connected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!consumer->qos ().is_gateway) - this->channel_->update_consumer_gwys (TAO_ENV_SINGLE_ARG_PARAMETER); + this->channel_->update_consumer_gwys (ACE_ENV_SINGLE_ARG_PARAMETER); } void @@ -1286,12 +1286,12 @@ ACE_ES_Consumer_Module::shutdown_request (ACE_ES_Dispatch_Request *request) // Deactivate the consumer proxy PortableServer::POA_var poa = - sc->consumer ()->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + sc->consumer ()->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (sc->consumer () TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (sc->consumer () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Delete the consumer proxy, no need to delete it, is is owned @@ -1299,7 +1299,7 @@ ACE_ES_Consumer_Module::shutdown_request (ACE_ES_Dispatch_Request *request) // delete sc->consumer (); if (!dont_update) - this->channel_->update_consumer_gwys (TAO_ENV_SINGLE_ARG_PARAMETER); + this->channel_->update_consumer_gwys (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_GUARD_THROW_EX ( @@ -1347,7 +1347,7 @@ ACE_ES_Consumer_Module::shutdown (void) { Consumer_Iterator iter (copy); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { for (ACE_Push_Consumer_Proxy **proxy = 0; @@ -1359,12 +1359,12 @@ ACE_ES_Consumer_Module::shutdown (void) // servant. // Deactivate the proxy... PortableServer::POA_var poa = - (*proxy)->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + (*proxy)->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (*proxy TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (*proxy ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Remove the consumer from our list. @@ -1394,7 +1394,7 @@ DONE: void ACE_ES_Consumer_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { { ACE_GUARD_THROW_EX ( @@ -1411,7 +1411,7 @@ ACE_ES_Consumer_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer // etc. However, messages may still be queued in the ReactorEx or // in the Dispatching Module for this consumer, so no queues or // proxies can be deleted just yet. - down_->disconnecting (consumer TAO_ENV_ARG_PARAMETER); + down_->disconnecting (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Send a shutdown message through the system. When this is @@ -1459,7 +1459,7 @@ ACE_ES_Consumer_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer // can read the set we allocated off the stack. void ACE_ES_Consumer_Module::push (const ACE_ES_Dispatch_Request *request - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // ACE_DEBUG ((LM_DEBUG, "EC (%t) Consumer_Module::push\n")); @@ -1478,12 +1478,12 @@ ACE_ES_Consumer_Module::push (const ACE_ES_Dispatch_Request *request ORBSVCS_Time::hrtime_to_TimeT (ev.header.ec_send_time, ec_send); } #endif /* TAO_LACKS_EVENT_CHANNEL_TIMESTAMPS */ - request->consumer ()->push (event_set TAO_ENV_ARG_PARAMETER); + request->consumer ()->push (event_set ACE_ENV_ARG_PARAMETER); } RtecEventChannelAdmin::ProxyPushSupplier_ptr ACE_ES_Consumer_Module::obtain_push_supplier ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { RtecEventChannelAdmin::ProxyPushSupplier_ptr proxy = @@ -1510,7 +1510,7 @@ ACE_ES_Consumer_Module::obtain_push_supplier ( ACE_ERROR ((LM_ERROR, "ACE_ES_Consumer_Module insert failed.\n")); } - proxy = new_consumer->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy = new_consumer->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (proxy); // Give away ownership to the POA.... @@ -1622,7 +1622,7 @@ ACE_ES_Correlation_Module::open (ACE_ES_Dispatching_Module *up, void ACE_ES_Correlation_Module::connected (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Initialize the consumer correlation filter. if (consumer->correlation ().connected (consumer, this) == -1) @@ -1631,7 +1631,7 @@ ACE_ES_Correlation_Module::connected (ACE_Push_Consumer_Proxy *consumer void ACE_ES_Correlation_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (consumer->correlation ().disconnecting () == -1) ACE_ERROR ((LM_ERROR, @@ -1653,7 +1653,7 @@ ACE_ES_Correlation_Module::unsubscribe (ACE_ES_Consumer_Rep *cr) void ACE_ES_Correlation_Module::push (ACE_ES_Consumer_Rep *consumer, const TAO_EC_Event& event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // ACE_DEBUG ((LM_DEBUG, "EC (%t) Correlation_Module::push\n")); @@ -1666,7 +1666,7 @@ ACE_ES_Correlation_Module::push (ACE_ES_Consumer_Rep *consumer, // we need to push the event now. if (request != 0) { - up_->push (request TAO_ENV_ARG_PARAMETER); + up_->push (request ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -1814,7 +1814,7 @@ ACE_ES_Consumer_Correlation::~ACE_ES_Consumer_Correlation (void) } void -ACE_ES_Consumer_Correlation::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ACE_ES_Consumer_Correlation::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->connected_ = 0; @@ -2169,10 +2169,10 @@ ACE_ES_Consumer_Correlation::disconnecting (void) // If we were forwarding events, disconnect as a supplier. if (connected_) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - channel_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + channel_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2336,14 +2336,14 @@ ACE_ES_Consumer_Rep_Timeout::execute (void* /* arg */) ACE_TIMEPROBE (TAO_EVENT_CHANNEL_CONSUMER_REP_TIMEOUT_EXECUTE); if (this->receiving_events ()) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { ACE_Time_Value tv = ACE_OS::gettimeofday (); ORBSVCS_Time::Time_Value_to_TimeT (this->timeout_event_.header ().creation_time, tv); correlation_->correlation_module_->push (this, this->timeout_event_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2385,7 +2385,7 @@ ACE_ES_Subscription_Module::~ACE_ES_Subscription_Module (void) // global type collection. void ACE_ES_Subscription_Module::connected (ACE_Push_Supplier_Proxy *supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecEventComm::EventSourceID sid = 0; // We will record the source_id for later usage. @@ -2463,14 +2463,14 @@ ACE_ES_Subscription_Module::connected (ACE_Push_Supplier_Proxy *supplier new_subscribers->dependency_info_->rt_info, new_subscribers->dependency_info_->number_of_calls, RtecBase::ONE_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #else ACE_Scheduler_Factory::server()->add_dependency ((*proxy)->dependency()->rt_info, new_subscribers->dependency_info_->rt_info, new_subscribers->dependency_info_->number_of_calls, RtecBase::ONE_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #endif ACE_CHECK; @@ -2538,7 +2538,7 @@ ACE_ES_Subscription_Module::reregister_consumers (RtecEventComm::EventSourceID s void ACE_ES_Subscription_Module::disconnecting (ACE_Push_Supplier_Proxy *supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_WRITE_GUARD_THROW_EX ( ACE_ES_RW_LOCK, ace_mon, this->lock_, @@ -2592,7 +2592,7 @@ ACE_ES_Subscription_Module::subscribe_all (ACE_ES_Consumer_Rep *) int ACE_ES_Subscription_Module::push_source (ACE_Push_Supplier_Proxy *source, const TAO_EC_Event &event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // ACE_DEBUG ((LM_DEBUG, "EC (%t) Subscription_Module::push_source\n")); @@ -2626,7 +2626,7 @@ ACE_ES_Subscription_Module::push_source (ACE_Push_Supplier_Proxy *source, // and not disconnected. if ((*consumer)->receiving_events ()) { - up_->push (*consumer, event TAO_ENV_ARG_PARAMETER); + up_->push (*consumer, event ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } // If the consumer has disconnected, schedule it for @@ -2675,7 +2675,7 @@ ACE_ES_Subscription_Module::push_source (ACE_Push_Supplier_Proxy *source, int ACE_ES_Subscription_Module::push_source_type (ACE_Push_Supplier_Proxy *source, const TAO_EC_Event &event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // ACE_DEBUG ((LM_DEBUG, // "EC (%t) Subscription_Module::push_source_type: \n")); @@ -2742,7 +2742,7 @@ ACE_ES_Subscription_Module::push_source_type (ACE_Push_Supplier_Proxy *source, { if ((*consumer)->receiving_events ()) { - up_->push (*consumer, event TAO_ENV_ARG_PARAMETER); + up_->push (*consumer, event ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } if ((*consumer)->disconnected ()) @@ -2837,7 +2837,7 @@ ACE_ES_Subscription_Module::subscribe_source (ACE_ES_Consumer_Rep *consumer, iter2.next (temp) != 0; iter2.advance ()) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { #if 1 @@ -2846,14 +2846,14 @@ ACE_ES_Subscription_Module::subscribe_source (ACE_ES_Consumer_Rep *consumer, temp->int_id_->dependency_info_->rt_info, temp->int_id_->dependency_info_->number_of_calls, RtecBase::ONE_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #else ACE_Scheduler_Factory::server()->add_dependency (consumer->dependency()->rt_info, temp->int_id_->dependency_info_->rt_info, temp->int_id_->dependency_info_->number_of_calls, RtecBase::ONE_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #endif ACE_TRY_CHECK; } @@ -2916,7 +2916,7 @@ ACE_ES_Subscription_Module::subscribe_type (ACE_ES_Consumer_Rep *consumer, // Success. Add the supplier dependency info to the // consumer's dependency list. // @@ TODO handle exceptions. - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { #if 1 @@ -2925,14 +2925,14 @@ ACE_ES_Subscription_Module::subscribe_type (ACE_ES_Consumer_Rep *consumer, dependency_info->rt_info, dependency_info->number_of_calls, RtecBase::ONE_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #else ACE_Scheduler_Factory::server()->add_dependency (consumer->dependency ()->rt_info, dependency_info->rt_info, dependency_info->number_of_calls, RtecBase::ONE_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #endif ACE_TRY_CHECK; } @@ -2989,7 +2989,7 @@ ACE_ES_Subscription_Module::subscribe_source_type (ACE_ES_Consumer_Rep *consumer // Success. // Add the supplier to the consumer's dependency list. // @@ TODO handle exceptions. - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { #if 1 @@ -2998,14 +2998,14 @@ ACE_ES_Subscription_Module::subscribe_source_type (ACE_ES_Consumer_Rep *consumer dependency_info->rt_info, dependency_info->number_of_calls, RtecBase::ONE_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #else ACE_Scheduler_Factory::server()->add_dependency (consumer->dependency ()->rt_info, dependency_info->rt_info, dependency_info->number_of_calls, RtecBase::ONE_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #endif ACE_TRY_CHECK; } @@ -3232,13 +3232,13 @@ ACE_ES_Subscription_Module::unsubscribe_source_type (ACE_ES_Consumer_Rep *consum void ACE_ES_Subscription_Module::push (ACE_Push_Supplier_Proxy *source, const TAO_EC_Event &event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // ACE_DEBUG ((LM_DEBUG, "EC (%t) Subscription_Module::push\n")); ACE_TIMEPROBE (TAO_EVENT_CHANNEL_DELIVER_TO_SUBSCRIPTION_MODULE); // These are all inline function calls. - int result = this->push_source (source, event TAO_ENV_ARG_PARAMETER); + int result = this->push_source (source, event ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (result == -1) @@ -3247,7 +3247,7 @@ ACE_ES_Subscription_Module::push (ACE_Push_Supplier_Proxy *source, { ACE_FUNCTION_TIMEPROBE (TAO_EVENT_CHANNEL_BEGIN_PUSH_SOURCE_TYPE); - result = this->push_source_type (source, event TAO_ENV_ARG_PARAMETER); + result = this->push_source_type (source, event ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (result == -1) @@ -3321,19 +3321,19 @@ ACE_ES_Supplier_Module::open (ACE_ES_Subscription_Module *up) void ACE_ES_Supplier_Module::connected (ACE_Push_Supplier_Proxy *supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { channel_->report_connect (ACE_EventChannel::SUPPLIER); - up_->connected (supplier TAO_ENV_ARG_PARAMETER); + up_->connected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!supplier->qos ().is_gateway) - this->channel_->update_supplier_gwys (TAO_ENV_SINGLE_ARG_PARAMETER); + this->channel_->update_supplier_gwys (ACE_ENV_SINGLE_ARG_PARAMETER); } void ACE_ES_Supplier_Module::disconnecting (ACE_Push_Supplier_Proxy *supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Boolean need_update = 0; { @@ -3345,7 +3345,7 @@ ACE_ES_Supplier_Module::disconnecting (ACE_Push_Supplier_Proxy *supplier if (all_suppliers_.remove (supplier) == -1) ACE_THROW (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR()); - up_->disconnecting (supplier TAO_ENV_ARG_PARAMETER); + up_->disconnecting (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (this->all_suppliers_.size () <= 0) @@ -3363,7 +3363,7 @@ ACE_ES_Supplier_Module::disconnecting (ACE_Push_Supplier_Proxy *supplier // CORBA::release (supplier); } if (need_update) - this->channel_->update_supplier_gwys (TAO_ENV_SINGLE_ARG_PARAMETER); + this->channel_->update_supplier_gwys (ACE_ENV_SINGLE_ARG_PARAMETER); } void @@ -3381,14 +3381,14 @@ ACE_ES_Supplier_Module::shutdown (void) { Supplier_Iterator iter (copy); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; for (ACE_Push_Supplier_Proxy **proxy = 0; iter.next (proxy) != 0; iter.advance ()) { (*proxy)->shutdown (); - this->disconnecting (*proxy TAO_ENV_ARG_PARAMETER); + this->disconnecting (*proxy ACE_ENV_ARG_PARAMETER); } } @@ -3396,7 +3396,7 @@ ACE_ES_Supplier_Module::shutdown (void) } RtecEventChannelAdmin::ProxyPushConsumer_ptr -ACE_ES_Supplier_Module::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL) +ACE_ES_Supplier_Module::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { RtecEventChannelAdmin::ProxyPushConsumer_ptr proxy = @@ -3418,7 +3418,7 @@ ACE_ES_Supplier_Module::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL) ACE_ERROR ((LM_ERROR, "ACE_ES_Supplier_Module insert failed.\n")); } - proxy = new_supplier->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy = new_supplier->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (proxy); // Give ownership to the POA @@ -3430,7 +3430,7 @@ ACE_ES_Supplier_Module::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL) void ACE_ES_Supplier_Module::push (ACE_Push_Supplier_Proxy *proxy, RtecEventComm::EventSet &event_set - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Steal the events from the EventSet and put them into a reference // counted event set. @@ -3447,7 +3447,7 @@ ACE_ES_Supplier_Module::push (ACE_Push_Supplier_Proxy *proxy, // the scope. TAO_EC_Event event_copy (event, i); ACE_TIMEPROBE (TAO_EVENT_CHANNEL_DELIVER_TO_SUPPLIER_MODULE_THRU_SUPPLIER_PROXY); - up_->push (proxy, event_copy TAO_ENV_ARG_PARAMETER); + up_->push (proxy, event_copy ACE_ENV_ARG_PARAMETER); ACE_CHECK; } TAO_EC_Event_Set::_release (event); diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h index 955838fae77..efd24b5d442 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h +++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h @@ -201,7 +201,7 @@ public: virtual ~ACE_EventChannel (void); // Calls destroy. - RtecEventChannelAdmin::EventChannel_ptr get_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + RtecEventChannelAdmin::EventChannel_ptr get_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); // Allow transformations to RtecEventChannelAdmin::EventChannel. ACE_RTU_Manager *rtu_manager (void); @@ -232,12 +232,12 @@ public: void report_disconnect_i (u_long); // Consumer or supplier disconnected. - void add_gateway (TAO_EC_Gateway* gw TAO_ENV_ARG_DECL); - void del_gateway (TAO_EC_Gateway* gw TAO_ENV_ARG_DECL); + void add_gateway (TAO_EC_Gateway* gw ACE_ENV_ARG_DECL); + void del_gateway (TAO_EC_Gateway* gw ACE_ENV_ARG_DECL); // Add and remove gateways from the EC. - void update_consumer_gwys (TAO_ENV_SINGLE_ARG_DECL); - void update_supplier_gwys (TAO_ENV_SINGLE_ARG_DECL); + void update_consumer_gwys (ACE_ENV_SINGLE_ARG_DECL); + void update_supplier_gwys (ACE_ENV_SINGLE_ARG_DECL); // The consumer (or supplier) list has changed, thus the EC has to // inform any gateways it has. @@ -247,30 +247,30 @@ public: // = The RtecEventChannelAdmin::EventChannel methods. virtual RtecEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + for_consumers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // In this implementation of the EC this returns the interface for // the Consumer_Module. virtual RtecEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + for_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return an interface to the Supplier_Module. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Shutdown the EC, free all resources, stop all threads and then // shutdown the server where the Servant is running. virtual RtecEventChannelAdmin::Observer_Handle append_observer (RtecEventChannelAdmin::Observer_ptr observer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)); virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, @@ -840,7 +840,7 @@ public: // that ACE_ES_Consumer_Rep_Timeout::execute can access it. private: - virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Called when the channel disconnects us. @@ -943,23 +943,23 @@ public: // Link to the next module. virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr - obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Factory method for push consumer proxies. void connected (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Register the consumer with the Event Service. This handles all // the details regarding Correlation_Module and Subscription_Module. void disconnecting (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Unregister the consumer from the Event Service. virtual void push (const ACE_ES_Dispatch_Request *request - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); - RtecEventChannelAdmin::ConsumerAdmin_ptr get_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + RtecEventChannelAdmin::ConsumerAdmin_ptr get_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); // Allow transformations to RtecEventChannelAdmin::ConsumerAdmin. void shutdown_request (ACE_ES_Dispatch_Request *request); @@ -1011,16 +1011,16 @@ public: // Link to adjacent modules. void connected (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Create the consumers filter object. void disconnecting (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Release the consumers filter object. void push (ACE_ES_Consumer_Rep *consumer, const TAO_EC_Event &event - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Take in an event and its subscriber. Apply consumer-specific // filters to each event and forward any dispatch requests to the // Dispatching Module. @@ -1099,13 +1099,13 @@ public: // Removes the -consumer- from any subscription lists. void connected (ACE_Push_Supplier_Proxy *supplier - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); void disconnecting (ACE_Push_Supplier_Proxy *supplier - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); void push (ACE_Push_Supplier_Proxy *source, const TAO_EC_Event &event - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Takes in an event and pushes subscriber sets to the // Correlation Module. @@ -1160,18 +1160,18 @@ private: int push_source (ACE_Push_Supplier_Proxy *source, const TAO_EC_Event &event - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Push to all consumers subscribed to all events from // . Returns 0 on success, -1 on failure. int push_source_type (ACE_Push_Supplier_Proxy *source, const TAO_EC_Event &event - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Push to all consumers subscribed to .type_ from // . Returns 0 on success, -1 on failure. void push_all (const TAO_EC_Event &event - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Push to all_suppliers_. ACE_ES_Correlation_Module *up_; @@ -1216,26 +1216,26 @@ public: // Associate the module to a channel. virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr - obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Factory method for push supplier proxies. virtual void push (ACE_Push_Supplier_Proxy *proxy, RtecEventComm::EventSet &event - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // The supplier module acts on behalf of the supplier proxy to // forward events through the channel. void connected (ACE_Push_Supplier_Proxy *supplier - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Register the consumer with the Event Service. This handles all // the details regarding Correlation_Module and Subscription_Module. void disconnecting (ACE_Push_Supplier_Proxy *supplier - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Unregister the consumer from the Event Service. - RtecEventChannelAdmin::SupplierAdmin_ptr get_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + RtecEventChannelAdmin::SupplierAdmin_ptr get_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); // Allow transformations to RtecEventComm::PushConsumer. void shutdown (void); @@ -1290,7 +1290,7 @@ public: virtual void connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, const RtecEventChannelAdmin::SupplierQOS& qos - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::AlreadyConnected)); // Suppliers connect via this interface. is a @@ -1298,12 +1298,12 @@ public: // the supplier. virtual void push (const RtecEventComm::EventSet &event - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Data arriving from a PushSupplier that must be sent to // consumers. This is the entry point of all events. - virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Disconnect the supplier from the channel. @@ -1374,29 +1374,29 @@ public: virtual void connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, const RtecEventChannelAdmin::ConsumerQOS& qos - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::AlreadyConnected, RtecEventChannelAdmin::TypeError)); // A push consumer is connecting. is a reference to // the consumer. is the subscription types for the consumer. - virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The consumer is disconnecting. - virtual void suspend_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void suspend_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Stop forwarding events to the calling consumer. - virtual void resume_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void resume_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Resume forwarding events to the calling consumer. // = Event Channel operations. void push (const RtecEventComm::EventSet &events - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Push to push_consumer_. int connected (void); diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i index 395b70bc70b..d0fbf3acda3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i +++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i @@ -69,37 +69,37 @@ ACE_Push_Consumer_Proxy::correlation (void) } ACE_INLINE RtecEventChannelAdmin::ConsumerAdmin_ptr -ACE_ES_Consumer_Module::get_ref (TAO_ENV_SINGLE_ARG_DECL) +ACE_ES_Consumer_Module::get_ref (ACE_ENV_SINGLE_ARG_DECL) { - return this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } ACE_INLINE RtecEventChannelAdmin::SupplierAdmin_ptr -ACE_ES_Supplier_Module::get_ref (TAO_ENV_SINGLE_ARG_DECL) +ACE_ES_Supplier_Module::get_ref (ACE_ENV_SINGLE_ARG_DECL) { - return this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } // ************************************************** ACE_INLINE RtecEventChannelAdmin::EventChannel_ptr -ACE_EventChannel::get_ref (TAO_ENV_SINGLE_ARG_DECL) +ACE_EventChannel::get_ref (ACE_ENV_SINGLE_ARG_DECL) { - return this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } ACE_INLINE RtecEventChannelAdmin::SupplierAdmin_ptr -ACE_EventChannel::for_suppliers (TAO_ENV_SINGLE_ARG_DECL) +ACE_EventChannel::for_suppliers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return supplier_module_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + return supplier_module_->get_ref (ACE_ENV_SINGLE_ARG_PARAMETER); } ACE_INLINE RtecEventChannelAdmin::ConsumerAdmin_ptr -ACE_EventChannel::for_consumers (TAO_ENV_SINGLE_ARG_DECL) +ACE_EventChannel::for_consumers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return consumer_module_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + return consumer_module_->get_ref (ACE_ENV_SINGLE_ARG_PARAMETER); } ACE_INLINE TAO_EC_Timer_Module* diff --git a/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp index 2582e74ee2e..a312c4302f1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp @@ -96,7 +96,7 @@ ACE_RT_Task::~ACE_RT_Task (void) int ACE_RT_Task::svc (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // @@ TODO It may be necessary to pass the options to this class @@ -107,7 +107,7 @@ ACE_RT_Task::svc (void) }; int argc = sizeof (argv)/sizeof (argv[0]); CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif @@ -120,14 +120,14 @@ ACE_RT_Task::svc (void) (this->rt_info_, thread_priority, subpriority, - preemption_priority TAO_ENV_ARG_PARAMETER); + preemption_priority ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #else ACE_Scheduler_Factory::server ()->priority (this->rt_info_, thread_priority, subpriority, - preemption_priority TAO_ENV_ARG_PARAMETER); + preemption_priority ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif if (ACE_OS::thr_setprio (thread_priority) == -1) @@ -257,17 +257,17 @@ ACE_RT_Task::open_task (const char* name) tempname = tempbuffer; } - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { #if 1 rt_info_ = - this->scheduler_->create (tempname TAO_ENV_ARG_PARAMETER); + this->scheduler_->create (tempname ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #else rt_info_ = ACE_Scheduler_Factory::server()->create (tempname - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif // @@ TODO: We do no initialization of the new rt_info, the @@ -314,7 +314,7 @@ ACE_RT_Task::synch_threads (size_t threads) RtecScheduler::Preemption_Subpriority_t subpriority; RtecScheduler::Preemption_Priority_t preemption_priority; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { { @@ -325,14 +325,14 @@ ACE_RT_Task::synch_threads (size_t threads) (rt_info_, thread_priority, subpriority, - preemption_priority TAO_ENV_ARG_PARAMETER); + preemption_priority ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #else ACE_Scheduler_Factory::server ()->priority (rt_info_, thread_priority, subpriority, - preemption_priority TAO_ENV_ARG_PARAMETER); + preemption_priority ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif } diff --git a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp index 826009f8d12..8ea1e243627 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp @@ -75,7 +75,7 @@ ACE_ES_Reactor_Task::open_reactor (RtecScheduler::Period_t &period) case 0: // @@ TODO handle exceptions { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { #if 1 @@ -90,7 +90,7 @@ ACE_ES_Reactor_Task::open_reactor (RtecScheduler::Period_t &period) ORBSVCS_Time::zero (), 1, RtecScheduler::OPERATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #else ACE_Scheduler_Factory::server()->set (rt_info_, @@ -103,7 +103,7 @@ ACE_ES_Reactor_Task::open_reactor (RtecScheduler::Period_t &period) ORBSVCS_Time::zero (), 1, RtecScheduler::OPERATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #endif ACE_TRY_CHECK; } diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp index 7363d0956f9..1ea17bc1001 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp @@ -20,7 +20,7 @@ TAO_FT_Endpoint_Selector_Factory::~TAO_FT_Endpoint_Selector_Factory (void) TAO_Invocation_Endpoint_Selector * TAO_FT_Endpoint_Selector_Factory::get_selector (TAO_GIOP_Invocation * - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->ft_endpoint_selector_ == 0) { diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h index 6cb35899442..e178d6a9661 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h @@ -53,7 +53,7 @@ public: /// initialize the endpoint selection state instance. virtual TAO_Invocation_Endpoint_Selector *get_selector ( TAO_GIOP_Invocation * - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp index ec979f5a1cb..aaed1b9240a 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp @@ -14,7 +14,7 @@ ACE_RCSID(FaultTolerance, TAO_FT_IOGR_Property, "$Id$") CORBA::Boolean TAO_FT_IOGR_Property::set_property ( CORBA::Object_ptr ior - TAO_ENV_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/) + ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC ((CORBA::SystemException, TAO_IOP::Invalid_IOR)) { @@ -63,7 +63,7 @@ TAO_FT_IOGR_Property::set_property ( CORBA::Boolean TAO_FT_IOGR_Property::is_primary_set ( CORBA::Object_ptr ior - TAO_ENV_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/) + ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -78,7 +78,7 @@ TAO_FT_IOGR_Property::is_primary_set ( CORBA::Object_ptr TAO_FT_IOGR_Property::get_primary ( CORBA::Object_ptr ior - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, TAO_IOP::NotFound @@ -151,7 +151,7 @@ CORBA::Boolean TAO_FT_IOGR_Property::set_primary ( CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, TAO_IOP::NotFound, diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h index eb94a073989..3fe6434051e 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h @@ -76,7 +76,7 @@ public: virtual CORBA::Boolean set_property ( CORBA::Object_ptr ior - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -87,7 +87,7 @@ public: virtual CORBA::Boolean set_primary ( CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -98,7 +98,7 @@ public: virtual CORBA::Object_ptr get_primary ( CORBA::Object_ptr ior - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -108,7 +108,7 @@ public: virtual CORBA::Boolean is_primary_set ( CORBA::Object_ptr ior - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp index 2f07b99f486..a45f0cf0efd 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp @@ -32,11 +32,11 @@ TAO_FT_Invocation_Endpoint_Selector::~TAO_FT_Invocation_Endpoint_Selector (void) void TAO_FT_Invocation_Endpoint_Selector::select_endpoint ( TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { int retval = this->select_endpoint_i (invocation - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (retval == 0) @@ -47,7 +47,7 @@ TAO_FT_Invocation_Endpoint_Selector::select_endpoint ( "Falling back on the default selection routines \n")); TAO_Default_Endpoint_Selector::select_endpoint (invocation - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -57,7 +57,7 @@ TAO_FT_Invocation_Endpoint_Selector::select_endpoint ( // @@ RTCORBA_Subsetting - next should be deprecated... void TAO_FT_Invocation_Endpoint_Selector::next (TAO_GIOP_Invocation * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("This method is DEPRECATED!\n"))); // if (invocation->stub_->next_profile_retry () == 0) @@ -69,7 +69,7 @@ void TAO_FT_Invocation_Endpoint_Selector::forward (TAO_GIOP_Invocation *invocation, const TAO_MProfile &mprofile - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { invocation->stub ()->add_forward_profiles (mprofile); // This has to be and is thread safe. @@ -106,11 +106,11 @@ TAO_FT_Invocation_Endpoint_Selector::close_connection (TAO_GIOP_Invocation *invo int TAO_FT_Invocation_Endpoint_Selector::select_endpoint_i( TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { int retval = this->select_primary (invocation - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); @@ -166,7 +166,7 @@ TAO_FT_Invocation_Endpoint_Selector::select_endpoint_i( int status = this->endpoint_from_profile (invocation - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (status == 1) @@ -185,7 +185,7 @@ TAO_FT_Invocation_Endpoint_Selector::select_endpoint_i( int TAO_FT_Invocation_Endpoint_Selector::select_primary ( TAO_GIOP_Invocation *invoc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Get the current profile TAO_Profile *temp_profile = @@ -199,7 +199,7 @@ TAO_FT_Invocation_Endpoint_Selector::select_primary ( retval = this->check_profile_for_primary (invoc, temp_profile - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } else @@ -255,7 +255,7 @@ TAO_FT_Invocation_Endpoint_Selector::select_primary ( retval = this->check_profile_for_primary (invoc, temp_profile - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (retval == 1 || retval == -1) @@ -287,7 +287,7 @@ int TAO_FT_Invocation_Endpoint_Selector::check_profile_for_primary ( TAO_GIOP_Invocation *invocation, TAO_Profile*pfile - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { IOP::TaggedComponent tagged_component; tagged_component.tag = IOP::TAG_FT_PRIMARY; @@ -310,7 +310,7 @@ TAO_FT_Invocation_Endpoint_Selector::check_profile_for_primary ( int status = this->endpoint_from_profile (invocation - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (status == 1) diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h index 62e82e2a09e..805921e967e 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h @@ -55,27 +55,27 @@ public: /// $TAO_ROOT/tao/Invocation_Endpoint_Selectors.h for details of /// documentation. virtual void select_endpoint (TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void next (TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void forward (TAO_GIOP_Invocation *invocation, const TAO_MProfile &mprofile - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void success (TAO_GIOP_Invocation *invocation); virtual void close_connection (TAO_GIOP_Invocation *invocation); protected: int select_endpoint_i (TAO_GIOP_Invocation *invoc - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int select_primary (TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int check_profile_for_primary (TAO_GIOP_Invocation *, TAO_Profile * - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp index 02570b50932..51a9d535a22 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp @@ -12,7 +12,7 @@ ACE_RCSID (FaultTolerance, FT_ORBInitializer, "$Id$") void TAO_FT_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -21,18 +21,18 @@ TAO_FT_ORBInitializer::pre_init ( void TAO_FT_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->register_policy_factories (info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_FT_ORBInitializer::register_policy_factories ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Register the FTCORBA policy factories. @@ -60,19 +60,19 @@ TAO_FT_ORBInitializer::register_policy_factories ( CORBA::PolicyType type = FT::REQUEST_DURATION_POLICY; info->register_policy_factory (type, policy_factory.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; type = FT::HEARTBEAT_POLICY; info->register_policy_factory (type, policy_factory.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; type = FT::HEARTBEAT_ENABLED_POLICY; info->register_policy_factory (type, policy_factory.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Transfer ownership of the policy factory to the registry. diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h index eba0417afd6..3918193b6f3 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h @@ -47,18 +47,18 @@ class TAO_FT_Export TAO_FT_ORBInitializer : public: virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: void register_policy_factories ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); ///< Register FTCORBA policy factories. }; diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp index 534e396bfc9..2072fe7bbd1 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp @@ -17,20 +17,20 @@ CORBA::Policy_ptr TAO_FT_PolicyFactory::create_policy ( CORBA::PolicyType type, const CORBA::Any &val - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)) { if (type == FT::REQUEST_DURATION_POLICY) return TAO_FT_Request_Duration_Policy::create (val - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); else if (type == FT::HEARTBEAT_POLICY) return TAO_FT_Heart_Beat_Policy::create (val - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); else if (type == FT::HEARTBEAT_ENABLED_POLICY) return TAO_FT_Heart_Beat_Enabled_Policy::create (val - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE), CORBA::Policy::_nil ()); diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h index f96d8dc4617..f8dae1bc5cb 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h @@ -50,7 +50,7 @@ public: virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any &value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)); }; diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp index 0fe68876e0e..3328034a0cb 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp @@ -10,14 +10,14 @@ ACE_RCSID(FaultTolerance, FT_Policy_i, "$Id$") TimeBase::TimeT -TAO_FT_Request_Duration_Policy::request_duration_value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_FT_Request_Duration_Policy::request_duration_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->request_duration_; } CORBA::PolicyType -TAO_FT_Request_Duration_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_FT_Request_Duration_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return FT::REQUEST_DURATION_POLICY; @@ -25,7 +25,7 @@ TAO_FT_Request_Duration_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) CORBA::Policy_ptr TAO_FT_Request_Duration_Policy::create (const CORBA::Any& val - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TimeBase::TimeT value; if ((val >>= value) == 0) @@ -53,7 +53,7 @@ TAO_FT_Request_Duration_Policy::clone (void) const } CORBA::Policy_ptr -TAO_FT_Request_Duration_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_FT_Request_Duration_Policy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_FT_Request_Duration_Policy* tmp; @@ -66,7 +66,7 @@ TAO_FT_Request_Duration_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_FT_Request_Duration_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_FT_Request_Duration_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -94,7 +94,7 @@ TAO_FT_Request_Duration_Policy::set_time_value (ACE_Time_Value &time_value) /*****************************************************************/ FT::HeartbeatPolicyValue -TAO_FT_Heart_Beat_Policy::heartbeat_policy_value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_FT_Heart_Beat_Policy::heartbeat_policy_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { FT::HeartbeatPolicyValue val; @@ -108,7 +108,7 @@ TAO_FT_Heart_Beat_Policy::heartbeat_policy_value (TAO_ENV_SINGLE_ARG_DECL_NOT_US CORBA::Policy_ptr TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { FT::HeartbeatPolicyValue *value; if ((val >>= value) == 0) @@ -129,7 +129,7 @@ TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val CORBA::PolicyType -TAO_FT_Heart_Beat_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_FT_Heart_Beat_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return FT::HEARTBEAT_POLICY; @@ -137,7 +137,7 @@ TAO_FT_Heart_Beat_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) CORBA::Policy_ptr -TAO_FT_Heart_Beat_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_FT_Heart_Beat_Policy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_FT_Heart_Beat_Policy * tmp; @@ -160,7 +160,7 @@ TAO_FT_Heart_Beat_Policy::clone (void) const } void -TAO_FT_Heart_Beat_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_FT_Heart_Beat_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -189,7 +189,7 @@ TAO_FT_Heart_Beat_Policy::set_time_value (ACE_Time_Value &time_value, CORBA::Boolean TAO_FT_Heart_Beat_Enabled_Policy::heartbeat_enabled_policy_value ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->heartbeat_enabled_value_; @@ -198,7 +198,7 @@ TAO_FT_Heart_Beat_Enabled_Policy::heartbeat_enabled_policy_value ( CORBA::Policy_ptr TAO_FT_Heart_Beat_Enabled_Policy::create (const CORBA::Any& val - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Boolean value; @@ -217,7 +217,7 @@ TAO_FT_Heart_Beat_Enabled_Policy::create (const CORBA::Any& val } CORBA::PolicyType -TAO_FT_Heart_Beat_Enabled_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_FT_Heart_Beat_Enabled_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return FT::HEARTBEAT_ENABLED_POLICY; @@ -225,7 +225,7 @@ TAO_FT_Heart_Beat_Enabled_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) CORBA::Policy_ptr -TAO_FT_Heart_Beat_Enabled_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_FT_Heart_Beat_Enabled_Policy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_FT_Heart_Beat_Enabled_Policy * tmp; @@ -249,7 +249,7 @@ TAO_FT_Heart_Beat_Enabled_Policy::clone (void) const void -TAO_FT_Heart_Beat_Enabled_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_FT_Heart_Beat_Enabled_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h index be1e5de9406..fe9a8bebd12 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h @@ -61,7 +61,7 @@ public: // Copy constructor. static CORBA::Policy_ptr create (const CORBA::Any& val - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // Helper method for the implementation of // CORBA::ORB::create_policy. @@ -69,19 +69,19 @@ public: // Returns a copy of . // = The FT::RequestDurationPolicy methods - virtual TimeBase::TimeT request_duration_value (TAO_ENV_SINGLE_ARG_DECL) + virtual TimeBase::TimeT request_duration_value (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::PolicyType policy_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Policy_ptr copy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void set_time_value (ACE_Time_Value &time_value); @@ -115,7 +115,7 @@ public: // Copy constructor. static CORBA::Policy_ptr create (const CORBA::Any& val - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // Helper method for the implementation of // CORBA::ORB::create_policy. @@ -124,19 +124,19 @@ public: // Returns a copy of . // = The FT::HeartBeatPolicy methods - virtual FT::HeartbeatPolicyValue heartbeat_policy_value (TAO_ENV_SINGLE_ARG_DECL) + virtual FT::HeartbeatPolicyValue heartbeat_policy_value (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::PolicyType policy_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Policy_ptr copy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void set_time_value (ACE_Time_Value &time_value, @@ -179,7 +179,7 @@ public: // Copy constructor. static CORBA::Policy_ptr create (const CORBA::Any& val - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // Helper method for the implementation of // CORBA::ORB::create_policy. @@ -189,19 +189,19 @@ public: // = The FT::HeartBeatPolicy methods virtual CORBA::Boolean heartbeat_enabled_policy_value ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::PolicyType policy_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Policy_ptr copy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp index 7d75ef8a98b..07a925ee980 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp @@ -159,7 +159,7 @@ TAO_FT_Service_Callbacks::service_context_list ( TAO_Stub *&stub, IOP::ServiceContextList &service_list, CORBA::Boolean restart - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -171,13 +171,13 @@ TAO_FT_Service_Callbacks::service_context_list ( // Pack the group version service context this->group_version_service_context (stub, service_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Pack the request service context this->request_service_context (stub, service_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -188,7 +188,7 @@ void TAO_FT_Service_Callbacks::request_service_context ( TAO_Stub *&stub, IOP::ServiceContextList &service_list - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_OutputCDR cdr; @@ -211,7 +211,7 @@ TAO_FT_Service_Callbacks::request_service_context ( // Check whether the FT::RequestDurationPolicy has been set CORBA::Policy_var policy = stub->get_policy (FT::REQUEST_DURATION_POLICY - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // @@ There are two possibilities a) Duration policy has not been @@ -231,7 +231,7 @@ TAO_FT_Service_Callbacks::request_service_context ( FT::RequestDurationPolicy::_narrow (policy.in ()); exp_time = - duration_policy->request_duration_value (TAO_ENV_SINGLE_ARG_PARAMETER); + duration_policy->request_duration_value (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } else @@ -289,7 +289,7 @@ void TAO_FT_Service_Callbacks::group_version_service_context ( TAO_Stub *&stub, IOP::ServiceContextList &service_list - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_OutputCDR cdr; @@ -369,7 +369,7 @@ int TAO_FT_Service_Callbacks::raise_comm_failure ( TAO_GIOP_Invocation *invoke, TAO_Profile *profile - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->restart_policy_check ( invoke->request_service_context ().service_info (), @@ -403,7 +403,7 @@ int TAO_FT_Service_Callbacks::raise_transient_failure ( TAO_GIOP_Invocation *invoke, TAO_Profile *profile - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (restart_policy_check ( invoke->request_service_context ().service_info (), diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h index 9254b4e8482..a984f5368ed 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h @@ -76,7 +76,7 @@ public: virtual void service_context_list (TAO_Stub *&stub, IOP::ServiceContextList &service_list, CORBA::Boolean restart - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Add relevant stuff to the service context list @@ -84,14 +84,14 @@ public: virtual int raise_comm_failure ( TAO_GIOP_Invocation *invoke, TAO_Profile *profile - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Check whether we need to raise an exception or go for a // reinvocaton. virtual int raise_transient_failure ( TAO_GIOP_Invocation *invoke, TAO_Profile *profile - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Check whether we need to raise an exception or go for a // reinvocaton. @@ -110,13 +110,13 @@ private: void request_service_context (TAO_Stub *&stub, IOP::ServiceContextList &service_list - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Makes the request service_context list void group_version_service_context (TAO_Stub *&stub, IOP::ServiceContextList &service_list - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Make the group version service context list diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancer_i.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancer_i.cpp index af98cb7e372..66515a35186 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancer_i.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancer_i.cpp @@ -30,7 +30,7 @@ TAO_LB_LoadBalancer::~TAO_LB_LoadBalancer (void) LoadBalancing::ReplicaProxy_ptr TAO_LB_LoadBalancer::connect (LoadBalancing::ReplicaControl_ptr control, CORBA::Object_ptr replica - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NilControl, LoadBalancing::ReplicaProxy::NilReplica, CORBA::SystemException)) @@ -47,7 +47,7 @@ TAO_LB_LoadBalancer::connect (LoadBalancing::ReplicaControl_ptr control, PortableServer::ServantBase_var proxy_servant = proxy; - proxy->connect (this, control, replica TAO_ENV_ARG_PARAMETER); + proxy->connect (this, control, replica ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (LoadBalancing::ReplicaProxy::_nil ()); if (this->strategy_->insert (proxy) == -1) @@ -56,11 +56,11 @@ TAO_LB_LoadBalancer::connect (LoadBalancing::ReplicaControl_ptr control, LoadBalancing::ReplicaProxy::_nil ()); } - return proxy->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return proxy->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::Object_ptr -TAO_LB_LoadBalancer::group_identity (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_LB_LoadBalancer::group_identity (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::Object::_duplicate (this->group_identity_.in ()); @@ -68,9 +68,9 @@ TAO_LB_LoadBalancer::group_identity (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_LB_LoadBalancer::load_changed (TAO_LB_ReplicaProxy *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->strategy_->load_changed (proxy TAO_ENV_ARG_PARAMETER); + this->strategy_->load_changed (proxy ACE_ENV_ARG_PARAMETER); } int @@ -85,13 +85,13 @@ TAO_LB_LoadBalancer::init (const char * repository_id, PortableServer::RequestProcessingPolicy_var request = root_poa->create_request_processing_policy ( PortableServer::USE_SERVANT_MANAGER - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ServantRetentionPolicy_var retention = root_poa->create_servant_retention_policy ( PortableServer::NON_RETAIN - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create the PolicyList. @@ -107,28 +107,28 @@ TAO_LB_LoadBalancer::init (const char * repository_id, // Create the child POA with the ServantManager (ReplicaLocator) // above policies. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->poa_ = root_poa->create_POA ("TAO_LB_ReplicaLocator_POA", poa_manager.in (), policy_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Activate the child POA. - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - request->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + request->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - retention->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + retention->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Now set the ReplicaLocator as the child POA's Servant // Manager. this->poa_->set_servant_manager (&this->locator_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // @@ What ObjectId should be used? @@ -138,7 +138,7 @@ TAO_LB_LoadBalancer::init (const char * repository_id, this->group_identity_ = this->poa_->create_reference_with_id (oid.in (), repository_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancer_i.h b/TAO/orbsvcs/orbsvcs/LoadBalancer_i.h index a410c01cdec..7437c529fab 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancer_i.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancer_i.h @@ -59,17 +59,17 @@ public: // things) pre-computed. // void load_changed (TAO_LB_ReplicaProxy *proxy - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // The load for has changed, the LoadBalancer can use this // opportunity to determine if the load on one of the services is // too high. void disconnect (TAO_LB_ReplicaProxy *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Disconnect proxy from the Load Balancer. - CORBA::Object_ptr replica (TAO_ENV_SINGLE_ARG_DECL) + CORBA::Object_ptr replica (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Return a reference to the Replica to which client requests should // be redirected next. @@ -78,11 +78,11 @@ public: virtual LoadBalancing::ReplicaProxy_ptr connect ( LoadBalancing::ReplicaControl_ptr control, CORBA::Object_ptr replica - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NilControl, LoadBalancing::ReplicaProxy::NilReplica, CORBA::SystemException)); - virtual CORBA::Object_ptr group_identity (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::Object_ptr group_identity (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancer_i.i b/TAO/orbsvcs/orbsvcs/LoadBalancer_i.i index f667e95a552..a806f7dfead 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancer_i.i +++ b/TAO/orbsvcs/orbsvcs/LoadBalancer_i.i @@ -5,7 +5,7 @@ ACE_INLINE void TAO_LB_LoadBalancer::disconnect (TAO_LB_ReplicaProxy *proxy - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ Ossama, what is the we cannot raise that exception here! @@ -22,8 +22,8 @@ TAO_LB_LoadBalancer::disconnect (TAO_LB_ReplicaProxy *proxy ACE_INLINE CORBA::Object_ptr -TAO_LB_LoadBalancer::replica (TAO_ENV_SINGLE_ARG_DECL) +TAO_LB_LoadBalancer::replica (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->strategy_->replica (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->strategy_->replica (ACE_ENV_SINGLE_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.cpp index af98cb7e372..66515a35186 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.cpp @@ -30,7 +30,7 @@ TAO_LB_LoadBalancer::~TAO_LB_LoadBalancer (void) LoadBalancing::ReplicaProxy_ptr TAO_LB_LoadBalancer::connect (LoadBalancing::ReplicaControl_ptr control, CORBA::Object_ptr replica - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NilControl, LoadBalancing::ReplicaProxy::NilReplica, CORBA::SystemException)) @@ -47,7 +47,7 @@ TAO_LB_LoadBalancer::connect (LoadBalancing::ReplicaControl_ptr control, PortableServer::ServantBase_var proxy_servant = proxy; - proxy->connect (this, control, replica TAO_ENV_ARG_PARAMETER); + proxy->connect (this, control, replica ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (LoadBalancing::ReplicaProxy::_nil ()); if (this->strategy_->insert (proxy) == -1) @@ -56,11 +56,11 @@ TAO_LB_LoadBalancer::connect (LoadBalancing::ReplicaControl_ptr control, LoadBalancing::ReplicaProxy::_nil ()); } - return proxy->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return proxy->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::Object_ptr -TAO_LB_LoadBalancer::group_identity (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_LB_LoadBalancer::group_identity (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::Object::_duplicate (this->group_identity_.in ()); @@ -68,9 +68,9 @@ TAO_LB_LoadBalancer::group_identity (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_LB_LoadBalancer::load_changed (TAO_LB_ReplicaProxy *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->strategy_->load_changed (proxy TAO_ENV_ARG_PARAMETER); + this->strategy_->load_changed (proxy ACE_ENV_ARG_PARAMETER); } int @@ -85,13 +85,13 @@ TAO_LB_LoadBalancer::init (const char * repository_id, PortableServer::RequestProcessingPolicy_var request = root_poa->create_request_processing_policy ( PortableServer::USE_SERVANT_MANAGER - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ServantRetentionPolicy_var retention = root_poa->create_servant_retention_policy ( PortableServer::NON_RETAIN - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create the PolicyList. @@ -107,28 +107,28 @@ TAO_LB_LoadBalancer::init (const char * repository_id, // Create the child POA with the ServantManager (ReplicaLocator) // above policies. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->poa_ = root_poa->create_POA ("TAO_LB_ReplicaLocator_POA", poa_manager.in (), policy_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Activate the child POA. - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - request->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + request->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - retention->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + retention->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Now set the ReplicaLocator as the child POA's Servant // Manager. this->poa_->set_servant_manager (&this->locator_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // @@ What ObjectId should be used? @@ -138,7 +138,7 @@ TAO_LB_LoadBalancer::init (const char * repository_id, this->group_identity_ = this->poa_->create_reference_with_id (oid.in (), repository_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.h index a410c01cdec..7437c529fab 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.h @@ -59,17 +59,17 @@ public: // things) pre-computed. // void load_changed (TAO_LB_ReplicaProxy *proxy - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // The load for has changed, the LoadBalancer can use this // opportunity to determine if the load on one of the services is // too high. void disconnect (TAO_LB_ReplicaProxy *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Disconnect proxy from the Load Balancer. - CORBA::Object_ptr replica (TAO_ENV_SINGLE_ARG_DECL) + CORBA::Object_ptr replica (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Return a reference to the Replica to which client requests should // be redirected next. @@ -78,11 +78,11 @@ public: virtual LoadBalancing::ReplicaProxy_ptr connect ( LoadBalancing::ReplicaControl_ptr control, CORBA::Object_ptr replica - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NilControl, LoadBalancing::ReplicaProxy::NilReplica, CORBA::SystemException)); - virtual CORBA::Object_ptr group_identity (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::Object_ptr group_identity (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.i b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.i index f667e95a552..a806f7dfead 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.i +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.i @@ -5,7 +5,7 @@ ACE_INLINE void TAO_LB_LoadBalancer::disconnect (TAO_LB_ReplicaProxy *proxy - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ Ossama, what is the we cannot raise that exception here! @@ -22,8 +22,8 @@ TAO_LB_LoadBalancer::disconnect (TAO_LB_ReplicaProxy *proxy ACE_INLINE CORBA::Object_ptr -TAO_LB_LoadBalancer::replica (TAO_ENV_SINGLE_ARG_DECL) +TAO_LB_LoadBalancer::replica (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->strategy_->replica (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->strategy_->replica (ACE_ENV_SINGLE_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.cpp index f0b9d4f00f7..55d9e4ae6fb 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.cpp @@ -18,7 +18,7 @@ TAO_LB_LoadBalancing_Strategy::~TAO_LB_LoadBalancing_Strategy (void) void TAO_LB_LoadBalancing_Strategy::load_changed (TAO_LB_ReplicaProxy * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.h index 946325788d9..0e197de508f 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.h @@ -47,7 +47,7 @@ public: // @@ The name of the method should be more meaningful, what about: // select_replica(), select_unloaded_replica() or something like // that? - virtual CORBA::Object_ptr replica (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::Object_ptr replica (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; // Return the object reference to the Replica to which requests should // be redirected. @@ -60,7 +60,7 @@ public: // Remove ReplicaProxy servant from the set of replica proxies. virtual void load_changed (TAO_LB_ReplicaProxy *proxy - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // The load on one proxy has changed. // @@ Ossama: see my comments on LoadBalancing_i about changing the // signature of this method. diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.cpp index 06d74819fb2..c3e9ae40930 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.cpp @@ -36,7 +36,7 @@ TAO_LB_Minimum_Dispersion_Strategy::~TAO_LB_Minimum_Dispersion_Strategy (void) } CORBA::Object_ptr -TAO_LB_Minimum_Dispersion_Strategy::replica (TAO_ENV_SINGLE_ARG_DECL) +TAO_LB_Minimum_Dispersion_Strategy::replica (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { for ( ; ; ) @@ -84,7 +84,7 @@ TAO_LB_Minimum_Dispersion_Strategy::replica (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { CORBA::Boolean non_existent = - object->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + object->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (!non_existent) { @@ -130,7 +130,7 @@ TAO_LB_Minimum_Dispersion_Strategy::remove (TAO_LB_ReplicaProxy *proxy) void TAO_LB_Minimum_Dispersion_Strategy::load_changed (TAO_LB_ReplicaProxy *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { int send_load_advisory = 0; @@ -185,7 +185,7 @@ TAO_LB_Minimum_Dispersion_Strategy::load_changed (TAO_LB_ReplicaProxy *proxy // dispersion we tolerate before starting to send advisories. if (send_load_advisory == 2) { - proxy->control_->high_load_advisory (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->control_->high_load_advisory (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; return; // We may not throw an exception, so explicitly return. @@ -199,7 +199,7 @@ TAO_LB_Minimum_Dispersion_Strategy::load_changed (TAO_LB_ReplicaProxy *proxy // construction time... if (send_load_advisory == 1) { - proxy->control_->nominal_load_advisory (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->control_->nominal_load_advisory (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.h index df4e679543c..938b7ba0ecc 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.h @@ -56,12 +56,12 @@ public: // Destructor // = The TAO_LB_LoadBalancing_Strategy methods - virtual CORBA::Object_ptr replica (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::Object_ptr replica (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual int insert (TAO_LB_ReplicaProxy *); virtual int remove (TAO_LB_ReplicaProxy *); virtual void load_changed (TAO_LB_ReplicaProxy * - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: TAO_LB_ReplicaProxySet proxies_; diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.cpp index 66a03582d03..e42168ee991 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.cpp @@ -19,7 +19,7 @@ TAO_LB_ReplicaLocator::preinvoke ( PortableServer::POA_ptr /* adapter */, const char * /* operation */, PortableServer::ServantLocator::Cookie & /* the_cookie */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)) { @@ -27,7 +27,7 @@ TAO_LB_ReplicaLocator::preinvoke ( ACE_THROW_RETURN (CORBA::INTERNAL (), 0); CORBA::Object_var replica = - this->load_balancer_->replica (TAO_ENV_SINGLE_ARG_PARAMETER); + this->load_balancer_->replica (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Throw a forward exception to force the client to redirect its @@ -44,7 +44,7 @@ TAO_LB_ReplicaLocator::postinvoke ( const char * /* operation */, PortableServer::ServantLocator::Cookie /* the_cookie */, PortableServer::Servant /* the_servant */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // No-op diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.h index 9031dbb51fc..0507fd23d50 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.h @@ -50,7 +50,7 @@ public: PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie & the_cookie - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)); @@ -60,7 +60,7 @@ public: const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.cpp index bfc9d025ba7..f111819e7f8 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.cpp @@ -23,7 +23,7 @@ TAO_LB_ReplicaProxy::TAO_LB_ReplicaProxy (void) void TAO_LB_ReplicaProxy::current_load (CORBA::Float load - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ Ossama: this is the point were the load dampening should @@ -35,11 +35,11 @@ TAO_LB_ReplicaProxy::current_load (CORBA::Float load this->current_load_ = load; // ACE_DEBUG ((LM_DEBUG, "Load[%x] = %f\n", long(this), load)); - this->balancer_->load_changed (this TAO_ENV_ARG_PARAMETER); + this->balancer_->load_changed (this ACE_ENV_ARG_PARAMETER); } void -TAO_LB_ReplicaProxy::disconnect (TAO_ENV_SINGLE_ARG_DECL) +TAO_LB_ReplicaProxy::disconnect (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NotConnected, CORBA::SystemException)) { @@ -49,7 +49,7 @@ TAO_LB_ReplicaProxy::disconnect (TAO_ENV_SINGLE_ARG_DECL) if (this->connected_) { - this->balancer_->disconnect (this TAO_ENV_ARG_PARAMETER); + this->balancer_->disconnect (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->connected_ = 0; @@ -64,7 +64,7 @@ void TAO_LB_ReplicaProxy::connect (TAO_LB_LoadBalancer *balancer, LoadBalancing::ReplicaControl_ptr control, CORBA::Object_ptr replica - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NilControl, LoadBalancing::ReplicaProxy::NilReplica, CORBA::SystemException)) diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.h index 9eb629ea29f..8f29e644a6d 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.h @@ -55,7 +55,7 @@ public: // Return a reference to the Replica. virtual void current_load (CORBA::Float load - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Send the value of the current load on the Object being load // balanced, where the definition of "load" is load balancing @@ -69,7 +69,7 @@ public: // without affecting the client, or detect rapid raises in load and // react proactively to those... - virtual void disconnect (TAO_ENV_SINGLE_ARG_DECL) + virtual void disconnect (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NotConnected, CORBA::SystemException)); // Send a request to disconnect from the LoadBalancer. @@ -93,7 +93,7 @@ private: void connect (TAO_LB_LoadBalancer *balancer, LoadBalancing::ReplicaControl_ptr control, CORBA::Object_ptr replica - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NilControl, LoadBalancing::ReplicaProxy::NilReplica, CORBA::SystemException)); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.cpp index 4da47b060d7..d587a309dfa 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.cpp @@ -39,7 +39,7 @@ TAO_LB_Round_Robin_Strategy::~TAO_LB_Round_Robin_Strategy (void) } CORBA::Object_ptr -TAO_LB_Round_Robin_Strategy::replica (TAO_ENV_SINGLE_ARG_DECL) +TAO_LB_Round_Robin_Strategy::replica (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.h index 93887fc6ac0..988e18ea25e 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.h @@ -60,7 +60,7 @@ public: // Destructor // = The Load_Balancing_Strategy methods - virtual CORBA::Object_ptr replica (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Object_ptr replica (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual int insert (TAO_LB_ReplicaProxy *); virtual int remove (TAO_LB_ReplicaProxy *); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.cpp index f0b9d4f00f7..55d9e4ae6fb 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.cpp @@ -18,7 +18,7 @@ TAO_LB_LoadBalancing_Strategy::~TAO_LB_LoadBalancing_Strategy (void) void TAO_LB_LoadBalancing_Strategy::load_changed (TAO_LB_ReplicaProxy * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.h b/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.h index 946325788d9..0e197de508f 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.h @@ -47,7 +47,7 @@ public: // @@ The name of the method should be more meaningful, what about: // select_replica(), select_unloaded_replica() or something like // that? - virtual CORBA::Object_ptr replica (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::Object_ptr replica (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; // Return the object reference to the Replica to which requests should // be redirected. @@ -60,7 +60,7 @@ public: // Remove ReplicaProxy servant from the set of replica proxies. virtual void load_changed (TAO_LB_ReplicaProxy *proxy - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // The load on one proxy has changed. // @@ Ossama: see my comments on LoadBalancing_i about changing the // signature of this method. diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp index f121cfc75f3..bad0af39eea 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp @@ -15,29 +15,29 @@ BasicLogFactory_i::~BasicLogFactory_i() DsLogAdmin::BasicLogFactory_ptr BasicLogFactory_i::activate (PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { DsLogAdmin::BasicLogFactory_var v_return; PortableServer::ObjectId_var oid = poa->activate_object (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (v_return._retn ()); CORBA::Object_var obj = poa->id_to_reference (oid.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (v_return._retn ()); // narrow and store the result.. this->log_mgr_ = DsLogAdmin::LogMgr::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (v_return._retn ()); v_return = DsLogAdmin::BasicLogFactory::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (DsLogAdmin::BasicLogFactory::_nil ()); return v_return._retn (); @@ -47,7 +47,7 @@ DsLogAdmin::BasicLog_ptr BasicLogFactory_i::create (DsLogAdmin::LogFullAction full_action, CORBA::ULongLong max_rec_size, DsLogAdmin::LogId_out id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::NoResources )) @@ -59,7 +59,7 @@ BasicLogFactory_i::create (DsLogAdmin::LogFullAction full_action, this->create_with_id (this->max_id_, full_action, max_rec_size - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (DsLogAdmin::BasicLog::_nil ()); // Set the id to return.. @@ -71,7 +71,7 @@ DsLogAdmin::BasicLog_ptr BasicLogFactory_i::create_with_id (DsLogAdmin::LogId id, DsLogAdmin::LogFullAction full_action, CORBA::ULongLong max_size - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DsLogAdmin::NoResources, @@ -101,14 +101,14 @@ BasicLogFactory_i::create_with_id (DsLogAdmin::LogId id, auto_ptr basic_log_auto (basic_log_i); // just in case the activation fails. - basic_log_i->init (TAO_ENV_SINGLE_ARG_PARAMETER); + basic_log_i->init (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (basic_log._retn ()); // Register with the poa - basic_log = basic_log_i->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + basic_log = basic_log_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (basic_log._retn ()); - basic_log_i->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + basic_log_i->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (DsLogAdmin::BasicLog::_nil ()); // Add to the Hash table.. diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h index 58c6c556192..355c599ae36 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h @@ -51,14 +51,14 @@ public: DsLogAdmin::BasicLogFactory_ptr activate (PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Activate this servant with the POA passed in. DsLogAdmin::BasicLog_ptr create (DsLogAdmin::LogFullAction full_action, CORBA::ULongLong max_size, DsLogAdmin::LogId_out id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::NoResources )); @@ -69,7 +69,7 @@ public: create_with_id (DsLogAdmin::LogId id, DsLogAdmin::LogFullAction full_action, CORBA::ULongLong max_size - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DsLogAdmin::NoResources, diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp index 4c242a8c376..d5cb57712cd 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp @@ -21,7 +21,7 @@ BasicLog_i::~BasicLog_i () } void -BasicLog_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +BasicLog_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Remove ourselves from the list of logs. @@ -29,15 +29,15 @@ BasicLog_i::destroy (TAO_ENV_SINGLE_ARG_DECL) // Deregister with POA. PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h index 483db1f88c6..3ac2e12b5f7 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h @@ -65,7 +65,7 @@ public: // Destructor. void - destroy (TAO_ENV_SINGLE_ARG_DECL) + destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Destroy the log object and all contained records. diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp index 8483089c925..6dcc28fc61c 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp @@ -31,21 +31,21 @@ Iterator_i::~Iterator_i (void) } void -Iterator_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +Iterator_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - PortableServer::POA_ptr poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_ptr poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var oid = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Goodbye cruel world... // deactivate from the poa. poa->deactivate_object (oid.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; return; } @@ -53,7 +53,7 @@ Iterator_i::destroy (TAO_ENV_SINGLE_ARG_DECL) DsLogAdmin::RecordList* Iterator_i::get (CORBA::ULong position, CORBA::ULong how_many - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidParam)) { @@ -73,7 +73,7 @@ Iterator_i::get (CORBA::ULong position, // Use an Interpreter to build an expression tree. TAO_Log_Constraint_Interpreter interpreter (constraint_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Sequentially iterate over all the records and pick the ones that @@ -122,7 +122,7 @@ Iterator_i::get (CORBA::ULong position, if (done == 1) { // destroy this object.. - this->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (rec_list); } diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h index f20c1e7980b..4655da02a4d 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h @@ -58,12 +58,12 @@ public: DsLogAdmin::RecordList* get (CORBA::ULong position, CORBA::ULong how_many - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidParam)); // Gets a list of LogRecords. - void destroy (TAO_ENV_SINGLE_ARG_DECL) + void destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This destroys the iterator. diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp index eef4349d9ff..fae15c930bd 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp @@ -13,7 +13,7 @@ LogMgr_i::~LogMgr_i () } DsLogAdmin::LogList* -LogMgr_i::list_logs (TAO_ENV_SINGLE_ARG_DECL) +LogMgr_i::list_logs (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -51,7 +51,7 @@ LogMgr_i::list_logs (TAO_ENV_SINGLE_ARG_DECL) DsLogAdmin::Log_ptr LogMgr_i::find_log (DsLogAdmin::LogId id - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -82,7 +82,7 @@ LogMgr_i::find_log (DsLogAdmin::LogId id } DsLogAdmin::LogIdList* -LogMgr_i::list_logs_by_id (TAO_ENV_SINGLE_ARG_DECL) +LogMgr_i::list_logs_by_id (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h index 8b6455b0fef..537e794f3b3 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h @@ -40,7 +40,7 @@ public: // Destructor. DsLogAdmin::LogList * - list_logs (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + list_logs (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); @@ -48,14 +48,14 @@ public: DsLogAdmin::Log_ptr find_log (DsLogAdmin::LogId id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); // Returns a reference to the log with the supplied id DsLogAdmin::LogIdList * - list_logs_by_id (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + list_logs_by_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp index d87f5406087..fab4cc4fd1c 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp @@ -5,7 +5,7 @@ TAO_Log_Constraint_Interpreter:: TAO_Log_Constraint_Interpreter(const char* constraints - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((DsLogAdmin::InvalidConstraint, CORBA::NO_MEMORY)) { diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h index a68ab3deedb..40d89d023cd 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h @@ -37,7 +37,7 @@ class TAO_Log_Export TAO_Log_Constraint_Interpreter : public TAO_Interpreter public: // = Initialization and termination methods. TAO_Log_Constraint_Interpreter (const char* constraints - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((DsLogAdmin::InvalidConstraint, CORBA::NO_MEMORY)); // This constructor builds an expression tree representing the diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp index c9c9aeae5a0..eb42cad258d 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp @@ -29,13 +29,13 @@ visit_property (TAO_Property_Constraint* literal) if (this->props_.find (prop_name, prop_index) == 0) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; CORBA::Any *value = 0; // Retrieve the value of the property from the Property_Evaluator ACE_TRY { - // value = this->prop_eval_.property_value (prop_index TAO_ENV_ARG_PARAMETER); + // value = this->prop_eval_.property_value (prop_index ACE_ENV_ARG_PARAMETER); ACE_NEW_THROW_EX (value, CORBA::Any, CORBA::NO_MEMORY ()); diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp index 8136149246a..439e0ed46c5 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp @@ -29,7 +29,7 @@ Log_i::Log_i (DsLogAdmin::LogMgr_ptr factory, } void -Log_i::init (TAO_ENV_SINGLE_ARG_DECL) +Log_i::init (ACE_ENV_SINGLE_ARG_DECL) { if (recordstore_.open () ==-1) ACE_THROW (CORBA::UNKNOWN ()); @@ -46,21 +46,21 @@ Log_i::~Log_i (void) } DsLogAdmin::LogMgr_ptr -Log_i::my_factory (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Log_i::my_factory (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return DsLogAdmin::LogMgr::_duplicate (factory_.in ()); } DsLogAdmin::LogId -Log_i::id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Log_i::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return logid_; } DsLogAdmin::QoSList* -Log_i::get_qos (TAO_ENV_SINGLE_ARG_DECL) +Log_i::get_qos (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { DsLogAdmin::QoSList* ret_val; @@ -73,7 +73,7 @@ Log_i::get_qos (TAO_ENV_SINGLE_ARG_DECL) void Log_i::set_qos (const DsLogAdmin::QoSList &qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::UnsupportedQoS)) { @@ -100,7 +100,7 @@ Log_i::set_qos (const DsLogAdmin::QoSList &qos } CORBA::ULong -Log_i::get_max_record_life (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Log_i::get_max_record_life (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return max_record_life_; @@ -108,7 +108,7 @@ Log_i::get_max_record_life (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Log_i::set_max_record_life (CORBA::ULong life - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // life is in seconds. @@ -119,7 +119,7 @@ Log_i::set_max_record_life (CORBA::ULong life } CORBA::ULongLong -Log_i::get_max_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Log_i::get_max_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return recordstore_.get_max_size (); @@ -127,7 +127,7 @@ Log_i::get_max_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Log_i::set_max_size (CORBA::ULongLong size - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidParam)) { @@ -146,21 +146,21 @@ Log_i::set_max_size (CORBA::ULongLong size } CORBA::ULongLong -Log_i::get_current_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Log_i::get_current_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->recordstore_.get_current_size (); } CORBA::ULongLong -Log_i::get_n_records (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Log_i::get_n_records (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->recordstore_.get_n_records (); } DsLogAdmin::LogFullAction -Log_i::get_log_full_action (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Log_i::get_log_full_action (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return log_full_action_; @@ -168,14 +168,14 @@ Log_i::get_log_full_action (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Log_i::set_log_full_action (DsLogAdmin::LogFullAction action - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { log_full_action_ = action; } DsLogAdmin::AdministrativeState -Log_i::get_administrative_state (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Log_i::get_administrative_state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return admin_state_; @@ -183,14 +183,14 @@ Log_i::get_administrative_state (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Log_i::set_administrative_state (DsLogAdmin::AdministrativeState state - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->admin_state_ = state; } DsLogAdmin::ForwardingState -Log_i::get_forwarding_state (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Log_i::get_forwarding_state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->forward_state_; @@ -198,21 +198,21 @@ Log_i::get_forwarding_state (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Log_i::set_forwarding_state (DsLogAdmin::ForwardingState state - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->forward_state_ = state; } DsLogAdmin::OperationalState -Log_i::get_operational_state (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Log_i::get_operational_state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->op_state_; } DsLogAdmin::TimeInterval -Log_i::get_interval (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Log_i::get_interval (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->interval_; @@ -220,7 +220,7 @@ Log_i::get_interval (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Log_i::set_interval (const DsLogAdmin::TimeInterval &interval - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidTime, DsLogAdmin::InvalidTimeInterval)) @@ -232,7 +232,7 @@ Log_i::set_interval (const DsLogAdmin::TimeInterval &interval } DsLogAdmin::AvailabilityStatus -Log_i::get_availability_status (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Log_i::get_availability_status (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO: @@ -249,7 +249,7 @@ Log_i::get_availability_status (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } DsLogAdmin::CapacityAlarmThresholdList* -Log_i::get_capacity_alarm_thresholds (TAO_ENV_SINGLE_ARG_DECL) +Log_i::get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { DsLogAdmin::CapacityAlarmThresholdList* ret_val; @@ -265,7 +265,7 @@ void Log_i::set_capacity_alarm_thresholds (const DsLogAdmin::CapacityAlarmThresholdList &threshs - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidThreshold)) { @@ -277,7 +277,7 @@ Log_i::set_capacity_alarm_thresholds (const } DsLogAdmin::WeekMask* -Log_i::get_week_mask (TAO_ENV_SINGLE_ARG_DECL) +Log_i::get_week_mask (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { DsLogAdmin::WeekMask* ret_val; @@ -291,7 +291,7 @@ Log_i::get_week_mask (TAO_ENV_SINGLE_ARG_DECL) void Log_i::set_week_mask (const DsLogAdmin::WeekMask &masks - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidTime, DsLogAdmin::InvalidTimeInterval, @@ -306,13 +306,13 @@ DsLogAdmin::RecordList* Log_i::query_i (const char *constraint, DsLogAdmin::Iterator_out &iter_out, CORBA::ULong how_many - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidConstraint)) { // Use an Interpreter to build an expression tree. TAO_Log_Constraint_Interpreter interpreter (constraint - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Sequentially iterate over all the records and pick the ones that @@ -393,11 +393,11 @@ Log_i::query_i (const char *constraint, ACE_CHECK_RETURN (rec_list); // Activate it. - iter_out = iter_query->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + iter_out = iter_query->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (rec_list); // Give ownership to the POA. - this->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (rec_list); } @@ -408,19 +408,19 @@ DsLogAdmin::RecordList* Log_i::query (const char *grammar, const char *constraint, DsLogAdmin::Iterator_out iter_out - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidGrammar, DsLogAdmin::InvalidConstraint)) { - this->check_grammar (grammar TAO_ENV_ARG_PARAMETER); + this->check_grammar (grammar ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); DsLogAdmin::RecordList* rec_list = this->query_i (constraint, iter_out, this->max_rec_list_len_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (rec_list); return rec_list; @@ -430,7 +430,7 @@ DsLogAdmin::RecordList* Log_i::retrieve (DsLogAdmin::TimeT from_time, CORBA::Long how_many, DsLogAdmin::Iterator_out iter_out - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Decide between forward vs backward retrieval. @@ -454,7 +454,7 @@ Log_i::retrieve (DsLogAdmin::TimeT from_time, this->query_i (constraint, iter_out, how_many - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (rec_list); return rec_list; @@ -463,13 +463,13 @@ Log_i::retrieve (DsLogAdmin::TimeT from_time, CORBA::ULong Log_i::match_i (const char *constraint, CORBA::Boolean delete_rec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidConstraint)) { // Use an Interpreter to build an expression tree. TAO_Log_Constraint_Interpreter interpreter (constraint - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Get the underlying storage. @@ -515,16 +515,16 @@ Log_i::match_i (const char *constraint, CORBA::ULong Log_i::match (const char* grammar, const char *constraint - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidGrammar, DsLogAdmin::InvalidConstraint)) { - this->check_grammar (grammar TAO_ENV_ARG_PARAMETER); + this->check_grammar (grammar ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::ULong count = - this->match_i (constraint, 0 TAO_ENV_ARG_PARAMETER); + this->match_i (constraint, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (count); return count; @@ -533,16 +533,16 @@ Log_i::match (const char* grammar, CORBA::ULong Log_i::delete_records (const char *grammar, const char *constraint - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidGrammar, DsLogAdmin::InvalidConstraint)) { - this->check_grammar (grammar TAO_ENV_ARG_PARAMETER); + this->check_grammar (grammar ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::ULong count = - this->match_i (constraint, 1 TAO_ENV_ARG_PARAMETER); + this->match_i (constraint, 1 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (count); return count; @@ -551,7 +551,7 @@ Log_i::delete_records (const char *grammar, CORBA::ULong Log_i::delete_records_by_id (const DsLogAdmin::RecordIdList &ids - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong numdone (0); @@ -569,7 +569,7 @@ Log_i::delete_records_by_id (const void Log_i::write_records (const DsLogAdmin::Anys &records - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::LogFull, DsLogAdmin::LogLocked)) @@ -583,13 +583,13 @@ Log_i::write_records (const DsLogAdmin::Anys &records reclist [i].info = records[i]; } - this->write_recordlist (reclist TAO_ENV_ARG_PARAMETER); + this->write_recordlist (reclist ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::LogFull, DsLogAdmin::LogLocked)) @@ -601,7 +601,7 @@ Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist // Check if the log is on duty // @@ Wait for Comittee ruling on the proper behavior DsLogAdmin::AvailabilityStatus avail_stat = - this->get_availability_status (TAO_ENV_SINGLE_ARG_PARAMETER); + this->get_availability_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (avail_stat.off_duty == 1) @@ -661,7 +661,7 @@ Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist void Log_i::set_record_attribute (DsLogAdmin::RecordId id, const DsLogAdmin::NVList &attr_list - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidRecordId, DsLogAdmin::InvalidAttribute)) @@ -686,7 +686,7 @@ CORBA::ULong Log_i::set_records_attribute (const char *grammar, const char *constraint, const DsLogAdmin::NVList - &attr_list TAO_ENV_ARG_DECL) + &attr_list ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidGrammar, DsLogAdmin::InvalidConstraint, @@ -701,7 +701,7 @@ Log_i::set_records_attribute (const char *grammar, DsLogAdmin::NVList* Log_i::get_record_attribute (DsLogAdmin::RecordId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidRecordId)) { @@ -724,7 +724,7 @@ Log_i::get_record_attribute (DsLogAdmin::RecordId id // @@ These two methods are non-trivial. Let's hold off on them for a while DsLogAdmin::Log_ptr Log_i::copy (DsLogAdmin::LogId_out id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_UNUSED_ARG (id); @@ -733,7 +733,7 @@ Log_i::copy (DsLogAdmin::LogId_out id DsLogAdmin::Log_ptr Log_i::copy_with_id (DsLogAdmin::LogId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::LogIdAlreadyExists)) { @@ -743,7 +743,7 @@ Log_i::copy_with_id (DsLogAdmin::LogId id // @@ Should I just raise the exception? void -Log_i::flush (TAO_ENV_SINGLE_ARG_DECL) +Log_i::flush (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::UnsupportedQoS)) { @@ -769,7 +769,7 @@ Log_i::scheduled (void) void Log_i::check_grammar (const char* grammar - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidGrammar)) { diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.h b/TAO/orbsvcs/orbsvcs/Log/Log_i.h index 79c5a90aae1..8bc620fc876 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.h @@ -55,130 +55,130 @@ public: ~Log_i (); // Destructor. - void init (TAO_ENV_SINGLE_ARG_DECL); + void init (ACE_ENV_SINGLE_ARG_DECL); // Initlialize the Log. // = DsLogAdmin::Log methods - DsLogAdmin::LogMgr_ptr my_factory (TAO_ENV_SINGLE_ARG_DECL) + DsLogAdmin::LogMgr_ptr my_factory (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the factory of the log - DsLogAdmin::LogId id (TAO_ENV_SINGLE_ARG_DECL) + DsLogAdmin::LogId id (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the id of the log DsLogAdmin::QoSList* - get_qos (TAO_ENV_SINGLE_ARG_DECL) + get_qos (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the list of the QoS properties supported by the log void set_qos (const DsLogAdmin::QoSList & qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::UnsupportedQoS)); // Set the list of the QoS properties supported by the log. CORBA::ULong - get_max_record_life (TAO_ENV_SINGLE_ARG_DECL) + get_max_record_life (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the record life in seconds (0 infinite) void set_max_record_life (CORBA::ULong life - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Set the record life in seconds (0 infinite) CORBA::ULongLong - get_max_size (TAO_ENV_SINGLE_ARG_DECL) + get_max_size (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the maximum size in octets void set_max_size (CORBA::ULongLong size - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidParam)); // Set the maximum size in octets. CORBA::ULongLong - get_current_size (TAO_ENV_SINGLE_ARG_DECL) + get_current_size (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the current size of the log in octets. CORBA::ULongLong - get_n_records (TAO_ENV_SINGLE_ARG_DECL) + get_n_records (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the number of records in the log DsLogAdmin::LogFullAction - get_log_full_action (TAO_ENV_SINGLE_ARG_DECL) + get_log_full_action (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the action to be taken when the log reaches its maximum size void set_log_full_action (DsLogAdmin::LogFullAction action - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Set the action to be taken when the log reaches its maximum size DsLogAdmin::AdministrativeState - get_administrative_state (TAO_ENV_SINGLE_ARG_DECL) + get_administrative_state (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the administrative state of the log. void set_administrative_state (DsLogAdmin::AdministrativeState state - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Set the administrative state of the log. virtual DsLogAdmin::ForwardingState - get_forwarding_state (TAO_ENV_SINGLE_ARG_DECL) + get_forwarding_state (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the forwarding state of the log. // @@ Note: is it ok to make this method virtual? void set_forwarding_state (DsLogAdmin::ForwardingState state - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Set the forwarding state of the log. // @@ Note: is it ok to make this method virtual? DsLogAdmin::OperationalState - get_operational_state (TAO_ENV_SINGLE_ARG_DECL) + get_operational_state (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the operational state of the log. DsLogAdmin::TimeInterval - get_interval (TAO_ENV_SINGLE_ARG_DECL) + get_interval (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the log duration void set_interval (const DsLogAdmin::TimeInterval & interval - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidTime, DsLogAdmin::InvalidTimeInterval)); // Set the log duration. DsLogAdmin::AvailabilityStatus - get_availability_status (TAO_ENV_SINGLE_ARG_DECL) + get_availability_status (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the availability status DsLogAdmin::CapacityAlarmThresholdList* - get_capacity_alarm_thresholds (TAO_ENV_SINGLE_ARG_DECL) + get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the capacity alarm threshold void set_capacity_alarm_thresholds (const DsLogAdmin::CapacityAlarmThresholdList & threshs - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidThreshold)); // Set the capacity alarm threshold. Threshold values represent @@ -189,13 +189,13 @@ public: // 0). DsLogAdmin::WeekMask* - get_week_mask (TAO_ENV_SINGLE_ARG_DECL) + get_week_mask (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the weekly scheduling parameters void set_week_mask (const DsLogAdmin::WeekMask & masks - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidTime, DsLogAdmin::InvalidTimeInterval, @@ -206,7 +206,7 @@ public: query (const char * grammar, const char * c, DsLogAdmin::Iterator_out i - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidGrammar, DsLogAdmin::InvalidConstraint)); @@ -217,7 +217,7 @@ public: retrieve (DsLogAdmin::TimeT from_time, CORBA::Long how_many, DsLogAdmin::Iterator_out i - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Retrieve records from time using iterator // . @@ -225,7 +225,7 @@ public: CORBA::ULong match (const char * grammar, const char * c - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidGrammar, DsLogAdmin::InvalidConstraint)); @@ -234,7 +234,7 @@ public: CORBA::ULong delete_records (const char * grammar, const char * c - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidGrammar, DsLogAdmin::InvalidConstraint)); @@ -242,14 +242,14 @@ public: CORBA::ULong delete_records_by_id (const DsLogAdmin::RecordIdList & ids - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Delete records matching ids in void write_records (const DsLogAdmin::Anys & records - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::LogFull, DsLogAdmin::LogLocked)); @@ -257,7 +257,7 @@ public: void write_recordlist (const DsLogAdmin::RecordList & list - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::LogFull, DsLogAdmin::LogLocked)); @@ -267,7 +267,7 @@ public: void set_record_attribute (DsLogAdmin::RecordId id, const DsLogAdmin::NVList & attr_list - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidRecordId, DsLogAdmin::InvalidAttribute)); @@ -277,7 +277,7 @@ public: set_records_attribute (const char * grammar, const char * c, const DsLogAdmin::NVList & attr_list - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidGrammar, DsLogAdmin::InvalidConstraint, @@ -287,7 +287,7 @@ public: DsLogAdmin::NVList* get_record_attribute (DsLogAdmin::RecordId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidRecordId)); // Get the attributes of the record with id . Raises @@ -295,21 +295,21 @@ public: DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId_out id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Copy the log on which the operation was invoked. DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::LogIdAlreadyExists)); // Copy the log on which the operation was invoked and assign it the // given id. void - flush (TAO_ENV_SINGLE_ARG_DECL) + flush (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::UnsupportedQoS)); // Causes all pending events to be written to storage. Raises @@ -321,17 +321,17 @@ protected: DsLogAdmin::RecordList* query_i (const char *constraint, DsLogAdmin::Iterator_out &iter_out, CORBA::ULong how_many - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidConstraint)); CORBA::ULong match_i (const char *constraint, CORBA::Boolean delete_rec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidConstraint)); - void check_grammar (const char* grammar TAO_ENV_ARG_DECL) + void check_grammar (const char* grammar ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidGrammar)); // Throws DsLogAdmin::InvalidGrammar if we don't support this grammar. diff --git a/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.cpp b/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.cpp index 06d74819fb2..c3e9ae40930 100644 --- a/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.cpp +++ b/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.cpp @@ -36,7 +36,7 @@ TAO_LB_Minimum_Dispersion_Strategy::~TAO_LB_Minimum_Dispersion_Strategy (void) } CORBA::Object_ptr -TAO_LB_Minimum_Dispersion_Strategy::replica (TAO_ENV_SINGLE_ARG_DECL) +TAO_LB_Minimum_Dispersion_Strategy::replica (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { for ( ; ; ) @@ -84,7 +84,7 @@ TAO_LB_Minimum_Dispersion_Strategy::replica (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { CORBA::Boolean non_existent = - object->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + object->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (!non_existent) { @@ -130,7 +130,7 @@ TAO_LB_Minimum_Dispersion_Strategy::remove (TAO_LB_ReplicaProxy *proxy) void TAO_LB_Minimum_Dispersion_Strategy::load_changed (TAO_LB_ReplicaProxy *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { int send_load_advisory = 0; @@ -185,7 +185,7 @@ TAO_LB_Minimum_Dispersion_Strategy::load_changed (TAO_LB_ReplicaProxy *proxy // dispersion we tolerate before starting to send advisories. if (send_load_advisory == 2) { - proxy->control_->high_load_advisory (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->control_->high_load_advisory (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; return; // We may not throw an exception, so explicitly return. @@ -199,7 +199,7 @@ TAO_LB_Minimum_Dispersion_Strategy::load_changed (TAO_LB_ReplicaProxy *proxy // construction time... if (send_load_advisory == 1) { - proxy->control_->nominal_load_advisory (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->control_->nominal_load_advisory (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.h b/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.h index df4e679543c..938b7ba0ecc 100644 --- a/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.h +++ b/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.h @@ -56,12 +56,12 @@ public: // Destructor // = The TAO_LB_LoadBalancing_Strategy methods - virtual CORBA::Object_ptr replica (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::Object_ptr replica (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual int insert (TAO_LB_ReplicaProxy *); virtual int remove (TAO_LB_ReplicaProxy *); virtual void load_changed (TAO_LB_ReplicaProxy * - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: TAO_LB_ReplicaProxySet proxies_; diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp index 1349a07e442..48c9d4c5713 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp @@ -31,19 +31,19 @@ TAO_Bindings_Iterator::~TAO_Bindings_Iterator (void) // Since we are going away, decrement the reference count on the // Naming Context we were iterating over. - context_->interface ()->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + context_->interface ()->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); } // Return the Default POA of this Servant template PortableServer::POA_ptr -TAO_Bindings_Iterator::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*env*/) +TAO_Bindings_Iterator::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*env*/) { return PortableServer::POA::_duplicate (this->poa_.in ()); } template CORBA::Boolean TAO_Bindings_Iterator::next_one (CosNaming::Binding_out b - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CosNaming::Binding *binding; @@ -71,7 +71,7 @@ TAO_Bindings_Iterator::next_one (CosNaming::Binding_out b // self-destruct. if (context_->destroyed ()) { - destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0); @@ -101,7 +101,7 @@ TAO_Bindings_Iterator::next_one (CosNaming::Binding_out b template CORBA::Boolean TAO_Bindings_Iterator::next_n (CORBA::ULong how_many, CosNaming::BindingList_out bl - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // We perform an allocation before obtaining the lock so that an out @@ -125,7 +125,7 @@ TAO_Bindings_Iterator::next_n (CORBA::ULong how_many, // self-destruct. if (context_->destroyed ()) { - destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0); @@ -167,7 +167,7 @@ TAO_Bindings_Iterator::next_n (CORBA::ULong how_many, } template void -TAO_Bindings_Iterator::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_Bindings_Iterator::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, @@ -185,11 +185,11 @@ TAO_Bindings_Iterator::destroy (TAO_ENV_SINGLE_ARG_DECL) PortableServer::ObjectId_var id = poa_->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; poa_->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h index 8881a030306..887fc9c034d 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h @@ -63,26 +63,26 @@ public: ~TAO_Bindings_Iterator (void); // Destructor. - virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); // Returns the Default POA of this Servant object // = Idl methods. CORBA::Boolean next_one (CosNaming::Binding_out b - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This operation passes back the next unseen binding. True is // returned if a binding is passed back, and false is returned otherwise. CORBA::Boolean next_n (CORBA::ULong how_many, CosNaming::BindingList_out bl - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This operation passes back at most unseen bindings. // True is returned if bindings were passed back, and false is // returned if no bindings were passed back. - void destroy (TAO_ENV_SINGLE_ARG_DECL) + void destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This operation destroys the iterator. diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp index 98a689c88f7..9294d35a9ad 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp @@ -50,7 +50,7 @@ TAO_Hash_Naming_Context::_default_POA (void) CosNaming::NamingContext_ptr TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Naming context we will return. CosNaming::NamingContext_var result = @@ -69,12 +69,12 @@ TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name { // Resolve the name. CORBA::Object_var context = resolve (comp_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Try narrowing object reference to the NamingContext type. result = CosNaming::NamingContext::_narrow (context.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CosNaming::NamingContext::NotFound, ex) @@ -109,7 +109,7 @@ TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name void TAO_Hash_Naming_Context::bind (const CosNaming::Name& n, CORBA::Object_ptr obj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, @@ -134,13 +134,13 @@ TAO_Hash_Naming_Context::bind (const CosNaming::Name& n, if (name_len > 1) { CosNaming::NamingContext_var context = - this->get_context (n TAO_ENV_ARG_PARAMETER); + this->get_context (n ACE_ENV_ARG_PARAMETER); ACE_CHECK; CosNaming::Name simple_name; simple_name.length (1); simple_name[0] = n[name_len - 1]; - context->bind (simple_name, obj TAO_ENV_ARG_PARAMETER); + context->bind (simple_name, obj ACE_ENV_ARG_PARAMETER); ACE_CHECK; } // If we received a simple name, we need to bind it in this context. @@ -163,7 +163,7 @@ TAO_Hash_Naming_Context::bind (const CosNaming::Name& n, void TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n, CORBA::Object_ptr obj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, @@ -188,13 +188,13 @@ TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n, if (name_len > 1) { CosNaming::NamingContext_var context = - get_context (n TAO_ENV_ARG_PARAMETER); + get_context (n ACE_ENV_ARG_PARAMETER); ACE_CHECK; CosNaming::Name simple_name; simple_name.length (1); simple_name[0] = n[name_len - 1]; - context->rebind (simple_name, obj TAO_ENV_ARG_PARAMETER); + context->rebind (simple_name, obj ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else @@ -219,7 +219,7 @@ TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n, void TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n, CosNaming::NamingContext_ptr nc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, @@ -248,13 +248,13 @@ TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n, if (name_len > 1) { CosNaming::NamingContext_var context = - get_context (n TAO_ENV_ARG_PARAMETER); + get_context (n ACE_ENV_ARG_PARAMETER); ACE_CHECK; CosNaming::Name simple_name; simple_name.length (1); simple_name[0] = n[name_len - 1]; - context->bind_context (simple_name, nc TAO_ENV_ARG_PARAMETER); + context->bind_context (simple_name, nc ACE_ENV_ARG_PARAMETER); ACE_CHECK; } // If we received a simple name, we need to bind it in this context. @@ -277,7 +277,7 @@ TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n, void TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n, CosNaming::NamingContext_ptr nc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, @@ -302,13 +302,13 @@ TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n, if (name_len > 1) { CosNaming::NamingContext_var context = - get_context (n TAO_ENV_ARG_PARAMETER); + get_context (n ACE_ENV_ARG_PARAMETER); ACE_CHECK; CosNaming::Name simple_name; simple_name.length (1); simple_name[0] = n[name_len - 1]; - context->rebind_context (simple_name, nc TAO_ENV_ARG_PARAMETER); + context->rebind_context (simple_name, nc ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else @@ -332,7 +332,7 @@ TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n, CORBA::Object_ptr TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -382,7 +382,7 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n { // Narrow to NamingContext. context = CosNaming::NamingContext::_narrow (result.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (result._retn ()); } else @@ -416,7 +416,7 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n // If there are any exceptions, they will propagate up. return context->resolve (rest_of_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } } // If the name we had to resolve was simple, we just need to return @@ -426,7 +426,7 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n void TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, @@ -451,13 +451,13 @@ TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n if (name_len > 1) { CosNaming::NamingContext_var context = - get_context (n TAO_ENV_ARG_PARAMETER); + get_context (n ACE_ENV_ARG_PARAMETER); ACE_CHECK; CosNaming::Name simple_name; simple_name.length (1); simple_name[0] = n[name_len - 1]; - context->unbind (simple_name TAO_ENV_ARG_PARAMETER); + context->unbind (simple_name ACE_ENV_ARG_PARAMETER); ACE_CHECK; } // If we received a simple name, we need to unbind it in this @@ -472,7 +472,7 @@ TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n CosNaming::NamingContext_ptr TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, @@ -491,7 +491,7 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n CosNaming::NamingContext::_nil (); // Create new context. - result = new_context (TAO_ENV_SINGLE_ARG_PARAMETER); + result = new_context (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ()); // Bind the new context to the name. @@ -499,7 +499,7 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n { bind_context (n, result.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -508,10 +508,10 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n // created context, should any exceptions be raised by the // destroy() operation we want to ignore them. { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY_EX(DESTROY) { - result->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + result->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX(DESTROY); } ACE_CATCHANY {} ACE_ENDTRY; @@ -526,7 +526,7 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n } void -TAO_Hash_Naming_Context::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_Hash_Naming_Context::destroy (ACE_ENV_SINGLE_ARG_DECL) { ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, @@ -563,7 +563,7 @@ TAO_Hash_Naming_Context::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_CHECK; poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h index c98b13d2b1a..448fff05a99 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h @@ -123,7 +123,7 @@ public: virtual void bind (const CosNaming::Name &n, CORBA::Object_ptr obj - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Create a binding for name and object in the naming // context. Compound names are treated as follows: ctx->bind (, obj) = (ctx->resolve ())->bind (, @@ -134,7 +134,7 @@ public: virtual void rebind (const CosNaming::Name &n, CORBA::Object_ptr obj - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // This is similar to operation above, except for when the // binding for the specified name already exists in the specified // context. In that case, the existing binding is replaced with the @@ -142,20 +142,20 @@ public: virtual void bind_context (const CosNaming::Name &n, CosNaming::NamingContext_ptr nc - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // This is the version of specifically for binding naming // contexts, so that they will participate in name resolution when // compound names are passed to be resolved. virtual void rebind_context (const CosNaming::Name &n, CosNaming::NamingContext_ptr nc - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // This is a version of specifically for naming contexts, // so that they can participate in name resolution when compound // names are passed. virtual CORBA::Object_ptr resolve (const CosNaming::Name &n - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Return object reference that is bound to the name. Compound name // resolve is defined as follows: ctx->resolve () = // ctx->resolve ()->resolve () The naming service @@ -163,19 +163,19 @@ public: // for "narrowing" the object to the appropriate type. virtual void unbind (const CosNaming::Name &n - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Remove the name binding from the context. When compound names // are used, unbind is defined as follows: ctx->unbind () = (ctx->resolve ())->unbind () virtual CosNaming::NamingContext_ptr bind_new_context (const CosNaming::Name &n - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // This operation creates a new context and binds it to the name // supplied as an argument. The newly-created context is // implemented by the same server as the context in which it was // bound (the name argument excluding the last component). - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL); + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL); // Delete the naming context. The user should take care to any // bindings in which the given context is bound to some names, to // avoid dangling references when invoking operation. @@ -190,7 +190,7 @@ protected: // = Helper method used by other methods. CosNaming::NamingContext_ptr get_context (const CosNaming::Name &name - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // is used by methods that need to resolve a compound // name before performing the actual operation (e.g., bind, unbind, // etc.) takes a full name (including the last diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp index ef214adf61c..7b83b34e9b3 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp @@ -26,7 +26,7 @@ TAO_Naming_Context::~TAO_Naming_Context (void) } PortableServer::POA_ptr -TAO_Naming_Context::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*env*/) +TAO_Naming_Context::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*env*/) { return impl_->_default_POA (); } @@ -34,110 +34,110 @@ TAO_Naming_Context::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*env*/) void TAO_Naming_Context::bind (const CosNaming::Name &n, CORBA::Object_ptr obj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, CosNaming::NamingContext::InvalidName, CosNaming::NamingContext::AlreadyBound)) { - impl_->bind (n, obj TAO_ENV_ARG_PARAMETER); + impl_->bind (n, obj ACE_ENV_ARG_PARAMETER); } void TAO_Naming_Context::rebind (const CosNaming::Name &n, CORBA::Object_ptr obj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, CosNaming::NamingContext::InvalidName)) { - impl_->rebind (n, obj TAO_ENV_ARG_PARAMETER); + impl_->rebind (n, obj ACE_ENV_ARG_PARAMETER); } void TAO_Naming_Context::bind_context (const CosNaming::Name &n, CosNaming::NamingContext_ptr nc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, CosNaming::NamingContext::InvalidName, CosNaming::NamingContext::AlreadyBound)) { - impl_->bind_context (n, nc TAO_ENV_ARG_PARAMETER); + impl_->bind_context (n, nc ACE_ENV_ARG_PARAMETER); } void TAO_Naming_Context::rebind_context (const CosNaming::Name &n, CosNaming::NamingContext_ptr nc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, CosNaming::NamingContext::InvalidName)) { - impl_->rebind_context (n, nc TAO_ENV_ARG_PARAMETER); + impl_->rebind_context (n, nc ACE_ENV_ARG_PARAMETER); } CORBA::Object_ptr TAO_Naming_Context::resolve (const CosNaming::Name &n - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, CosNaming::NamingContext::InvalidName)) { - return impl_->resolve (n TAO_ENV_ARG_PARAMETER); + return impl_->resolve (n ACE_ENV_ARG_PARAMETER); } void TAO_Naming_Context::unbind (const CosNaming::Name &n - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, CosNaming::NamingContext::InvalidName)) { - impl_->unbind (n TAO_ENV_ARG_PARAMETER); + impl_->unbind (n ACE_ENV_ARG_PARAMETER); } CosNaming::NamingContext_ptr -TAO_Naming_Context::new_context (TAO_ENV_SINGLE_ARG_DECL) +TAO_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return impl_->new_context (TAO_ENV_SINGLE_ARG_PARAMETER); + return impl_->new_context (ACE_ENV_SINGLE_ARG_PARAMETER); } CosNaming::NamingContext_ptr TAO_Naming_Context::bind_new_context (const CosNaming::Name &n - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::AlreadyBound, CosNaming::NamingContext::CannotProceed, CosNaming::NamingContext::InvalidName)) { - return impl_->bind_new_context (n TAO_ENV_ARG_PARAMETER); + return impl_->bind_new_context (n ACE_ENV_ARG_PARAMETER); } void -TAO_Naming_Context::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_Naming_Context::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotEmpty)) { - impl_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + impl_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); } void TAO_Naming_Context::list (CORBA::ULong how_many, CosNaming::BindingList_out bl, CosNaming::BindingIterator_out bi - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - impl_->list (how_many, bl, bi TAO_ENV_ARG_PARAMETER); + impl_->list (how_many, bl, bi ACE_ENV_ARG_PARAMETER); } void @@ -173,7 +173,7 @@ to_string_helper_assign (char * &k, const char * &src) char * TAO_Naming_Context::to_string (const CosNaming::Name &n - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::InvalidName)) { @@ -289,7 +289,7 @@ to_name_helper (char *dest, const char*& src) CosNaming::Name * TAO_Naming_Context::to_name (const char *sn - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::InvalidName)) { @@ -408,7 +408,7 @@ size_t TAO_Naming_Context::to_url_validate_and_compute_size ( const char *addr, const char *sn - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { size_t addr_len = ACE_OS_String::strlen (addr); @@ -439,7 +439,7 @@ TAO_Naming_Context::to_url_validate_and_compute_size ( char * TAO_Naming_Context::to_url (const char * addr, const char * sn - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContextExt::InvalidAddress, CosNaming::NamingContext::InvalidName)) @@ -447,7 +447,7 @@ TAO_Naming_Context::to_url (const char * addr, /// Compute how many characters will be required for the URL CORBA::ULong no_char = TAO_Naming_Context::to_url_validate_and_compute_size (addr, sn - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -510,7 +510,7 @@ TAO_Naming_Context::to_url (const char * addr, CORBA::Object_ptr TAO_Naming_Context::resolve_str (const char * n - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, @@ -521,11 +521,11 @@ TAO_Naming_Context::resolve_str (const char * n // argument instead of a Name. // Get the unstrigified name. - CosNaming::Name_var name = this->to_name (n TAO_ENV_ARG_PARAMETER); + CosNaming::Name_var name = this->to_name (n ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); // Pass this unstringified name to resolve and return an Object_ptr - return this->resolve (name.in () TAO_ENV_ARG_PARAMETER); + return this->resolve (name.in () ACE_ENV_ARG_PARAMETER); } TAO_Naming_Context_Impl::~TAO_Naming_Context_Impl (void) diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h index 7168ed8deb4..e7ffff27984 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h @@ -55,7 +55,7 @@ public: virtual void bind (const CosNaming::Name &n, CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, @@ -72,7 +72,7 @@ public: virtual void rebind (const CosNaming::Name &n, CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, @@ -85,7 +85,7 @@ public: virtual void bind_context (const CosNaming::Name &n, CosNaming::NamingContext_ptr nc - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, @@ -98,7 +98,7 @@ public: virtual void rebind_context (const CosNaming::Name &n, CosNaming::NamingContext_ptr nc - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, @@ -108,7 +108,7 @@ public: // names are passed. virtual CORBA::Object_ptr resolve (const CosNaming::Name &n - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, @@ -120,7 +120,7 @@ public: // for "narrowing" the object to the appropriate type. virtual void unbind (const CosNaming::Name &n - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, @@ -131,7 +131,7 @@ public: // cn>) = (ctx->resolve ())->unbind () virtual CosNaming::NamingContext_ptr new_context ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // This operation returns a new naming context implemented by the @@ -140,7 +140,7 @@ public: virtual CosNaming::NamingContext_ptr bind_new_context ( const CosNaming::Name &n - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::AlreadyBound, @@ -153,7 +153,7 @@ public: // bound (the name argument excluding the last component). - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotEmpty)); // Delete the naming context. The user should take care to any @@ -166,7 +166,7 @@ public: virtual void list (CORBA::ULong how_many, CosNaming::BindingList_out bl, CosNaming::BindingIterator_out bi - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns at most the requested number of bindings in @@ -175,7 +175,7 @@ public: // not contain any additional bindings returned as null. virtual char * to_string (const CosNaming::Name &n - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::InvalidName)); // Stringify the name using '\' as the escape character. The @@ -184,7 +184,7 @@ public: // an InvalidName exception is to be raised. virtual CosNaming::Name * to_name (const char *sn - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::InvalidName)); // The in parameter is an stringified name. This function removes the @@ -193,7 +193,7 @@ public: virtual char * to_url ( const char * addr, const char * sn - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -206,7 +206,7 @@ public: // iiopname://1.1@myhost.555xyz.com:9999/a/b/c virtual CORBA::Object_ptr resolve_str (const char * n - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -220,7 +220,7 @@ public: // It accepts a strigified name as an argument instead of a Name. - virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Returns the Default POA of this Servant object private: @@ -252,7 +252,7 @@ private: static size_t to_url_validate_and_compute_size (const char *add, const char *sn - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Validate the to_url() method input, and compute the size of the // returned URL address. @@ -281,7 +281,7 @@ public: virtual void bind (const CosNaming::Name &n, CORBA::Object_ptr obj - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; // Create a binding for name and object in the naming // context. Compound names are treated as follows: ctx->bind (, obj) = (ctx->resolve ())->bind (, @@ -292,7 +292,7 @@ public: virtual void rebind (const CosNaming::Name &n, CORBA::Object_ptr obj - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; // This is similar to operation above, except for when the // binding for the specified name already exists in the specified // context. In that case, the existing binding is replaced with the @@ -300,20 +300,20 @@ public: virtual void bind_context (const CosNaming::Name &n, CosNaming::NamingContext_ptr nc - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; // This is the version of specifically for binding naming // contexts, so that they will participate in name resolution when // compound names are passed to be resolved. virtual void rebind_context (const CosNaming::Name &n, CosNaming::NamingContext_ptr nc - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; // This is a version of specifically for naming contexts, // so that they can participate in name resolution when compound // names are passed. virtual CORBA::Object_ptr resolve (const CosNaming::Name &n - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; // Return object reference that is bound to the name. Compound name // resolve is defined as follows: ctx->resolve () = // ctx->resolve ()->resolve () The naming service @@ -321,24 +321,24 @@ public: // for "narrowing" the object to the appropriate type. virtual void unbind (const CosNaming::Name &n - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; // Remove the name binding from the context. When compound names // are used, unbind is defined as follows: ctx->unbind () = (ctx->resolve ())->unbind () - virtual CosNaming::NamingContext_ptr new_context (TAO_ENV_SINGLE_ARG_DECL) = 0; + virtual CosNaming::NamingContext_ptr new_context (ACE_ENV_SINGLE_ARG_DECL) = 0; // This operation returns a new naming context implemented by the // same naming server in which the operation was invoked. The // context is not bound. virtual CosNaming::NamingContext_ptr bind_new_context (const CosNaming::Name &n - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; // This operation creates a new context and binds it to the name // supplied as an argument. The newly-created context is // implemented by the same server as the context in which it was // bound (the name argument excluding the last component). - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL) = 0; + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) = 0; // Delete the naming context. The user should take care to any // bindings in which the given context is bound to some names, to // avoid dangling references when invoking operation. @@ -349,7 +349,7 @@ public: virtual void list (CORBA::ULong how_many, CosNaming::BindingList_out &bl, CosNaming::BindingIterator_out &bi - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; // Returns at most the requested number of bindings in // . If the naming context contains additional bindings, they // are returned with a BindingIterator. In the naming context does diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp index 1e12d7b1383..9f39cd79c65 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp @@ -31,17 +31,17 @@ TAO_Naming_Loader::~TAO_Naming_Loader (void) int TAO_Naming_Loader::init (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // This function call initializes the Naming Service CORBA::Object_var object = - this->create_object (orb.in (), argc, argv TAO_ENV_ARG_PARAMETER); + this->create_object (orb.in (), argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -63,7 +63,7 @@ TAO_Naming_Loader::fini (void) CORBA::Object_ptr TAO_Naming_Loader::create_object (CORBA::ORB_ptr orb, int argc, char *argv[] - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { int result; diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h index 61e0066a192..1f1730bf81e 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h @@ -46,7 +46,7 @@ public: // ORB and the command line parameters. CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp index 63ad2be955f..f3c19c757ee 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp @@ -77,14 +77,14 @@ TAO_Naming_Server::init (CORBA::ORB_ptr orb, { if (resolve_for_existing_naming_service) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Try to find an existing Naming Service. CORBA::Object_var naming_obj = orb->resolve_initial_references ("NameService", timeout - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!CORBA::is_nil (naming_obj.in ())) @@ -98,12 +98,12 @@ TAO_Naming_Server::init (CORBA::ORB_ptr orb, this->naming_context_ = CosNaming::NamingContext::_narrow (naming_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->naming_service_ior_ = orb->object_to_string (naming_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; @@ -202,7 +202,7 @@ TAO_Naming_Server::init_with_orb (int argc, { int result; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Duplicate the ORB @@ -210,7 +210,7 @@ TAO_Naming_Server::init_with_orb (int argc, // Get the POA from the ORB. CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -222,15 +222,15 @@ TAO_Naming_Server::init_with_orb (int argc, // Get the POA object. this->root_poa_ = PortableServer::POA::_narrow (poa_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_Manager. PortableServer::POAManager_var poa_manager = - this->root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyList policies (2); @@ -239,13 +239,13 @@ TAO_Naming_Server::init_with_orb (int argc, // Id Assignment policy policies[0] = this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Lifespan policy policies[1] = this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // We use a different POA, otherwise the user would have to change @@ -253,7 +253,7 @@ TAO_Naming_Server::init_with_orb (int argc, this->ns_poa_ = this->root_poa_->create_POA ("NameService", poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // Warning! If create_POA fails, then the policies won't be // destroyed and there will be hell to pay in memory leaks! ACE_TRY_CHECK; @@ -264,7 +264,7 @@ TAO_Naming_Server::init_with_orb (int argc, ++i) { CORBA::Policy_ptr policy = policies[i]; - policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -328,7 +328,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, size_t context_size, int enable_multicast) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { if (persistence_location != 0) @@ -364,7 +364,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, TAO_Transient_Naming_Context::make_new_context (poa, TAO_ROOT_NAMING_CONTEXT, context_size - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -372,15 +372,15 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, // Set the ior of the root Naming Context. this->naming_service_ior_= orb->object_to_string (this->naming_context_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var table_object = - orb->resolve_initial_references ("IORTable" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; IORTable::Table_var adapter = - IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER); + IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (adapter.in ())) { @@ -390,9 +390,9 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, { CORBA::String_var ior = orb->object_to_string (this->naming_context_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - adapter->bind ("NameService", ior.in () TAO_ENV_ARG_PARAMETER); + adapter->bind ("NameService", ior.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -492,17 +492,17 @@ TAO_Naming_Server::fini (void) // the Naming Service ACE_TRY_NEW_ENV { - this->ns_poa_->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + this->ns_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var table_object = this->orb_->resolve_initial_references ("IORTable" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; IORTable::Table_var adapter = - IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER); + IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (adapter.in ())) { @@ -510,7 +510,7 @@ TAO_Naming_Server::fini (void) } else { - adapter->unbind ("NameService" TAO_ENV_ARG_PARAMETER); + adapter->unbind ("NameService" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -564,11 +564,11 @@ int TAO_Naming_Client::init (CORBA::ORB_ptr orb, ACE_Time_Value *timeout) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::Object_var naming_obj = - orb->resolve_initial_references ("NameService", timeout TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("NameService", timeout ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (naming_obj.in ())) @@ -577,7 +577,7 @@ TAO_Naming_Client::init (CORBA::ORB_ptr orb, -1); this->naming_context_ = CosNaming::NamingContext::_narrow (naming_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp index 1fe01ea657a..4f14bdb4697 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp @@ -173,14 +173,14 @@ TAO_Persistent_Context_Index::init (size_t context_size) // CASE 1:there are no Naming Contexts registered. We need to create // one. { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; this->root_context_ = TAO_Persistent_Naming_Context::make_new_context (poa_.in (), TAO_ROOT_NAMING_CONTEXT, context_size, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } @@ -246,16 +246,16 @@ TAO_Persistent_Context_Index::recreate_all (void) PortableServer::ServantBase_var s = context; // Register with the POA. - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; PortableServer::ObjectId_var id = PortableServer::string_to_ObjectId (entry->ext_id_.poa_id_); this->poa_->activate_object_with_id (id.in (), context - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - CosNaming::NamingContext_var result = context->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + CosNaming::NamingContext_var result = context->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // If this is the root Naming Context, take a note of it. diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp index 43567878765..ce6379ec9b3 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp @@ -70,8 +70,8 @@ TAO_Persistent_Bindings_Map::find (const char *id, return -1; else { - TAO_ENV_DECLARE_NEW_ENV; - obj = orb_->string_to_object (entry.ref_ TAO_ENV_ARG_PARAMETER); + ACE_DECLARE_NEW_CORBA_ENV; + obj = orb_->string_to_object (entry.ref_ ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); type = entry.type_; @@ -163,8 +163,8 @@ TAO_Persistent_Bindings_Map::shared_bind (const char * id, int rebind) { // Obtain a stringified ior of (i.e., the representation we can store). - TAO_ENV_DECLARE_NEW_ENV; - CORBA::String_var ref = orb_->object_to_string (obj TAO_ENV_ARG_PARAMETER); + ACE_DECLARE_NEW_CORBA_ENV; + CORBA::String_var ref = orb_->object_to_string (obj ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Calculate and allocate the memory we need to store this name to @@ -323,7 +323,7 @@ TAO_Persistent_Naming_Context::make_new_context (PortableServer::POA_ptr poa, const char *poa_id, size_t context_size, TAO_Persistent_Context_Index * ind - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Store the stub we will return here. CosNaming::NamingContext_var result; @@ -377,10 +377,10 @@ TAO_Persistent_Naming_Context::make_new_context (PortableServer::POA_ptr poa, poa->activate_object_with_id (id.in (), context - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (result._retn ()); - result = context->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + result = context->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ()); // Everything went smoothly, without errors - we don't need any cleanup. @@ -390,7 +390,7 @@ TAO_Persistent_Naming_Context::make_new_context (PortableServer::POA_ptr poa, } CosNaming::NamingContext_ptr -TAO_Persistent_Naming_Context::new_context (TAO_ENV_SINGLE_ARG_DECL) +TAO_Persistent_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL) { ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, @@ -416,7 +416,7 @@ TAO_Persistent_Naming_Context::new_context (TAO_ENV_SINGLE_ARG_DECL) poa_id, this->persistent_context_->total_size (), this->index_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ()); return result._retn (); @@ -426,7 +426,7 @@ void TAO_Persistent_Naming_Context::list (CORBA::ULong how_many, CosNaming::BindingList_out &bl, CosNaming::BindingIterator_out &bi - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Allocate nil out parameters in case we won't be able to complete // the operation. @@ -515,7 +515,7 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many, // Increment reference count on this Naming Context, so it doesn't get // deleted before the BindingIterator servant gets deleted. - interface_->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + interface_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Register with the POA. @@ -529,10 +529,10 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many, this->poa_->activate_object_with_id (id.in (), bind_iter - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - bi = bind_iter->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + bi = bind_iter->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h index 80be98ec6e5..970c52cad66 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h @@ -180,7 +180,7 @@ public: const char *poa_id, size_t context_size, TAO_Persistent_Context_Index *ind - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // This utility method factors out the code needed to create a new // Persistent Naming Context servant and activate it under the // specified POA with the specified id. This function is static so @@ -189,7 +189,7 @@ public: // = Methods not implemented in TAO_Hash_Naming_Context. - virtual CosNaming::NamingContext_ptr new_context (TAO_ENV_SINGLE_ARG_DECL); + virtual CosNaming::NamingContext_ptr new_context (ACE_ENV_SINGLE_ARG_DECL); // This operation returns a new naming context implemented by the // same naming server in which the operation was invoked. The // context is not bound. @@ -197,7 +197,7 @@ public: virtual void list (CORBA::ULong how_many, CosNaming::BindingList_out &bl, CosNaming::BindingIterator_out &bi - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Returns at most the requested number of bindings in // . If the naming context contains additional bindings, they // are returned with a BindingIterator. In the naming context does diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp index 14a4cf459a7..10c23a9165c 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp @@ -142,7 +142,7 @@ CosNaming::NamingContext_ptr TAO_Transient_Naming_Context::make_new_context (PortableServer::POA_ptr poa, const char *poa_id, size_t context_size - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Store the stub we will return here. CosNaming::NamingContext_var result; @@ -181,17 +181,17 @@ TAO_Transient_Naming_Context::make_new_context (PortableServer::POA_ptr poa, poa->activate_object_with_id (id.in (), context - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (result._retn ()); - result = context->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + result = context->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ()); return result._retn (); } CosNaming::NamingContext_ptr -TAO_Transient_Naming_Context::new_context (TAO_ENV_SINGLE_ARG_DECL) +TAO_Transient_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL) { ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, @@ -217,7 +217,7 @@ TAO_Transient_Naming_Context::new_context (TAO_ENV_SINGLE_ARG_DECL) make_new_context (this->poa_.in (), poa_id, this->transient_context_->total_size () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ()); return result._retn (); @@ -227,7 +227,7 @@ void TAO_Transient_Naming_Context::list (CORBA::ULong how_many, CosNaming::BindingList_out &bl, CosNaming::BindingIterator_out &bi - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Allocate nil out parameters in case we won't be able to complete // the operation. @@ -316,7 +316,7 @@ TAO_Transient_Naming_Context::list (CORBA::ULong how_many, // Increment reference count on this Naming Context, so it doesn't get // deleted before the BindingIterator servant gets deleted. - interface_->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + interface_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Register with the POA. @@ -330,10 +330,10 @@ TAO_Transient_Naming_Context::list (CORBA::ULong how_many, this->poa_->activate_object_with_id (id.in (), bind_iter - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - bi = bind_iter->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + bi = bind_iter->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h index 31912db4da8..3af69ee0ec8 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h @@ -140,7 +140,7 @@ public: static CosNaming::NamingContext_ptr make_new_context (PortableServer::POA_ptr poa, const char *poa_id, size_t context_size - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // This utility method factors out the code needed to create a new // Transient Naming Context servant and activate it under the // specified POA with the specified id. This function is static so @@ -149,7 +149,7 @@ public: // = Methods not implemented in TAO_Hash_Naming_Context. - virtual CosNaming::NamingContext_ptr new_context (TAO_ENV_SINGLE_ARG_DECL); + virtual CosNaming::NamingContext_ptr new_context (ACE_ENV_SINGLE_ARG_DECL); // This operation returns a new naming context implemented by the // same naming server in which the operation was invoked. The // context is not bound. @@ -157,7 +157,7 @@ public: virtual void list (CORBA::ULong how_many, CosNaming::BindingList_out &bl, CosNaming::BindingIterator_out &bi - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Returns at most the requested number of bindings in // . If the naming context contains additional bindings, they // are returned with a BindingIterator. In the naming context does diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.cpp index f9c8e8a468f..727cd0d066a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.cpp @@ -21,7 +21,7 @@ TAO_Notify_AdminProperties::~TAO_Notify_AdminProperties () } CosNotification::AdminProperties* -TAO_Notify_AdminProperties::get_admin (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_AdminProperties::get_admin (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -55,7 +55,7 @@ TAO_Notify_AdminProperties::get_admin (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_Notify_AdminProperties::set_admin (const CosNotification::AdminProperties & admin TAO_ENV_ARG_DECL) +TAO_Notify_AdminProperties::set_admin (const CosNotification::AdminProperties & admin ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotification::UnsupportedAdmin diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.h index cd6ae6339b3..eb6345201b1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.h @@ -46,7 +46,7 @@ public: virtual ~TAO_Notify_AdminProperties (); virtual CosNotification::AdminProperties * get_admin ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -54,7 +54,7 @@ public: virtual void set_admin ( const CosNotification::AdminProperties & admin - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.cpp index 36df545efc1..16db407d876 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.cpp @@ -27,7 +27,7 @@ TAO_Notify_Buffering_Strategy::~TAO_Notify_Buffering_Strategy () } void -TAO_Notify_Buffering_Strategy::execute (ACE_Message_Queue* msg_queue, TAO_Notify_Command *mb TAO_ENV_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/, ACE_Time_Value *tv) +TAO_Notify_Buffering_Strategy::execute (ACE_Message_Queue* msg_queue, TAO_Notify_Command *mb ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/, ACE_Time_Value *tv) { // use_max_queue_ may be set to 0. If max_events_per_consumer_ is // 0, then we are going to use the maximum queue length regardless. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.h index a5cfba96459..2ad9e86908d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.h @@ -47,7 +47,7 @@ public: virtual ~TAO_Notify_Buffering_Strategy (); - virtual void execute (ACE_Message_Queue* msg_queue, TAO_Notify_Command *mb TAO_ENV_ARG_DECL, ACE_Time_Value *tv); + virtual void execute (ACE_Message_Queue* msg_queue, TAO_Notify_Command *mb ACE_ENV_ARG_DECL, ACE_Time_Value *tv); // Execute this strategy. void max_queue_length (CORBA::Long max_queue_length); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Channel_Objects_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Channel_Objects_Factory.h index b8df19fd784..8aba476a6d2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Channel_Objects_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Channel_Objects_Factory.h @@ -59,55 +59,55 @@ class TAO_Notify_Export TAO_Notify_CO_Factory : public ACE_Service_Object // public: // = Creation methods - virtual TAO_Notify_EventChannel_i* create_event_channel (TAO_Notify_EventChannelFactory_i* parent TAO_ENV_ARG_DECL)=0; + virtual TAO_Notify_EventChannel_i* create_event_channel (TAO_Notify_EventChannelFactory_i* parent ACE_ENV_ARG_DECL)=0; // Create an Event Channel. - virtual TAO_Notify_ConsumerAdmin_i* create_consumer_admin (TAO_Notify_EventChannel_i* channel TAO_ENV_ARG_DECL)=0; + virtual TAO_Notify_ConsumerAdmin_i* create_consumer_admin (TAO_Notify_EventChannel_i* channel ACE_ENV_ARG_DECL)=0; // Create a Consumer Admin. - virtual TAO_Notify_SupplierAdmin_i* create_supplier_admin (TAO_Notify_EventChannel_i* channel TAO_ENV_ARG_DECL)=0; + virtual TAO_Notify_SupplierAdmin_i* create_supplier_admin (TAO_Notify_EventChannel_i* channel ACE_ENV_ARG_DECL)=0; // Create a Supplier Admin. - virtual TAO_Notify_FilterFactory_i* create_filter_factory (TAO_ENV_SINGLE_ARG_DECL)=0; + virtual TAO_Notify_FilterFactory_i* create_filter_factory (ACE_ENV_SINGLE_ARG_DECL)=0; // Create the Filter Factory. // = Proxy Creation methods. - virtual TAO_Notify_StructuredProxyPushSupplier_i* create_struct_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL)=0; + virtual TAO_Notify_StructuredProxyPushSupplier_i* create_struct_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent ACE_ENV_ARG_DECL)=0; // Create a Structured ProxyPushSupplier. - virtual TAO_Notify_SequenceProxyPushSupplier_i* create_seq_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL)=0; + virtual TAO_Notify_SequenceProxyPushSupplier_i* create_seq_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent ACE_ENV_ARG_DECL)=0; // Create a Sequence ProxyPushSupplier. - virtual TAO_Notify_ProxyPushSupplier_i* create_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL)=0; + virtual TAO_Notify_ProxyPushSupplier_i* create_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent ACE_ENV_ARG_DECL)=0; // Create a ProxyPushSupplier. - virtual TAO_Notify_StructuredProxyPushConsumer_i* create_struct_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL)=0; + virtual TAO_Notify_StructuredProxyPushConsumer_i* create_struct_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent ACE_ENV_ARG_DECL)=0; // Create a Structured ProxyPushConsumer. - virtual TAO_Notify_SequenceProxyPushConsumer_i* create_seq_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL)=0; + virtual TAO_Notify_SequenceProxyPushConsumer_i* create_seq_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent ACE_ENV_ARG_DECL)=0; // Create a Sequence ProxyPushConsumer. - virtual TAO_Notify_ProxyPushConsumer_i* create_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL)=0; + virtual TAO_Notify_ProxyPushConsumer_i* create_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent ACE_ENV_ARG_DECL)=0; // Create a ProxyPushConsumer. //= Locks // = Methods to create locks. - virtual ACE_Lock* create_channel_factory_lock (TAO_ENV_SINGLE_ARG_DECL)=0; + virtual ACE_Lock* create_channel_factory_lock (ACE_ENV_SINGLE_ARG_DECL)=0; // Create lock type used by channel factory. - virtual ACE_Lock* create_event_channel_lock (TAO_ENV_SINGLE_ARG_DECL)=0; + virtual ACE_Lock* create_event_channel_lock (ACE_ENV_SINGLE_ARG_DECL)=0; // Create lock type used by EC's. - virtual ACE_Lock* create_consumer_admin_lock (TAO_ENV_SINGLE_ARG_DECL)=0; + virtual ACE_Lock* create_consumer_admin_lock (ACE_ENV_SINGLE_ARG_DECL)=0; // Create lock type used by Consumer Admin's. - virtual ACE_Lock* create_supplier_admin_lock (TAO_ENV_SINGLE_ARG_DECL)=0; + virtual ACE_Lock* create_supplier_admin_lock (ACE_ENV_SINGLE_ARG_DECL)=0; // Create lock type used by Supplier Admin's. - virtual ACE_Lock* create_proxy_supplier_lock (TAO_ENV_SINGLE_ARG_DECL)=0; + virtual ACE_Lock* create_proxy_supplier_lock (ACE_ENV_SINGLE_ARG_DECL)=0; // Create lock type used by proxy supplier. - virtual ACE_Lock* create_proxy_consumer_lock (TAO_ENV_SINGLE_ARG_DECL)=0; + virtual ACE_Lock* create_proxy_consumer_lock (ACE_ENV_SINGLE_ARG_DECL)=0; // Create lock type used by proxy consumer. }; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.cpp index ee8f631d50b..ccd18699281 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.cpp @@ -52,9 +52,9 @@ TAO_Notify_Shutdown_Worker::TAO_Notify_Shutdown_Worker (void) } void -TAO_Notify_Shutdown_Worker::work (TAO_Notify_EventListener* listener TAO_ENV_ARG_DECL) +TAO_Notify_Shutdown_Worker::work (TAO_Notify_EventListener* listener ACE_ENV_ARG_DECL) { - listener->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + listener->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); } /********************************************************************/ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.h index 046ed275efd..1b2717ecb17 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.h @@ -80,7 +80,7 @@ class TAO_Notify_Export TAO_Notify_Shutdown_Worker : public TAO_ESF_Workerproperty_lookup_.bind ( name_str, - ACE_const_cast (CORBA::Any *, + ACE_const_cast (CORBA::Any *, &s_event.filterable_data[index].value) ); if (status != 0) { return 1; - } + } } return 0; @@ -75,7 +75,7 @@ TAO_Notify_Constraint_Visitor::visit_literal ( return 0; } -int +int TAO_Notify_Constraint_Visitor::visit_identifier (TAO_ETCL_Identifier *ident) { int return_value = -1; @@ -96,7 +96,7 @@ TAO_Notify_Constraint_Visitor::visit_identifier (TAO_ETCL_Identifier *ident) return return_value; } -int +int TAO_Notify_Constraint_Visitor::visit_union_value ( TAO_ETCL_Union_Value *union_value ) @@ -119,7 +119,7 @@ TAO_Notify_Constraint_Visitor::visit_union_value ( return 0; } -int +int TAO_Notify_Constraint_Visitor::visit_union_pos ( TAO_ETCL_Union_Pos *union_pos ) @@ -134,7 +134,7 @@ TAO_Notify_Constraint_Visitor::visit_union_pos ( TAO_DynUnion_i dyn_union; dyn_union.init (this->current_member_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::TypeCode_var tc = this->current_member_->type (); @@ -146,12 +146,12 @@ TAO_Notify_Constraint_Visitor::visit_union_pos ( case TAO_ETCL_UNSIGNED: { CORBA::Any disc_any; - CORBA::TypeCode_var disc_tc = - tc->discriminator_type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var disc_tc = + tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::TCKind disc_kind = + CORBA::TCKind disc_kind = TAO_DynAnyFactory::unalias (disc_tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; switch (disc_kind) @@ -194,16 +194,16 @@ TAO_Notify_Constraint_Visitor::visit_union_pos ( DynamicAny::DynAny_var dyn_any = TAO_DynAnyFactory::make_dyn_any (disc_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; dyn_union.set_discriminator (dyn_any.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; DynamicAny::DynAny_var u_member = - dyn_union.member (TAO_ENV_SINGLE_ARG_PARAMETER); + dyn_union.member (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - this->current_member_ = - u_member->to_any (TAO_ENV_SINGLE_ARG_PARAMETER); + this->current_member_ = + u_member->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; break; @@ -211,8 +211,8 @@ TAO_Notify_Constraint_Visitor::visit_union_pos ( case TAO_ETCL_STRING: { const char *name = (const char *) disc_val; - CORBA::ULong count = - tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong count = + tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; const char *member_name = 0; @@ -221,7 +221,7 @@ TAO_Notify_Constraint_Visitor::visit_union_pos ( for (i = 0; i < count; ++i) { member_name = tc->member_name (i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ACE_OS::strcmp (name, member_name) == 0) @@ -230,16 +230,16 @@ TAO_Notify_Constraint_Visitor::visit_union_pos ( } } - // If there's no match, member_label will throw + // If there's no match, member_label will throw // CORBA::TypeCode::Bounds and the catch block will // return -1; - this->current_member_ = tc->member_label (i - TAO_ENV_ARG_PARAMETER); + this->current_member_ = tc->member_label (i + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; break; } - // The TAO_ETCL_Union_Value that was put on the queue + // The TAO_ETCL_Union_Value that was put on the queue // shouldn't have any other type. default: return -1; @@ -274,7 +274,7 @@ TAO_Notify_Constraint_Visitor::visit_union_pos ( ACE_ENDTRY; } -int +int TAO_Notify_Constraint_Visitor::visit_component_pos ( TAO_ETCL_Component_Pos *pos ) @@ -286,7 +286,7 @@ TAO_Notify_Constraint_Visitor::visit_component_pos ( // component as found in property_lookup_ will be in current_member_. CORBA::TypeCode_var tc = this->current_member_->type (); CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; DynamicAny::DynAny_var member; @@ -299,11 +299,11 @@ TAO_Notify_Constraint_Visitor::visit_component_pos ( { TAO_DynEnum_i dyn_enum; dyn_enum.init (this->current_member_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; success = dyn_enum.seek (slot - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (success == 0) @@ -311,8 +311,8 @@ TAO_Notify_Constraint_Visitor::visit_component_pos ( return -1; } - member = - dyn_enum.current_component (TAO_ENV_SINGLE_ARG_PARAMETER); + member = + dyn_enum.current_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; break; @@ -321,11 +321,11 @@ TAO_Notify_Constraint_Visitor::visit_component_pos ( { TAO_DynStruct_i dyn_struct; dyn_struct.init (this->current_member_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; success = dyn_struct.seek (slot - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (success == 0) @@ -333,7 +333,7 @@ TAO_Notify_Constraint_Visitor::visit_component_pos ( return -1; } - member = dyn_struct.current_component (TAO_ENV_SINGLE_ARG_PARAMETER); + member = dyn_struct.current_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; break; @@ -345,7 +345,7 @@ TAO_Notify_Constraint_Visitor::visit_component_pos ( return -1; } - CORBA::Any_var value = member->to_any (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Any_var value = member->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; TAO_ETCL_Constraint *comp = pos->component (); @@ -369,7 +369,7 @@ TAO_Notify_Constraint_Visitor::visit_component_pos ( ACE_ENDTRY; } -int +int TAO_Notify_Constraint_Visitor::visit_component_assoc ( TAO_ETCL_Component_Assoc *assoc ) @@ -379,7 +379,7 @@ TAO_Notify_Constraint_Visitor::visit_component_assoc ( // no way that TAO can put one into the event's filterable data. // However, from the looks of the ETCL grammar, I believe that a // contruct like 'exist $(foo)' is legal, and is in effect using - // the event's filterable data as one big NVList. It is + // the event's filterable data as one big NVList. It is // equivalent to '$.foo'. I've implemented this method on that // basis, while keeping in mind that a clearer interpretation of // the spec may come along someday. @@ -413,7 +413,7 @@ TAO_Notify_Constraint_Visitor::visit_component_assoc ( } } -int +int TAO_Notify_Constraint_Visitor::visit_component_array ( TAO_ETCL_Component_Array *array ) @@ -425,7 +425,7 @@ TAO_Notify_Constraint_Visitor::visit_component_array ( // component as found in property_lookup_ will be in current_member_. CORBA::TypeCode_var tc = this->current_member_->type (); CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; DynamicAny::DynAny_var member; @@ -438,11 +438,11 @@ TAO_Notify_Constraint_Visitor::visit_component_array ( { TAO_DynEnum_i dyn_array; dyn_array.init (this->current_member_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; success = dyn_array.seek (slot - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (success == 0) @@ -450,7 +450,7 @@ TAO_Notify_Constraint_Visitor::visit_component_array ( return -1; } - member = dyn_array.current_component (TAO_ENV_SINGLE_ARG_PARAMETER); + member = dyn_array.current_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; break; @@ -459,11 +459,11 @@ TAO_Notify_Constraint_Visitor::visit_component_array ( { TAO_DynStruct_i dyn_sequence; dyn_sequence.init (this->current_member_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; success = dyn_sequence.seek (slot - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (success == 0) @@ -471,8 +471,8 @@ TAO_Notify_Constraint_Visitor::visit_component_array ( return -1; } - member = - dyn_sequence.current_component (TAO_ENV_SINGLE_ARG_PARAMETER); + member = + dyn_sequence.current_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; break; @@ -483,7 +483,7 @@ TAO_Notify_Constraint_Visitor::visit_component_array ( return -1; } - CORBA::Any_var value = member->to_any (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Any_var value = member->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; TAO_ETCL_Constraint *comp = array->component (); @@ -507,7 +507,7 @@ TAO_Notify_Constraint_Visitor::visit_component_array ( ACE_ENDTRY; } -int +int TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special) { ACE_DECLARE_NEW_CORBA_ENV; @@ -522,7 +522,7 @@ TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special) // If the TCKind is not a sequence or an array, the // call to length() will raise an exception, and the // catch block will return -1; - CORBA::ULong length = tc->length (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; TAO_ETCL_Literal_Constraint lit (length); @@ -536,14 +536,14 @@ TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special) // catch block will return -1; TAO_DynUnion_i dyn_union; dyn_union.init (this->current_member_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - DynamicAny::DynAny_var disc = - dyn_union.get_discriminator (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var disc = + dyn_union.get_discriminator (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::Any_var disc_any = disc->to_any (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Any_var disc_any = disc->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; TAO_ETCL_Literal_Constraint lit (disc_any); @@ -552,7 +552,7 @@ TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special) } case TAO_ETCL_TYPE_ID: { - const char *name = tc->name (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *name = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; TAO_ETCL_Literal_Constraint lit (name); @@ -561,7 +561,7 @@ TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special) } case TAO_ETCL_REPOS_ID: { - const char *id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; TAO_ETCL_Literal_Constraint lit (id); @@ -579,7 +579,7 @@ TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special) ACE_ENDTRY; } -int +int TAO_Notify_Constraint_Visitor::visit_component ( TAO_ETCL_Component *component ) @@ -611,7 +611,7 @@ TAO_Notify_Constraint_Visitor::visit_component ( } } -int +int TAO_Notify_Constraint_Visitor::visit_dot (TAO_ETCL_Dot *dot) { // If we are here, we know we're headed for a more nested @@ -620,7 +620,7 @@ TAO_Notify_Constraint_Visitor::visit_dot (TAO_ETCL_Dot *dot) return dot->component ()->accept (this); } -int +int TAO_Notify_Constraint_Visitor::visit_eval (TAO_ETCL_Eval *eval) { // Nothing to do but visit the contained component. @@ -649,7 +649,7 @@ TAO_Notify_Constraint_Visitor::visit_default (TAO_ETCL_Default *def) // If the current member is not a union, this call will // throw BadKind and the catch block will return -1. - CORBA::Long default_index = tc->default_index (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Long default_index = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // No default index. @@ -674,11 +674,11 @@ TAO_Notify_Constraint_Visitor::visit_default (TAO_ETCL_Default *def) ACE_ENDTRY; } -int +int TAO_Notify_Constraint_Visitor::visit_exist (TAO_ETCL_Exist *exist) { TAO_ETCL_Constraint *component = exist->component (); - + if (component->accept (this) == 0) { TAO_ETCL_Literal_Constraint top; @@ -698,7 +698,7 @@ TAO_Notify_Constraint_Visitor::visit_exist (TAO_ETCL_Exist *exist) return -1; } -int +int TAO_Notify_Constraint_Visitor::visit_unary_expr ( TAO_ETCL_Unary_Expr *unary_expr ) @@ -739,7 +739,7 @@ TAO_Notify_Constraint_Visitor::visit_unary_expr ( return -1; } -int +int TAO_Notify_Constraint_Visitor::visit_binary_expr ( TAO_ETCL_Binary_Expr *binary_expr ) @@ -773,7 +773,7 @@ TAO_Notify_Constraint_Visitor::visit_binary_expr ( } } -int +int TAO_Notify_Constraint_Visitor::visit_or ( TAO_ETCL_Binary_Expr *binary ) @@ -815,7 +815,7 @@ TAO_Notify_Constraint_Visitor::visit_or ( return return_value; } -int +int TAO_Notify_Constraint_Visitor::visit_and ( TAO_ETCL_Binary_Expr *binary ) @@ -928,7 +928,7 @@ TAO_Notify_Constraint_Visitor::visit_binary_op ( return return_value; } -int +int TAO_Notify_Constraint_Visitor::visit_twiddle ( TAO_ETCL_Binary_Expr *binary ) @@ -958,7 +958,7 @@ TAO_Notify_Constraint_Visitor::visit_twiddle ( return return_value; } -int +int TAO_Notify_Constraint_Visitor::visit_in ( TAO_ETCL_Binary_Expr *binary ) @@ -990,7 +990,7 @@ TAO_Notify_Constraint_Visitor::visit_in ( { CORBA::TypeCode_var tc = component->type (); kind = TAO_DynAnyFactory::unalias (tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -1004,23 +1004,23 @@ TAO_Notify_Constraint_Visitor::visit_in ( switch (kind) { case CORBA::tk_sequence: - result = this->sequence_does_contain (component, + result = this->sequence_does_contain (component, left); break; case CORBA::tk_array: - result = this->array_does_contain (component, + result = this->array_does_contain (component, left); break; case CORBA::tk_struct: - result = this->struct_does_contain (component, + result = this->struct_does_contain (component, left); break; case CORBA::tk_union: - result = this->union_does_contain (component, + result = this->union_does_contain (component, left); break; case CORBA::tk_any: - result = this->any_does_contain (component, + result = this->any_does_contain (component, left); break; default: @@ -1036,7 +1036,7 @@ TAO_Notify_Constraint_Visitor::visit_in ( return return_value; } -int +int TAO_Notify_Constraint_Visitor::visit_preference ( TAO_ETCL_Preference * ) @@ -1059,7 +1059,7 @@ TAO_Notify_Constraint_Visitor::sequence_does_contain ( { CORBA::TypeCode_var type = any->type (); CORBA::TCKind kind = TAO_DynAnyFactory::unalias (type.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // The literal and the array elements must be @@ -1073,12 +1073,12 @@ TAO_Notify_Constraint_Visitor::sequence_does_contain ( } TAO_DynSequence_i dyn_seq; - dyn_seq.init (*any - TAO_ENV_ARG_PARAMETER); + dyn_seq.init (*any + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - DynamicAny::AnySeq_var any_seq = - dyn_seq.get_elements (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::AnySeq_var any_seq = + dyn_seq.get_elements (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ULong length = any_seq->length (); @@ -1100,7 +1100,7 @@ TAO_Notify_Constraint_Visitor::sequence_does_contain ( ACE_ENDTRY; return 0; -} +} CORBA::Boolean TAO_Notify_Constraint_Visitor::array_does_contain ( @@ -1113,7 +1113,7 @@ TAO_Notify_Constraint_Visitor::array_does_contain ( { CORBA::TypeCode_var type = any->type (); CORBA::TCKind kind = TAO_DynAnyFactory::unalias (type.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // The literal and the array elements must be @@ -1127,12 +1127,12 @@ TAO_Notify_Constraint_Visitor::array_does_contain ( } TAO_DynArray_i dyn_array; - dyn_array.init (*any - TAO_ENV_ARG_PARAMETER); + dyn_array.init (*any + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - DynamicAny::AnySeq_var any_seq = - dyn_array.get_elements (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::AnySeq_var any_seq = + dyn_array.get_elements (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ULong length = any_seq->length (); @@ -1167,11 +1167,11 @@ TAO_Notify_Constraint_Visitor::struct_does_contain ( { TAO_DynStruct_i dyn_struct; dyn_struct.init (*any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; DynamicAny::NameValuePairSeq_var members = - dyn_struct.get_members (TAO_ENV_SINGLE_ARG_PARAMETER); + dyn_struct.get_members (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ULong length = members->length (); @@ -1182,7 +1182,7 @@ TAO_Notify_Constraint_Visitor::struct_does_contain ( { tc = members[i].value.type (); kind = TAO_DynAnyFactory::unalias (tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // The literal and the struct member must be @@ -1222,20 +1222,20 @@ TAO_Notify_Constraint_Visitor::union_does_contain ( ACE_TRY { TAO_DynUnion_i dyn_union; - dyn_union.init (*any - TAO_ENV_ARG_PARAMETER); + dyn_union.init (*any + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - DynamicAny::DynAny_var cc = - dyn_union.current_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = + dyn_union.current_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - - CORBA::Any_var member = cc->to_any (TAO_ENV_SINGLE_ARG_PARAMETER); + + CORBA::Any_var member = cc->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::TypeCode_var tc = member->type (); CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // The literal and the union member must be @@ -1287,21 +1287,21 @@ TAO_Notify_Constraint_Visitor::simple_type_match (int expr_type, return 0; } case TAO_ETCL_DOUBLE: - if (tc_kind != CORBA::tk_double + if (tc_kind != CORBA::tk_double && tc_kind != CORBA::tk_float) { return 0; } case TAO_ETCL_INTEGER: case TAO_ETCL_SIGNED: - if (tc_kind != CORBA::tk_short + if (tc_kind != CORBA::tk_short && tc_kind != CORBA::tk_long && tc_kind != CORBA::tk_longlong) { return 0; } case TAO_ETCL_UNSIGNED: - if (tc_kind != CORBA::tk_ushort + if (tc_kind != CORBA::tk_ushort && tc_kind != CORBA::tk_ulong && tc_kind != CORBA::tk_ulonglong) { diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp index 5653d01839a..d73d7d209e8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp @@ -87,32 +87,32 @@ TAO_Notify_ConsumerAdmin_i::_decr_refcnt (void) } void -TAO_Notify_ConsumerAdmin_i::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) +TAO_Notify_ConsumerAdmin_i::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/) { this->_incr_refcnt (); } void -TAO_Notify_ConsumerAdmin_i::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) +TAO_Notify_ConsumerAdmin_i::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/) { this->_decr_refcnt (); } void -TAO_Notify_ConsumerAdmin_i::dispatch_event (TAO_Notify_Event &event TAO_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::dispatch_event (TAO_Notify_Event &event ACE_ENV_ARG_DECL) { // Dispatch the event to all the registered listeners. TAO_Notify_Dispatch_Command_Worker worker (&event, this->event_manager_->event_processor ()); // Propogate the filter command. - this->event_listener_list_->for_each (&worker TAO_ENV_ARG_PARAMETER); + this->event_listener_list_->for_each (&worker ACE_ENV_ARG_PARAMETER); } CORBA::Boolean -TAO_Notify_ConsumerAdmin_i::evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean /*eval_parent*/ TAO_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean /*eval_parent*/ ACE_ENV_ARG_DECL) { CORBA::Boolean bval = - this->get_filter_admin ().match (event TAO_ENV_ARG_PARAMETER); + this->get_filter_admin ().match (event ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ((bval == 1 && this->filter_operator_ == CosNotifyChannelAdmin::AND_OP) || @@ -125,7 +125,7 @@ TAO_Notify_ConsumerAdmin_i::evaluate_filter (TAO_Notify_Event &event, CORBA::Boo // note the last param. we ask that the parent filter *not* be evaluated again // because we've done it here. - this->event_listener_list_->for_each (&worker TAO_ENV_ARG_PARAMETER); + this->event_listener_list_->for_each (&worker ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Propogate the filter command. @@ -138,7 +138,7 @@ TAO_Notify_ConsumerAdmin_i::evaluate_filter (TAO_Notify_Event &event, CORBA::Boo // OR we could instead do: // - // this->dispatch_event (event TAO_ENV_ARG_PARAMETER); + // this->dispatch_event (event ACE_ENV_ARG_PARAMETER); // return 0; // // This will short circuit a few steps, because the event processor is going to @@ -160,24 +160,24 @@ void TAO_Notify_ConsumerAdmin_i::init (CosNotifyChannelAdmin::AdminID my_id, CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator, PortableServer::POA_ptr my_POA - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { my_POA_ = PortableServer::POA::_duplicate (my_POA); this->lock_ = - this->channel_objects_factory_->create_consumer_admin_lock (TAO_ENV_SINGLE_ARG_PARAMETER); + this->channel_objects_factory_->create_consumer_admin_lock (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->proxy_pushsupplier_POA_ = this->poa_factory_-> create_proxy_pushsupplier_POA (this->my_POA_.in (), my_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->my_id_ = my_id; this->filter_operator_ = filter_operator; this->event_listener_list_ = - this->collection_factory_->create_event_listener_list (TAO_ENV_SINGLE_ARG_PARAMETER); + this->collection_factory_->create_event_listener_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Create the task to forward filtering/dispatching commands to: @@ -185,12 +185,12 @@ TAO_Notify_ConsumerAdmin_i::init (CosNotifyChannelAdmin::AdminID my_id, // add a "get_singleton_reactive_task" to the event manager factory interface. this->dispatching_task_ = new TAO_Notify_Worker_Task (); - /*this->event_manager_objects_factory_->create_dispatching_task (TAO_ENV_SINGLE_ARG_PARAMETER); + /*this->event_manager_objects_factory_->create_dispatching_task (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; */ this->filter_eval_task_ = new TAO_Notify_Worker_Task (); - // this->event_manager_objects_factory_->create_listener_eval_task (TAO_ENV_SINGLE_ARG_PARAMETER); + // this->event_manager_objects_factory_->create_listener_eval_task (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Get hold of the admin properties. @@ -221,7 +221,7 @@ TAO_Notify_ConsumerAdmin_i::init (CosNotifyChannelAdmin::AdminID my_id, } void -TAO_Notify_ConsumerAdmin_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL) { CosNotification::EventTypeSeq removed; @@ -234,50 +234,50 @@ TAO_Notify_ConsumerAdmin_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL) this->subscription_list_.populate (removed); this->event_manager_->subscribe_for_events (this, - added, removed TAO_ENV_ARG_PARAMETER); + added, removed ACE_ENV_ARG_PARAMETER); ACE_CHECK; // deactivate ourselves this->poa_factory_->deactivate_object (this, this->my_POA_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // shutdown proxy's. TAO_Notify_Shutdown_Worker shutdown_worker; - this->event_listener_list_->for_each (&shutdown_worker TAO_ENV_ARG_PARAMETER); + this->event_listener_list_->for_each (&shutdown_worker ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->event_listener_list_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->event_listener_list_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->poa_factory_->destroy_POA (this->proxy_pushsupplier_POA_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->dispatching_task_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->dispatching_task_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->filter_eval_task_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->filter_eval_task_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -TAO_Notify_ConsumerAdmin_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { // unregister from EC - this->event_channel_->unregister_listener (this TAO_ENV_ARG_PARAMETER); + this->event_channel_->unregister_listener (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_ConsumerAdmin_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) { - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } TAO_Notify_Worker_Task* @@ -293,14 +293,14 @@ TAO_Notify_ConsumerAdmin_i::filter_eval_task (void) } void -TAO_Notify_ConsumerAdmin_i::subscription_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::subscription_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyComm::InvalidEventType )) { this->event_manager_->subscribe_for_events (this, //*this->event_listener_list_, - added, removed TAO_ENV_ARG_PARAMETER); + added, removed ACE_ENV_ARG_PARAMETER); ACE_CHECK; { ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, @@ -314,15 +314,15 @@ TAO_Notify_ConsumerAdmin_i::subscription_change (const CosNotification::EventTyp } CosNotifyChannelAdmin::ConsumerAdmin_ptr -TAO_Notify_ConsumerAdmin_i::get_ref (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::get_ref (ACE_ENV_SINGLE_ARG_DECL) { CORBA::Object_var obj = this->poa_factory_-> - servant_to_reference (this->my_POA_.in (), this TAO_ENV_ARG_PARAMETER); + servant_to_reference (this->my_POA_.in (), this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ()); return CosNotifyChannelAdmin::ConsumerAdmin::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } TAO_Notify_Event_Manager* @@ -338,30 +338,30 @@ TAO_Notify_ConsumerAdmin_i::get_filter_admin (void) } void -TAO_Notify_ConsumerAdmin_i::register_listener (TAO_Notify_EventListener *listener TAO_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::register_listener (TAO_Notify_EventListener *listener ACE_ENV_ARG_DECL) { // register it. - this->event_listener_list_->connected (listener TAO_ENV_ARG_PARAMETER); + this->event_listener_list_->connected (listener ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_Notify_ConsumerAdmin_i::unregister_listener (TAO_Notify_EventListener *listener TAO_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::unregister_listener (TAO_Notify_EventListener *listener ACE_ENV_ARG_DECL) { - this->event_listener_list_->disconnected (listener TAO_ENV_ARG_PARAMETER); + this->event_listener_list_->disconnected (listener ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_Notify_ConsumerAdmin_i::deactivate_proxy_pushsupplier (PortableServer::Servant servant TAO_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::deactivate_proxy_pushsupplier (PortableServer::Servant servant ACE_ENV_ARG_DECL) { this->poa_factory_-> deactivate_object (servant, this->proxy_pushsupplier_POA_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CosNotifyChannelAdmin::AdminID -TAO_Notify_ConsumerAdmin_i::MyID (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) +TAO_Notify_ConsumerAdmin_i::MyID (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -370,16 +370,16 @@ TAO_Notify_ConsumerAdmin_i::MyID (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SING } CosNotifyChannelAdmin::EventChannel_ptr -TAO_Notify_ConsumerAdmin_i::MyChannel (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::MyChannel (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return event_channel_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + return event_channel_->get_ref (ACE_ENV_SINGLE_ARG_PARAMETER); } CosNotifyChannelAdmin::InterFilterGroupOperator -TAO_Notify_ConsumerAdmin_i::MyOperator (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) +TAO_Notify_ConsumerAdmin_i::MyOperator (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -388,16 +388,16 @@ TAO_Notify_ConsumerAdmin_i::MyOperator (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_EN } CosNotifyChannelAdmin::ProxyIDSeq* -TAO_Notify_ConsumerAdmin_i::push_suppliers (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::push_suppliers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->proxy_pushsupplier_ids_.get_sequence (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->proxy_pushsupplier_ids_.get_sequence (ACE_ENV_SINGLE_ARG_PARAMETER); } CosNotifyChannelAdmin::ProxySupplier_ptr -TAO_Notify_ConsumerAdmin_i::get_proxy_supplier (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::get_proxy_supplier (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyChannelAdmin::ProxyNotFound @@ -406,73 +406,73 @@ TAO_Notify_ConsumerAdmin_i::get_proxy_supplier (CosNotifyChannelAdmin::ProxyID p CORBA::Object_var obj = this->poa_factory_->id_to_reference (proxy_id, proxy_pushsupplier_POA_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxySupplier::_nil ()); return CosNotifyChannelAdmin::ProxySupplier::_narrow (obj.in ()); } CORBA::Object_ptr -TAO_Notify_ConsumerAdmin_i::obtain_struct_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::obtain_struct_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL) { TAO_Notify_StructuredProxyPushSupplier_i* struct_proxy_pushsupplier = this->channel_objects_factory_->create_struct_proxy_pushsupplier (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); PortableServer::ServantBase_var proxy_pushsupplier_var (struct_proxy_pushsupplier); - struct_proxy_pushsupplier->init (proxy_id TAO_ENV_ARG_PARAMETER); + struct_proxy_pushsupplier->init (proxy_id ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); return this->poa_factory_-> activate_object_with_id (proxy_id, this->proxy_pushsupplier_POA_.in (), struct_proxy_pushsupplier - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Object_ptr -TAO_Notify_ConsumerAdmin_i::obtain_sequence_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::obtain_sequence_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL) { TAO_Notify_SequenceProxyPushSupplier_i* seq_proxy_pushsupplier = this->channel_objects_factory_->create_seq_proxy_pushsupplier (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); PortableServer::ServantBase_var proxy_pushsupplier_var (seq_proxy_pushsupplier); - seq_proxy_pushsupplier->init (proxy_id TAO_ENV_ARG_PARAMETER); + seq_proxy_pushsupplier->init (proxy_id ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); return this->poa_factory_-> activate_object_with_id (proxy_id, this->proxy_pushsupplier_POA_.in (), seq_proxy_pushsupplier - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Object_ptr -TAO_Notify_ConsumerAdmin_i::obtain_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::obtain_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL) { TAO_Notify_ProxyPushSupplier_i* proxy_pushsupplier = - this->channel_objects_factory_->create_proxy_pushsupplier (this TAO_ENV_ARG_PARAMETER); + this->channel_objects_factory_->create_proxy_pushsupplier (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); PortableServer::ServantBase_var proxy_pushsupplier_var (proxy_pushsupplier); - proxy_pushsupplier->init (proxy_id TAO_ENV_ARG_PARAMETER); + proxy_pushsupplier->init (proxy_id ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); return this->poa_factory_-> activate_object_with_id (proxy_id, this->proxy_pushsupplier_POA_.in (), proxy_pushsupplier - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CosNotifyChannelAdmin::ProxySupplier_ptr -TAO_Notify_ConsumerAdmin_i::obtain_notification_push_supplier (CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id TAO_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::obtain_notification_push_supplier (CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyChannelAdmin::AdminLimitExceeded @@ -492,13 +492,13 @@ TAO_Notify_ConsumerAdmin_i::obtain_notification_push_supplier (CosNotifyChannelA { case CosNotifyChannelAdmin::ANY_EVENT: { - obj = this->obtain_proxy_pushsupplier_i (proxy_id TAO_ENV_ARG_PARAMETER); + obj = this->obtain_proxy_pushsupplier_i (proxy_id ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxySupplier::_nil ()); } break; case CosNotifyChannelAdmin::STRUCTURED_EVENT: { - obj = this->obtain_struct_proxy_pushsupplier_i (proxy_id TAO_ENV_ARG_PARAMETER); + obj = this->obtain_struct_proxy_pushsupplier_i (proxy_id ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxySupplier::_nil ()); } break; @@ -506,7 +506,7 @@ TAO_Notify_ConsumerAdmin_i::obtain_notification_push_supplier (CosNotifyChannelA case CosNotifyChannelAdmin::SEQUENCE_EVENT: { obj = this->obtain_sequence_proxy_pushsupplier_i (proxy_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxySupplier::_nil ()); } break; @@ -518,26 +518,26 @@ TAO_Notify_ConsumerAdmin_i::obtain_notification_push_supplier (CosNotifyChannelA this->proxy_pushsupplier_ids_.next (); // commit this id to the pool return CosNotifyChannelAdmin::ProxySupplier::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CosNotification::QoSProperties* -TAO_Notify_ConsumerAdmin_i::get_qos (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::get_qos (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->qos_admin_.get_qos (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->qos_admin_.get_qos (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_ConsumerAdmin_i::set_qos (const CosNotification::QoSProperties & qos TAO_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotification::UnsupportedQoS )) { - this->qos_admin_.set_qos (qos TAO_ENV_ARG_PARAMETER); + this->qos_admin_.set_qos (qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Then update our task's qos @@ -552,64 +552,64 @@ TAO_Notify_ConsumerAdmin_i::set_qos (const CosNotification::QoSProperties & qos } void -TAO_Notify_ConsumerAdmin_i::validate_qos (const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos TAO_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::validate_qos (const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotification::UnsupportedQoS )) { - this->qos_admin_.validate_qos (required_qos, available_qos TAO_ENV_ARG_PARAMETER); + this->qos_admin_.validate_qos (required_qos, available_qos ACE_ENV_ARG_PARAMETER); } CosNotifyFilter::FilterID -TAO_Notify_ConsumerAdmin_i::add_filter (CosNotifyFilter::Filter_ptr new_filter TAO_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->filter_admin_.add_filter (new_filter TAO_ENV_ARG_PARAMETER); + return this->filter_admin_.add_filter (new_filter ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_ConsumerAdmin_i::remove_filter (CosNotifyFilter::FilterID filter TAO_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::remove_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyFilter::FilterNotFound )) { - this->filter_admin_.remove_filter (filter TAO_ENV_ARG_PARAMETER); + this->filter_admin_.remove_filter (filter ACE_ENV_ARG_PARAMETER); } CosNotifyFilter::Filter_ptr -TAO_Notify_ConsumerAdmin_i::get_filter (CosNotifyFilter::FilterID filter TAO_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::get_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyFilter::FilterNotFound )) { - return this->filter_admin_.get_filter (filter TAO_ENV_ARG_PARAMETER); + return this->filter_admin_.get_filter (filter ACE_ENV_ARG_PARAMETER); } CosNotifyFilter::FilterIDSeq* -TAO_Notify_ConsumerAdmin_i::get_all_filters (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::get_all_filters (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->filter_admin_.get_all_filters (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->filter_admin_.get_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_ConsumerAdmin_i::remove_all_filters (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - this->filter_admin_.remove_all_filters (TAO_ENV_SINGLE_ARG_PARAMETER); + this->filter_admin_.remove_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER); } CosEventChannelAdmin::ProxyPushSupplier_ptr -TAO_Notify_ConsumerAdmin_i::obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -622,21 +622,21 @@ TAO_Notify_ConsumerAdmin_i::obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL) PortableServer::ServantBase_var proxy_var (cosec_proxy); - cosec_proxy->init (TAO_ENV_SINGLE_ARG_PARAMETER); + cosec_proxy->init (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CosEventChannelAdmin::ProxyPushSupplier::_nil ()); PortableServer::POA_var def_poa = this->event_channel_->get_default_POA (); CORBA::Object_var obj = this->poa_factory_-> - activate_object (def_poa.in (), cosec_proxy TAO_ENV_ARG_PARAMETER); + activate_object (def_poa.in (), cosec_proxy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosEventChannelAdmin::ProxyPushSupplier::_nil ()); return CosEventChannelAdmin::ProxyPushSupplier::_narrow (obj.in ()); } CosNotifyChannelAdmin::ProxySupplier_ptr -TAO_Notify_ConsumerAdmin_i::obtain_notification_pull_supplier (CosNotifyChannelAdmin::ClientType /*ctype*/, CosNotifyChannelAdmin::ProxyID_out /*proxy_id*/ TAO_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::obtain_notification_pull_supplier (CosNotifyChannelAdmin::ClientType /*ctype*/, CosNotifyChannelAdmin::ProxyID_out /*proxy_id*/ ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyChannelAdmin::AdminLimitExceeded @@ -647,7 +647,7 @@ TAO_Notify_ConsumerAdmin_i::obtain_notification_pull_supplier (CosNotifyChannelA } CosEventChannelAdmin::ProxyPullSupplier_ptr -TAO_Notify_ConsumerAdmin_i::obtain_pull_supplier (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -658,7 +658,7 @@ TAO_Notify_ConsumerAdmin_i::obtain_pull_supplier (TAO_ENV_SINGLE_ARG_DECL) CosNotifyFilter::MappingFilter_ptr -TAO_Notify_ConsumerAdmin_i::priority_filter (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::priority_filter (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -668,7 +668,7 @@ TAO_Notify_ConsumerAdmin_i::priority_filter (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_Notify_ConsumerAdmin_i::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/ TAO_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/ ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -677,7 +677,7 @@ TAO_Notify_ConsumerAdmin_i::priority_filter (CosNotifyFilter::MappingFilter_ptr } CosNotifyFilter::MappingFilter_ptr -TAO_Notify_ConsumerAdmin_i::lifetime_filter (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::lifetime_filter (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -687,7 +687,7 @@ TAO_Notify_ConsumerAdmin_i::lifetime_filter (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_Notify_ConsumerAdmin_i::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/ TAO_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/ ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -696,7 +696,7 @@ TAO_Notify_ConsumerAdmin_i::lifetime_filter (CosNotifyFilter::MappingFilter_ptr } CosNotifyChannelAdmin::ProxyIDSeq* -TAO_Notify_ConsumerAdmin_i::pull_suppliers (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::pull_suppliers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -714,10 +714,10 @@ TAO_Notify_Filter_Command_Worker::TAO_Notify_Filter_Command_Worker (TAO_Notify_E } void -TAO_Notify_Filter_Command_Worker::work (TAO_Notify_EventListener* event_listener TAO_ENV_ARG_DECL) +TAO_Notify_Filter_Command_Worker::work (TAO_Notify_EventListener* event_listener ACE_ENV_ARG_DECL) { this->event_processor_->evaluate_listener_filter (this->event_, event_listener, - this->eval_parent_ TAO_ENV_ARG_PARAMETER); + this->eval_parent_ ACE_ENV_ARG_PARAMETER); } /****************************************************************************************************/ @@ -733,9 +733,9 @@ TAO_Notify_Dispatch_Command_Worker::~TAO_Notify_Dispatch_Command_Worker () } void -TAO_Notify_Dispatch_Command_Worker::work (TAO_Notify_EventListener* event_listener TAO_ENV_ARG_DECL) +TAO_Notify_Dispatch_Command_Worker::work (TAO_Notify_EventListener* event_listener ACE_ENV_ARG_DECL) { - this->event_processor_->dispatch_event (this->event_, event_listener TAO_ENV_ARG_PARAMETER); + this->event_processor_->dispatch_event (this->event_, event_listener ACE_ENV_ARG_PARAMETER); } /****************************************************************************************************/ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.h index 1e7aa09ff50..a4e272b46fa 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.h @@ -69,17 +69,17 @@ class TAO_Notify_Export TAO_Notify_ConsumerAdmin_i : public TAO_Notify_EventList virtual CORBA::ULong _decr_refcnt (void); // = The Servant methods - virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL); - virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL); + virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL); + virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL); //= TAO_Notify_EventListener methods - virtual void dispatch_event (TAO_Notify_Event &event TAO_ENV_ARG_DECL); + virtual void dispatch_event (TAO_Notify_Event &event ACE_ENV_ARG_DECL); // Callback methods to supply the event to the listener. - virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean eval_parent TAO_ENV_ARG_DECL); + virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean eval_parent ACE_ENV_ARG_DECL); // Evaluates true if this event is acceptable by the listener. - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL); // Ask the listener to relinqish any bindings and prepare to be disposed. virtual TAO_Notify_Worker_Task* event_dispatch_task (void); @@ -92,10 +92,10 @@ class TAO_Notify_Export TAO_Notify_ConsumerAdmin_i : public TAO_Notify_EventList void init (CosNotifyChannelAdmin::AdminID myID, CosNotifyChannelAdmin::InterFilterGroupOperator myOperator, PortableServer::POA_ptr my_POA - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize the Consumer Admin. - CosNotifyChannelAdmin::ConsumerAdmin_ptr get_ref (TAO_ENV_SINGLE_ARG_DECL); + CosNotifyChannelAdmin::ConsumerAdmin_ptr get_ref (ACE_ENV_SINGLE_ARG_DECL); // Return the CORBA object for this servant. TAO_Notify_Event_Manager* get_event_manager (void); @@ -104,13 +104,13 @@ class TAO_Notify_Export TAO_Notify_ConsumerAdmin_i : public TAO_Notify_EventList TAO_Notify_FilterAdmin_i& get_filter_admin (void); // Get our filter admin. - void deactivate_proxy_pushsupplier (PortableServer::Servant servant TAO_ENV_ARG_DECL); + void deactivate_proxy_pushsupplier (PortableServer::Servant servant ACE_ENV_ARG_DECL); // Deactivate servant from . - void register_listener (TAO_Notify_EventListener *listener TAO_ENV_ARG_DECL); + void register_listener (TAO_Notify_EventListener *listener ACE_ENV_ARG_DECL); // Register with parent for subscription updates. - void unregister_listener (TAO_Notify_EventListener *listener TAO_ENV_ARG_DECL); + void unregister_listener (TAO_Notify_EventListener *listener ACE_ENV_ARG_DECL); // Unregister with parent from subscription updates. void proxy_pushsupplier_destroyed (CosNotifyChannelAdmin::ProxyID proxyID); @@ -118,28 +118,28 @@ class TAO_Notify_Export TAO_Notify_ConsumerAdmin_i : public TAO_Notify_EventList // = Interface methods virtual CosNotifyChannelAdmin::AdminID MyID ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyChannelAdmin::EventChannel_ptr MyChannel ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyFilter::MappingFilter_ptr priority_filter ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -147,14 +147,14 @@ virtual CosNotifyFilter::MappingFilter_ptr priority_filter ( virtual void priority_filter ( CosNotifyFilter::MappingFilter_ptr priority_filter - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyFilter::MappingFilter_ptr lifetime_filter ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -162,21 +162,21 @@ virtual CosNotifyFilter::MappingFilter_ptr lifetime_filter ( virtual void lifetime_filter ( CosNotifyFilter::MappingFilter_ptr lifetime_filter - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyChannelAdmin::ProxyIDSeq * pull_suppliers ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyChannelAdmin::ProxyIDSeq * push_suppliers ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -184,7 +184,7 @@ virtual CosNotifyChannelAdmin::ProxyIDSeq * push_suppliers ( virtual CosNotifyChannelAdmin::ProxySupplier_ptr get_proxy_supplier ( CosNotifyChannelAdmin::ProxyID proxy_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -194,7 +194,7 @@ virtual CosNotifyChannelAdmin::ProxySupplier_ptr get_proxy_supplier ( virtual CosNotifyChannelAdmin::ProxySupplier_ptr obtain_notification_pull_supplier ( CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -204,7 +204,7 @@ virtual CosNotifyChannelAdmin::ProxySupplier_ptr obtain_notification_pull_suppli virtual CosNotifyChannelAdmin::ProxySupplier_ptr obtain_notification_push_supplier ( CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -212,14 +212,14 @@ virtual CosNotifyChannelAdmin::ProxySupplier_ptr obtain_notification_push_suppli )); virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotification::QoSProperties * get_qos ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -227,7 +227,7 @@ virtual CosNotification::QoSProperties * get_qos ( virtual void set_qos ( const CosNotification::QoSProperties & qos - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -237,7 +237,7 @@ virtual void set_qos ( virtual void validate_qos ( const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -247,7 +247,7 @@ virtual void validate_qos ( virtual void subscription_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -256,7 +256,7 @@ virtual void subscription_change ( virtual CosNotifyFilter::FilterID add_filter ( CosNotifyFilter::Filter_ptr new_filter - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -264,7 +264,7 @@ virtual CosNotifyFilter::FilterID add_filter ( virtual void remove_filter ( CosNotifyFilter::FilterID filter - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -273,7 +273,7 @@ virtual void remove_filter ( virtual CosNotifyFilter::Filter_ptr get_filter ( CosNotifyFilter::FilterID filter - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -281,28 +281,28 @@ virtual CosNotifyFilter::Filter_ptr get_filter ( )); virtual CosNotifyFilter::FilterIDSeq * get_all_filters ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void remove_all_filters ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -310,16 +310,16 @@ virtual CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier ( protected: // = Helper methods - void destroy_i (TAO_ENV_SINGLE_ARG_DECL); + void destroy_i (ACE_ENV_SINGLE_ARG_DECL); // Destroy CA - CORBA::Object_ptr obtain_struct_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL); + CORBA::Object_ptr obtain_struct_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL); // Obtain a proxy pushsupplier object - CORBA::Object_ptr obtain_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL); + CORBA::Object_ptr obtain_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL); // Obtain a structured proxy pushsupplier object. - CORBA::Object_ptr obtain_sequence_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL); + CORBA::Object_ptr obtain_sequence_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL); // Obtain a sequence proxy pushsupplier object. // = Data members @@ -400,7 +400,7 @@ public: TAO_Notify_Filter_Command_Worker (TAO_Notify_Event* event, TAO_Notify_Event_Processor* event_processor, CORBA::Boolean eval_parent); // = TAO_ESF_Worker method - void work (TAO_Notify_EventListener* listener TAO_ENV_ARG_DECL); + void work (TAO_Notify_EventListener* listener ACE_ENV_ARG_DECL); protected: TAO_Notify_Event* event_; @@ -423,7 +423,7 @@ public: ~TAO_Notify_Dispatch_Command_Worker (); // = TAO_ESF_Worker method - void work (TAO_Notify_EventListener* listener TAO_ENV_ARG_DECL); + void work (TAO_Notify_EventListener* listener ACE_ENV_ARG_DECL); protected: TAO_Notify_Event* event_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp index f827f9e389f..83869d678f5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp @@ -46,7 +46,7 @@ TAO_Notify_Default_CO_Factory::fini (void) TAO_Notify_EventChannel_i* -TAO_Notify_Default_CO_Factory::create_event_channel (TAO_Notify_EventChannelFactory_i* parent TAO_ENV_ARG_DECL) +TAO_Notify_Default_CO_Factory::create_event_channel (TAO_Notify_EventChannelFactory_i* parent ACE_ENV_ARG_DECL) { TAO_Notify_EventChannel_i* channel; ACE_NEW_THROW_EX (channel, @@ -57,7 +57,7 @@ TAO_Notify_Default_CO_Factory::create_event_channel (TAO_Notify_EventChannelFact TAO_Notify_ConsumerAdmin_i* TAO_Notify_Default_CO_Factory::create_consumer_admin (TAO_Notify_EventChannel_i* event_channel - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_Notify_ConsumerAdmin_i* consumer_admin_i; ACE_NEW_THROW_EX (consumer_admin_i, @@ -67,11 +67,11 @@ TAO_Notify_Default_CO_Factory::create_consumer_admin (TAO_Notify_EventChannel_i* { // Propagate the event channels qos to the consumer CosNotification::QoSProperties_var qos = - event_channel->get_qos (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->get_qos (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; consumer_admin_i->set_qos (qos.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -86,7 +86,7 @@ TAO_Notify_Default_CO_Factory::create_consumer_admin (TAO_Notify_EventChannel_i* TAO_Notify_SupplierAdmin_i* TAO_Notify_Default_CO_Factory::create_supplier_admin (TAO_Notify_EventChannel_i* event_channel - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_Notify_SupplierAdmin_i* supplier_admin_i; @@ -97,11 +97,11 @@ TAO_Notify_Default_CO_Factory::create_supplier_admin (TAO_Notify_EventChannel_i* { // Propagate the event channels qos to the supplier CosNotification::QoSProperties_var qos = - event_channel->get_qos (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->get_qos (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; supplier_admin_i->set_qos (qos.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -116,7 +116,7 @@ TAO_Notify_Default_CO_Factory::create_supplier_admin (TAO_Notify_EventChannel_i* TAO_Notify_FilterFactory_i* -TAO_Notify_Default_CO_Factory::create_filter_factory (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Default_CO_Factory::create_filter_factory (ACE_ENV_SINGLE_ARG_DECL) { TAO_Notify_FilterFactory_i* filterfactory; ACE_NEW_THROW_EX (filterfactory, @@ -127,7 +127,7 @@ TAO_Notify_Default_CO_Factory::create_filter_factory (TAO_ENV_SINGLE_ARG_DECL) TAO_Notify_StructuredProxyPushSupplier_i* -TAO_Notify_Default_CO_Factory::create_struct_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL) +TAO_Notify_Default_CO_Factory::create_struct_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent ACE_ENV_ARG_DECL) { TAO_Notify_StructuredProxyPushSupplier_i* proxy; ACE_NEW_THROW_EX (proxy, @@ -137,11 +137,11 @@ TAO_Notify_Default_CO_Factory::create_struct_proxy_pushsupplier (TAO_Notify_Cons { // Propagate the parent qos to the supplier CosNotification::QoSProperties_var qos = - parent->get_qos (TAO_ENV_SINGLE_ARG_PARAMETER); + parent->get_qos (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; proxy->set_qos (qos.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -155,7 +155,7 @@ TAO_Notify_Default_CO_Factory::create_struct_proxy_pushsupplier (TAO_Notify_Cons } TAO_Notify_SequenceProxyPushSupplier_i* -TAO_Notify_Default_CO_Factory::create_seq_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL) +TAO_Notify_Default_CO_Factory::create_seq_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent ACE_ENV_ARG_DECL) { TAO_Notify_SequenceProxyPushSupplier_i* proxy; ACE_NEW_THROW_EX (proxy, @@ -165,11 +165,11 @@ TAO_Notify_Default_CO_Factory::create_seq_proxy_pushsupplier (TAO_Notify_Consume { // Propagate the parent qos to the supplier CosNotification::QoSProperties_var qos = - parent->get_qos (TAO_ENV_SINGLE_ARG_PARAMETER); + parent->get_qos (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; proxy->set_qos (qos.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -183,7 +183,7 @@ TAO_Notify_Default_CO_Factory::create_seq_proxy_pushsupplier (TAO_Notify_Consume } TAO_Notify_ProxyPushSupplier_i* -TAO_Notify_Default_CO_Factory::create_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL) +TAO_Notify_Default_CO_Factory::create_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent ACE_ENV_ARG_DECL) { TAO_Notify_ProxyPushSupplier_i* proxy; ACE_NEW_THROW_EX (proxy, @@ -193,11 +193,11 @@ TAO_Notify_Default_CO_Factory::create_proxy_pushsupplier (TAO_Notify_ConsumerAdm { // Propagate the parent qos to the supplier CosNotification::QoSProperties_var qos = - parent->get_qos (TAO_ENV_SINGLE_ARG_PARAMETER); + parent->get_qos (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; proxy->set_qos (qos.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -212,7 +212,7 @@ TAO_Notify_Default_CO_Factory::create_proxy_pushsupplier (TAO_Notify_ConsumerAdm TAO_Notify_StructuredProxyPushConsumer_i* -TAO_Notify_Default_CO_Factory::create_struct_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL) +TAO_Notify_Default_CO_Factory::create_struct_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent ACE_ENV_ARG_DECL) { TAO_Notify_StructuredProxyPushConsumer_i* proxy; ACE_NEW_THROW_EX (proxy, @@ -222,11 +222,11 @@ TAO_Notify_Default_CO_Factory::create_struct_proxy_pushconsumer (TAO_Notify_Supp { // Propagate the parent qos to the consumer CosNotification::QoSProperties_var qos = - parent->get_qos (TAO_ENV_SINGLE_ARG_PARAMETER); + parent->get_qos (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; proxy->set_qos (qos.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -240,7 +240,7 @@ TAO_Notify_Default_CO_Factory::create_struct_proxy_pushconsumer (TAO_Notify_Supp } TAO_Notify_ProxyPushConsumer_i* -TAO_Notify_Default_CO_Factory::create_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL) +TAO_Notify_Default_CO_Factory::create_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent ACE_ENV_ARG_DECL) { TAO_Notify_ProxyPushConsumer_i* proxy; ACE_NEW_THROW_EX (proxy, @@ -250,11 +250,11 @@ TAO_Notify_Default_CO_Factory::create_proxy_pushconsumer (TAO_Notify_SupplierAdm { // Propagate the parent qos to the consumer CosNotification::QoSProperties_var qos = - parent->get_qos (TAO_ENV_SINGLE_ARG_PARAMETER); + parent->get_qos (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; proxy->set_qos (qos.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -268,7 +268,7 @@ TAO_Notify_Default_CO_Factory::create_proxy_pushconsumer (TAO_Notify_SupplierAdm } TAO_Notify_SequenceProxyPushConsumer_i* -TAO_Notify_Default_CO_Factory::create_seq_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL) +TAO_Notify_Default_CO_Factory::create_seq_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent ACE_ENV_ARG_DECL) { TAO_Notify_SequenceProxyPushConsumer_i* proxy; ACE_NEW_THROW_EX (proxy, @@ -278,11 +278,11 @@ TAO_Notify_Default_CO_Factory::create_seq_proxy_pushconsumer (TAO_Notify_Supplie { // Propagate the parent qos to the consumer CosNotification::QoSProperties_var qos = - parent->get_qos (TAO_ENV_SINGLE_ARG_PARAMETER); + parent->get_qos (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; proxy->set_qos (qos.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -297,13 +297,13 @@ TAO_Notify_Default_CO_Factory::create_seq_proxy_pushconsumer (TAO_Notify_Supplie ACE_Lock* -TAO_Notify_Default_CO_Factory::create_channel_factory_lock (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Default_CO_Factory::create_channel_factory_lock (ACE_ENV_SINGLE_ARG_DECL) { - return create_event_channel_lock (TAO_ENV_SINGLE_ARG_PARAMETER); + return create_event_channel_lock (ACE_ENV_SINGLE_ARG_PARAMETER); } ACE_Lock* -TAO_Notify_Default_CO_Factory::create_event_channel_lock (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Default_CO_Factory::create_event_channel_lock (ACE_ENV_SINGLE_ARG_DECL) { ACE_Lock* lock; ACE_NEW_THROW_EX (lock, @@ -313,31 +313,31 @@ TAO_Notify_Default_CO_Factory::create_event_channel_lock (TAO_ENV_SINGLE_ARG_DEC } ACE_Lock* -TAO_Notify_Default_CO_Factory::create_consumer_admin_lock (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Default_CO_Factory::create_consumer_admin_lock (ACE_ENV_SINGLE_ARG_DECL) { // Later: - return create_event_channel_lock (TAO_ENV_SINGLE_ARG_PARAMETER); + return create_event_channel_lock (ACE_ENV_SINGLE_ARG_PARAMETER); } ACE_Lock* -TAO_Notify_Default_CO_Factory::create_supplier_admin_lock (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Default_CO_Factory::create_supplier_admin_lock (ACE_ENV_SINGLE_ARG_DECL) { // Later: - return create_event_channel_lock (TAO_ENV_SINGLE_ARG_PARAMETER); + return create_event_channel_lock (ACE_ENV_SINGLE_ARG_PARAMETER); } ACE_Lock* -TAO_Notify_Default_CO_Factory::create_proxy_supplier_lock (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Default_CO_Factory::create_proxy_supplier_lock (ACE_ENV_SINGLE_ARG_DECL) { // Later: - return create_event_channel_lock (TAO_ENV_SINGLE_ARG_PARAMETER); + return create_event_channel_lock (ACE_ENV_SINGLE_ARG_PARAMETER); } ACE_Lock* -TAO_Notify_Default_CO_Factory::create_proxy_consumer_lock (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Default_CO_Factory::create_proxy_consumer_lock (ACE_ENV_SINGLE_ARG_DECL) { // Later: - return create_event_channel_lock (TAO_ENV_SINGLE_ARG_PARAMETER); + return create_event_channel_lock (ACE_ENV_SINGLE_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h index 8dd11836a7b..dda4365bfbf 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h @@ -51,55 +51,55 @@ public: // = TAO_Notify_CO_Factory methods // = Creation methods - TAO_Notify_EventChannel_i* create_event_channel (TAO_Notify_EventChannelFactory_i* parent TAO_ENV_ARG_DECL); + TAO_Notify_EventChannel_i* create_event_channel (TAO_Notify_EventChannelFactory_i* parent ACE_ENV_ARG_DECL); // Create an Event Channel. - TAO_Notify_ConsumerAdmin_i* create_consumer_admin (TAO_Notify_EventChannel_i* channel TAO_ENV_ARG_DECL); + TAO_Notify_ConsumerAdmin_i* create_consumer_admin (TAO_Notify_EventChannel_i* channel ACE_ENV_ARG_DECL); // Create a Consumer Admin. - TAO_Notify_SupplierAdmin_i* create_supplier_admin (TAO_Notify_EventChannel_i* channel TAO_ENV_ARG_DECL); + TAO_Notify_SupplierAdmin_i* create_supplier_admin (TAO_Notify_EventChannel_i* channel ACE_ENV_ARG_DECL); // Create a Supplier Admin. - TAO_Notify_FilterFactory_i* create_filter_factory (TAO_ENV_SINGLE_ARG_DECL); + TAO_Notify_FilterFactory_i* create_filter_factory (ACE_ENV_SINGLE_ARG_DECL); // Create the Filter Factory. // = Proxy Creation methods. - TAO_Notify_StructuredProxyPushSupplier_i* create_struct_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL); + TAO_Notify_StructuredProxyPushSupplier_i* create_struct_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent ACE_ENV_ARG_DECL); // Create a Structured ProxyPushSupplier. - TAO_Notify_SequenceProxyPushSupplier_i* create_seq_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL); + TAO_Notify_SequenceProxyPushSupplier_i* create_seq_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent ACE_ENV_ARG_DECL); // Create a Sequence ProxyPushSupplier. - TAO_Notify_ProxyPushSupplier_i* create_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL); + TAO_Notify_ProxyPushSupplier_i* create_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent ACE_ENV_ARG_DECL); // Create a ProxyPushSupplier. - TAO_Notify_StructuredProxyPushConsumer_i* create_struct_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL); + TAO_Notify_StructuredProxyPushConsumer_i* create_struct_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent ACE_ENV_ARG_DECL); // Create a Structured ProxyPushConsumer. - TAO_Notify_SequenceProxyPushConsumer_i* create_seq_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL); + TAO_Notify_SequenceProxyPushConsumer_i* create_seq_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent ACE_ENV_ARG_DECL); // Create a Sequence ProxyPushConsumer. - TAO_Notify_ProxyPushConsumer_i* create_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL); + TAO_Notify_ProxyPushConsumer_i* create_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent ACE_ENV_ARG_DECL); // Create a ProxyPushConsumer. //= Locks // = Methods to create locks. - ACE_Lock* create_channel_factory_lock (TAO_ENV_SINGLE_ARG_DECL); + ACE_Lock* create_channel_factory_lock (ACE_ENV_SINGLE_ARG_DECL); // Create lock type used by channel factory. - ACE_Lock* create_event_channel_lock (TAO_ENV_SINGLE_ARG_DECL); + ACE_Lock* create_event_channel_lock (ACE_ENV_SINGLE_ARG_DECL); // Create lock type used by EC's. - ACE_Lock* create_consumer_admin_lock (TAO_ENV_SINGLE_ARG_DECL); + ACE_Lock* create_consumer_admin_lock (ACE_ENV_SINGLE_ARG_DECL); // Create lock type used by Consumer Admin's. - ACE_Lock* create_supplier_admin_lock (TAO_ENV_SINGLE_ARG_DECL); + ACE_Lock* create_supplier_admin_lock (ACE_ENV_SINGLE_ARG_DECL); // Create lock type used by Supplier Admin's. - ACE_Lock* create_proxy_supplier_lock (TAO_ENV_SINGLE_ARG_DECL); + ACE_Lock* create_proxy_supplier_lock (ACE_ENV_SINGLE_ARG_DECL); // Create lock type used by proxy supplier. - ACE_Lock* create_proxy_consumer_lock (TAO_ENV_SINGLE_ARG_DECL); + ACE_Lock* create_proxy_consumer_lock (ACE_ENV_SINGLE_ARG_DECL); // Create lock type used by proxy consumer. }; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp index da83f014891..a5a3eaf53de 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp @@ -39,7 +39,7 @@ TAO_Notify_Default_Collection_Factory::fini (void) } TAO_Notify_EventListener_List* -TAO_Notify_Default_Collection_Factory::create_event_listener_list (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) +TAO_Notify_Default_Collection_Factory::create_event_listener_list (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/) { // @@ Pradeep: the copy_on_write versions are a much better choice // for a default than the immediate changes version. The latter @@ -68,7 +68,7 @@ ACE_NEW_THROW_EX (listener_list, } TAO_Notify_UpdateListener_List* -TAO_Notify_Default_Collection_Factory::create_update_listener_list (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) +TAO_Notify_Default_Collection_Factory::create_update_listener_list (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/) { /* TAO_Notify_UpdateListener_List* listener_list = diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h index 78c621a790d..1d8dca43561 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h @@ -51,10 +51,10 @@ public: virtual int fini (void); // = Methods to create listener collections. - virtual TAO_Notify_EventListener_List* create_event_listener_list (TAO_ENV_SINGLE_ARG_DECL); + virtual TAO_Notify_EventListener_List* create_event_listener_list (ACE_ENV_SINGLE_ARG_DECL); // Create the event listener list. - virtual TAO_Notify_UpdateListener_List* create_update_listener_list (TAO_ENV_SINGLE_ARG_DECL); + virtual TAO_Notify_UpdateListener_List* create_update_listener_list (ACE_ENV_SINGLE_ARG_DECL); // create update listener list. }; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp index 8504fedf3a2..82bf4ee4b74 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp @@ -129,7 +129,7 @@ TAO_Notify_Default_EMO_Factory::init (int argc, char* argv[]) } TAO_Notify_Worker_Task* -TAO_Notify_Default_EMO_Factory::create_task (int mt, int tp_size TAO_ENV_ARG_DECL) +TAO_Notify_Default_EMO_Factory::create_task (int mt, int tp_size ACE_ENV_ARG_DECL) { TAO_Notify_Worker_Task* task; @@ -166,21 +166,21 @@ TAO_Notify_Default_EMO_Factory::init_instance (void) int TAO_Notify_Default_EMO_Factory::preallocate_tasks (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; this->prealloc_source_eval_task_ = create_task (EMO_OPTIONS::instance ()->mt_source_eval_, EMO_OPTIONS::instance ()->source_threads_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->prealloc_listener_eval_task_ = create_task (EMO_OPTIONS::instance ()->mt_listener_eval_, EMO_OPTIONS::instance ()->listener_threads_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->prealloc_dispatching_task_ = create_task (EMO_OPTIONS::instance ()->mt_dispatching_, EMO_OPTIONS::instance ()->dispatching_threads_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -194,7 +194,7 @@ TAO_Notify_Default_EMO_Factory::fini (void) } TAO_Notify_Event_Manager* -TAO_Notify_Default_EMO_Factory::create_event_manager (TAO_Notify_EventChannel_i* channel TAO_ENV_ARG_DECL) +TAO_Notify_Default_EMO_Factory::create_event_manager (TAO_Notify_EventChannel_i* channel ACE_ENV_ARG_DECL) { TAO_Notify_Event_Manager* event_manager; ACE_NEW_THROW_EX (event_manager, @@ -204,7 +204,7 @@ TAO_Notify_Default_EMO_Factory::create_event_manager (TAO_Notify_EventChannel_i* } TAO_Notify_Event_Map* -TAO_Notify_Default_EMO_Factory::create_event_map (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Default_EMO_Factory::create_event_map (ACE_ENV_SINGLE_ARG_DECL) { TAO_Notify_Event_Map* event_map; ACE_NEW_THROW_EX (event_map, @@ -214,7 +214,7 @@ TAO_Notify_Default_EMO_Factory::create_event_map (TAO_ENV_SINGLE_ARG_DECL) } TAO_Notify_Event_Processor* -TAO_Notify_Default_EMO_Factory::create_event_processor (TAO_Notify_Event_Manager* event_manager TAO_ENV_ARG_DECL) +TAO_Notify_Default_EMO_Factory::create_event_processor (TAO_Notify_Event_Manager* event_manager ACE_ENV_ARG_DECL) { TAO_Notify_Event_Processor* event_processor; ACE_NEW_THROW_EX (event_processor, @@ -225,49 +225,49 @@ TAO_Notify_Default_EMO_Factory::create_event_processor (TAO_Notify_Event_Manager TAO_Notify_Worker_Task* -TAO_Notify_Default_EMO_Factory::create_source_eval_task (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Default_EMO_Factory::create_source_eval_task (ACE_ENV_SINGLE_ARG_DECL) { if (EMO_OPTIONS::instance ()->alloc_task_per_proxy_ == 1) return create_task (EMO_OPTIONS::instance ()->mt_source_eval_, EMO_OPTIONS::instance ()->source_threads_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); else return prealloc_source_eval_task_; } TAO_Notify_Worker_Task* -TAO_Notify_Default_EMO_Factory::create_lookup_task (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Default_EMO_Factory::create_lookup_task (ACE_ENV_SINGLE_ARG_DECL) { return create_task (EMO_OPTIONS::instance ()->mt_lookup_, - EMO_OPTIONS::instance ()->lookup_threads_ TAO_ENV_ARG_PARAMETER); + EMO_OPTIONS::instance ()->lookup_threads_ ACE_ENV_ARG_PARAMETER); } TAO_Notify_Worker_Task* -TAO_Notify_Default_EMO_Factory::create_listener_eval_task (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Default_EMO_Factory::create_listener_eval_task (ACE_ENV_SINGLE_ARG_DECL) { if (EMO_OPTIONS::instance ()->alloc_task_per_proxy_ == 1) return create_task (EMO_OPTIONS::instance ()->mt_listener_eval_, EMO_OPTIONS::instance ()->listener_threads_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); else return prealloc_listener_eval_task_; } TAO_Notify_Worker_Task* -TAO_Notify_Default_EMO_Factory::create_dispatching_task (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Default_EMO_Factory::create_dispatching_task (ACE_ENV_SINGLE_ARG_DECL) { if (EMO_OPTIONS::instance ()->alloc_task_per_proxy_ == 1) return create_task (EMO_OPTIONS::instance ()->mt_dispatching_, EMO_OPTIONS::instance ()->dispatching_threads_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); else return prealloc_dispatching_task_; } TAO_Notify_Worker_Task* -TAO_Notify_Default_EMO_Factory::create_updates_task (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Default_EMO_Factory::create_updates_task (ACE_ENV_SINGLE_ARG_DECL) { - return create_task (EMO_OPTIONS::instance ()->asynch_updates_, ASYNCH_UPDATES_THREADS TAO_ENV_ARG_PARAMETER); + return create_task (EMO_OPTIONS::instance ()->asynch_updates_, ASYNCH_UPDATES_THREADS ACE_ENV_ARG_PARAMETER); } void diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h index 18ada3e25f0..0157a74f071 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h @@ -70,21 +70,21 @@ class TAO_Notify_Export TAO_Notify_Default_EMO_Factory : public TAO_Notify_EMO_F virtual int init (int argc, char* argv[]); virtual int fini (void); - virtual TAO_Notify_Event_Manager* create_event_manager (TAO_Notify_EventChannel_i* channel TAO_ENV_ARG_DECL); + virtual TAO_Notify_Event_Manager* create_event_manager (TAO_Notify_EventChannel_i* channel ACE_ENV_ARG_DECL); // Create an event manager. - virtual TAO_Notify_Event_Map* create_event_map (TAO_ENV_SINGLE_ARG_DECL); + virtual TAO_Notify_Event_Map* create_event_map (ACE_ENV_SINGLE_ARG_DECL); // Create the event map. - virtual TAO_Notify_Event_Processor* create_event_processor (TAO_Notify_Event_Manager* event_manager TAO_ENV_ARG_DECL); + virtual TAO_Notify_Event_Processor* create_event_processor (TAO_Notify_Event_Manager* event_manager ACE_ENV_ARG_DECL); // Create event processor. // = Create processing tasks. - virtual TAO_Notify_Worker_Task* create_source_eval_task (TAO_ENV_SINGLE_ARG_DECL); - virtual TAO_Notify_Worker_Task* create_lookup_task (TAO_ENV_SINGLE_ARG_DECL); - virtual TAO_Notify_Worker_Task* create_listener_eval_task ( TAO_ENV_SINGLE_ARG_DECL); - virtual TAO_Notify_Worker_Task* create_dispatching_task (TAO_ENV_SINGLE_ARG_DECL); - virtual TAO_Notify_Worker_Task* create_updates_task (TAO_ENV_SINGLE_ARG_DECL); + virtual TAO_Notify_Worker_Task* create_source_eval_task (ACE_ENV_SINGLE_ARG_DECL); + virtual TAO_Notify_Worker_Task* create_lookup_task (ACE_ENV_SINGLE_ARG_DECL); + virtual TAO_Notify_Worker_Task* create_listener_eval_task ( ACE_ENV_SINGLE_ARG_DECL); + virtual TAO_Notify_Worker_Task* create_dispatching_task (ACE_ENV_SINGLE_ARG_DECL); + virtual TAO_Notify_Worker_Task* create_updates_task (ACE_ENV_SINGLE_ARG_DECL); virtual void destroy_source_eval_task (TAO_Notify_Worker_Task* task); virtual void destroy_lookup_task (TAO_Notify_Worker_Task* task); @@ -97,7 +97,7 @@ class TAO_Notify_Export TAO_Notify_Default_EMO_Factory : public TAO_Notify_EMO_F protected: //= Protected Methods - TAO_Notify_Worker_Task* create_task (int mt, int tp_size TAO_ENV_ARG_DECL); + TAO_Notify_Worker_Task* create_task (int mt, int tp_size ACE_ENV_ARG_DECL); // Create a worker task, mt => is this a MT task, if so, tp_size is thread pool size. int preallocate_tasks (void); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp index 6db78cedef9..578a10b5878 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp @@ -36,59 +36,59 @@ TAO_Notify_Default_POA_Factory::fini (void) } PortableServer::POA_ptr -TAO_Notify_Default_POA_Factory::create_event_channel_POA (PortableServer::POA_ptr parent_poa TAO_ENV_ARG_DECL) +TAO_Notify_Default_POA_Factory::create_event_channel_POA (PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL) { return this->create_generic_childPOA_i (EC_POA_NAME, - parent_poa TAO_ENV_ARG_PARAMETER); + parent_poa ACE_ENV_ARG_PARAMETER); } PortableServer::POA_ptr -TAO_Notify_Default_POA_Factory::create_supplier_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL) +TAO_Notify_Default_POA_Factory::create_supplier_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id ACE_ENV_ARG_DECL) { char child_poa_name[BUFSIZ]; ACE_OS::sprintf (child_poa_name, "%d%s", new_poa_id, "SA"); return this->create_generic_childPOA_i (child_poa_name, parent_poa - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } PortableServer::POA_ptr -TAO_Notify_Default_POA_Factory::create_consumer_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL) +TAO_Notify_Default_POA_Factory::create_consumer_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id ACE_ENV_ARG_DECL) { char child_poa_name[BUFSIZ]; ACE_OS::sprintf (child_poa_name, "%d%s", new_poa_id, "CA"); return this->create_generic_childPOA_i (child_poa_name, - parent_poa TAO_ENV_ARG_PARAMETER); + parent_poa ACE_ENV_ARG_PARAMETER); } PortableServer::POA_ptr -TAO_Notify_Default_POA_Factory::create_proxy_pushconsumer_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL) +TAO_Notify_Default_POA_Factory::create_proxy_pushconsumer_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id ACE_ENV_ARG_DECL) { char child_poa_name[BUFSIZ]; ACE_OS::sprintf (child_poa_name, "%d%s", new_poa_id, "PPC"); return this->create_generic_childPOA_i (child_poa_name, - parent_poa TAO_ENV_ARG_PARAMETER); + parent_poa ACE_ENV_ARG_PARAMETER); } PortableServer::POA_ptr -TAO_Notify_Default_POA_Factory::create_proxy_pushsupplier_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL) +TAO_Notify_Default_POA_Factory::create_proxy_pushsupplier_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id ACE_ENV_ARG_DECL) { char child_poa_name[BUFSIZ]; ACE_OS::sprintf (child_poa_name, "%d%s", new_poa_id, "PPS"); return this->create_generic_childPOA_i (child_poa_name, - parent_poa TAO_ENV_ARG_PARAMETER); + parent_poa ACE_ENV_ARG_PARAMETER); } PortableServer::POA_ptr -TAO_Notify_Default_POA_Factory::create_generic_childPOA_i (const char* child_poa_name, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL) +TAO_Notify_Default_POA_Factory::create_generic_childPOA_i (const char* child_poa_name, PortableServer::POA_ptr poa ACE_ENV_ARG_DECL) { // @@ Pradeep: if the Notification service is ever going to be // persistent or fault tolerant you may need to create this stuff @@ -100,16 +100,16 @@ TAO_Notify_Default_POA_Factory::create_generic_childPOA_i (const char* child_poa // to detect duplicates for us. PortableServer::IdUniquenessPolicy_var idpolicy = poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil()); PortableServer::IdAssignmentPolicy_var assignpolicy = poa->create_id_assignment_policy (PortableServer::USER_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil ()); PortableServer::POAManager_var manager = - poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // Create a PolicyList @@ -126,10 +126,10 @@ TAO_Notify_Default_POA_Factory::create_generic_childPOA_i (const char* child_poa PortableServer::POA_var poa_ret = poa->create_POA (child_poa_name, manager.in (), policy_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil()); - idpolicy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + idpolicy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil()); assignpolicy->destroy (); @@ -169,7 +169,7 @@ TAO_Notify_Default_POA_Factory::long_to_ObjectId (const CORBA::Long id) } CORBA::Object_ptr -TAO_Notify_Default_POA_Factory::activate_object_with_id (CORBA::Long id, PortableServer::POA_ptr poa, PortableServer::Servant servant TAO_ENV_ARG_DECL) +TAO_Notify_Default_POA_Factory::activate_object_with_id (CORBA::Long id, PortableServer::POA_ptr poa, PortableServer::Servant servant ACE_ENV_ARG_DECL) { // Convert CORBA::Long to ObjectId PortableServer::ObjectId_var oid = @@ -177,75 +177,75 @@ TAO_Notify_Default_POA_Factory::activate_object_with_id (CORBA::Long id, Portabl poa->activate_object_with_id (oid.in (), servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); return poa->id_to_reference (oid.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Object_ptr -TAO_Notify_Default_POA_Factory::activate_object (PortableServer::POA_ptr poa, PortableServer::Servant servant TAO_ENV_ARG_DECL) +TAO_Notify_Default_POA_Factory::activate_object (PortableServer::POA_ptr poa, PortableServer::Servant servant ACE_ENV_ARG_DECL) { - PortableServer::ObjectId_var oid = poa->activate_object (servant TAO_ENV_ARG_PARAMETER); + PortableServer::ObjectId_var oid = poa->activate_object (servant ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); - return poa->id_to_reference (oid.in () TAO_ENV_ARG_PARAMETER); + return poa->id_to_reference (oid.in () ACE_ENV_ARG_PARAMETER); } CORBA::Object_ptr -TAO_Notify_Default_POA_Factory::servant_to_reference (PortableServer::POA_ptr poa, PortableServer::Servant servant TAO_ENV_ARG_DECL) +TAO_Notify_Default_POA_Factory::servant_to_reference (PortableServer::POA_ptr poa, PortableServer::Servant servant ACE_ENV_ARG_DECL) { - PortableServer::ObjectId_var oid = poa->servant_to_id (servant TAO_ENV_ARG_PARAMETER); + PortableServer::ObjectId_var oid = poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); - return poa->id_to_reference (oid.in () TAO_ENV_ARG_PARAMETER); + return poa->id_to_reference (oid.in () ACE_ENV_ARG_PARAMETER); } CORBA::Object_ptr -TAO_Notify_Default_POA_Factory::id_to_reference (CORBA::Long id, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL) +TAO_Notify_Default_POA_Factory::id_to_reference (CORBA::Long id, PortableServer::POA_ptr poa ACE_ENV_ARG_DECL) { // Convert CORBA::Long to ObjectId PortableServer::ObjectId_var oid = this->long_to_ObjectId (id); return poa->id_to_reference (oid.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_Default_POA_Factory::destroy_POA (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL) +TAO_Notify_Default_POA_Factory::destroy_POA (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL) { if (!CORBA::is_nil (poa)) - poa->destroy (1,0 TAO_ENV_ARG_PARAMETER); + poa->destroy (1,0 ACE_ENV_ARG_PARAMETER); // The flag causes a deadlock when destroying the POA // because we are involved in an upcall. // TODO:I have to think about what the implications of not waiting are. } void -TAO_Notify_Default_POA_Factory::deactivate_object (CORBA::Object_ptr obj, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL) +TAO_Notify_Default_POA_Factory::deactivate_object (CORBA::Object_ptr obj, PortableServer::POA_ptr poa ACE_ENV_ARG_DECL) { if (CORBA::is_nil (poa) || CORBA::is_nil (obj)) return; PortableServer::ObjectId_var id = - poa->reference_to_id (obj TAO_ENV_ARG_PARAMETER); + poa->reference_to_id (obj ACE_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_Notify_Default_POA_Factory::deactivate_object (PortableServer::Servant servant, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL) +TAO_Notify_Default_POA_Factory::deactivate_object (PortableServer::Servant servant, PortableServer::POA_ptr poa ACE_ENV_ARG_DECL) { if (CORBA::is_nil (poa) || servant == 0) return; PortableServer::ObjectId_var id = - poa->servant_to_id (servant TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h index 44b314cfdf0..0d327a128b2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h @@ -47,41 +47,41 @@ public: virtual int init (int argc, char* argv[]); virtual int fini (void); - PortableServer::POA_ptr create_event_channel_POA (PortableServer::POA_ptr parent_poa TAO_ENV_ARG_DECL); + PortableServer::POA_ptr create_event_channel_POA (PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL); // Create the POA to activate Event Channels in. - PortableServer::POA_ptr create_supplier_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL); + PortableServer::POA_ptr create_supplier_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id ACE_ENV_ARG_DECL); // Create the POA to activate SA's in. - PortableServer::POA_ptr create_consumer_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL); + PortableServer::POA_ptr create_consumer_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id ACE_ENV_ARG_DECL); // Create the POA to activate CA's in. - PortableServer::POA_ptr create_proxy_pushconsumer_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL); + PortableServer::POA_ptr create_proxy_pushconsumer_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id ACE_ENV_ARG_DECL); // Create the POA to activate proxy push consumers in. - PortableServer::POA_ptr create_proxy_pushsupplier_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL); + PortableServer::POA_ptr create_proxy_pushsupplier_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id ACE_ENV_ARG_DECL); // Create the POA to activate proxy push suppliers in. // = Object activation and POA methods - CORBA::Object_ptr activate_object_with_id (CORBA::Long id, PortableServer::POA_ptr poa,PortableServer::Servant servant TAO_ENV_ARG_DECL); + CORBA::Object_ptr activate_object_with_id (CORBA::Long id, PortableServer::POA_ptr poa,PortableServer::Servant servant ACE_ENV_ARG_DECL); // Converts to an ObjectId and registers with the POA . - CORBA::Object_ptr activate_object (PortableServer::POA_ptr poa,PortableServer::Servant servant TAO_ENV_ARG_DECL); + CORBA::Object_ptr activate_object (PortableServer::POA_ptr poa,PortableServer::Servant servant ACE_ENV_ARG_DECL); // Registers with the POA . - CORBA::Object_ptr servant_to_reference (PortableServer::POA_ptr poa,PortableServer::Servant servant TAO_ENV_ARG_DECL); + CORBA::Object_ptr servant_to_reference (PortableServer::POA_ptr poa,PortableServer::Servant servant ACE_ENV_ARG_DECL); // Registers with the POA . - CORBA::Object_ptr id_to_reference (CORBA::Long id, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL); + CORBA::Object_ptr id_to_reference (CORBA::Long id, PortableServer::POA_ptr poa ACE_ENV_ARG_DECL); // Look for the Object with id in . - void destroy_POA (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL); + void destroy_POA (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL); // Destroy the - void deactivate_object (CORBA::Object_ptr obj, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL); + void deactivate_object (CORBA::Object_ptr obj, PortableServer::POA_ptr poa ACE_ENV_ARG_DECL); // Deactivate the object. - void deactivate_object (PortableServer::Servant servant, PortableServer::POA_ptr TAO_ENV_ARG_DECL); + void deactivate_object (PortableServer::Servant servant, PortableServer::POA_ptr ACE_ENV_ARG_DECL); // Deactivate the object. protected: @@ -90,7 +90,7 @@ protected: PortableServer::ObjectId* long_to_ObjectId (const CORBA::Long id); // Converts a CORBA::Long to an ObjectId - PortableServer::POA_ptr create_generic_childPOA_i (const char* child_poa_name, PortableServer::POA_ptr parent_poa TAO_ENV_ARG_DECL); + PortableServer::POA_ptr create_generic_childPOA_i (const char* child_poa_name, PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL); // Create the POA with the most generic policies required of our POA's. }; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.cpp index 32a2f1f4798..c4ea39c8e9a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.cpp @@ -246,30 +246,30 @@ TAO_Notify_Any::event_type (void) const CORBA::Boolean TAO_Notify_Any::do_match (CosNotifyFilter::Filter_ptr filter - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " "TAO_Notify_Any::do_match ()\n")); - return filter->match (*this->data_ TAO_ENV_ARG_PARAMETER); + return filter->match (*this->data_ ACE_ENV_ARG_PARAMETER); } void TAO_Notify_Any::do_push (CosEventComm::PushConsumer_ptr consumer - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " "TAO_Notify_Any::do_push (" "CosEventComm::PushConsumer_ptr)\n")); - consumer->push (*this->data_ TAO_ENV_ARG_PARAMETER); + consumer->push (*this->data_ ACE_ENV_ARG_PARAMETER); } void TAO_Notify_Any::do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " @@ -282,7 +282,7 @@ TAO_Notify_Any::do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer event.header.fixed_header.event_type.type_name = CORBA::string_dup ("%ANY"); event.header.fixed_header.event_type.domain_name = CORBA::string_dup (""); - consumer->push_structured_event (event TAO_ENV_ARG_PARAMETER); + consumer->push_structured_event (event ACE_ENV_ARG_PARAMETER); } void @@ -290,7 +290,7 @@ TAO_Notify_Any::do_push (CosNotifyComm::SequencePushConsumer_ptr consumer, const TAO_Notify_QoSAdmin_i& /*qos_admin*/, CosNotification::EventBatch& /*unsent*/, int /*flush_queue*/ - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " @@ -307,7 +307,7 @@ TAO_Notify_Any::do_push (CosNotifyComm::SequencePushConsumer_ptr consumer, events.length (1); events[0] = event; - consumer->push_structured_events (events TAO_ENV_ARG_PARAMETER); + consumer->push_structured_events (events ACE_ENV_ARG_PARAMETER); } // **************************************************************** @@ -420,18 +420,18 @@ TAO_Notify_StructuredEvent::event_type (void) const CORBA::Boolean TAO_Notify_StructuredEvent::do_match (CosNotifyFilter::Filter_ptr filter - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " "TAO_Notify_StructuredEvent::do_match ()\n")); - return filter->match_structured (*this->data_ TAO_ENV_ARG_PARAMETER); + return filter->match_structured (*this->data_ ACE_ENV_ARG_PARAMETER); } void TAO_Notify_StructuredEvent::do_push (CosEventComm::PushConsumer_ptr consumer - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " @@ -443,18 +443,18 @@ TAO_Notify_StructuredEvent::do_push (CosEventComm::PushConsumer_ptr consumer any <<= *this->data_; // is the typecode set by this operation or do we need to set it explicity. - consumer->push (any TAO_ENV_ARG_PARAMETER); + consumer->push (any ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_StructuredEvent::do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer TAO_ENV_ARG_DECL) const +TAO_Notify_StructuredEvent::do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer ACE_ENV_ARG_DECL) const { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " "TAO_Notify_StructuredEvent::do_push (" "CosNotifyComm::StructuredPushConsumer_ptr)\n")); - consumer->push_structured_event (*this->data_ TAO_ENV_ARG_PARAMETER); + consumer->push_structured_event (*this->data_ ACE_ENV_ARG_PARAMETER); } void @@ -462,7 +462,7 @@ TAO_Notify_StructuredEvent::do_push (CosNotifyComm::SequencePushConsumer_ptr con const TAO_Notify_QoSAdmin_i& /*qos_admin*/, CosNotification::EventBatch& /*unsent*/, int /*flush_queue*/ - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " @@ -473,5 +473,5 @@ TAO_Notify_StructuredEvent::do_push (CosNotifyComm::SequencePushConsumer_ptr con events.length (1); events[0] = *this->data_; - consumer->push_structured_events (events TAO_ENV_ARG_PARAMETER); + consumer->push_structured_events (events ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.h index a659e89a038..524c4d2ef37 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.h @@ -126,16 +126,16 @@ public: // ownership of the data to the new object otherwise we copy the data // for the new object. - virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter TAO_ENV_ARG_DECL) = 0; + virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL) = 0; // Returns true if the filter matches. - virtual void do_push (CosEventComm::PushConsumer_ptr consumer TAO_ENV_ARG_DECL) const = 0; - virtual void do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer TAO_ENV_ARG_DECL) const = 0; + virtual void do_push (CosEventComm::PushConsumer_ptr consumer ACE_ENV_ARG_DECL) const = 0; + virtual void do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer ACE_ENV_ARG_DECL) const = 0; virtual void do_push (CosNotifyComm::SequencePushConsumer_ptr consumer, const TAO_Notify_QoSAdmin_i& qos_admin, CosNotification::EventBatch& unsent, int flush_queue - TAO_ENV_ARG_DECL) const = 0; + ACE_ENV_ARG_DECL) const = 0; // Push self to // = QoS Properties. @@ -206,14 +206,14 @@ public: virtual CORBA::Boolean is_special_event_type (void) const; virtual const TAO_Notify_EventType& event_type (void) const; - virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter TAO_ENV_ARG_DECL); - virtual void do_push (CosEventComm::PushConsumer_ptr consumer TAO_ENV_ARG_DECL) const; - virtual void do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer TAO_ENV_ARG_DECL) const; + virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL); + virtual void do_push (CosEventComm::PushConsumer_ptr consumer ACE_ENV_ARG_DECL) const; + virtual void do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer ACE_ENV_ARG_DECL) const; virtual void do_push (CosNotifyComm::SequencePushConsumer_ptr consumer, const TAO_Notify_QoSAdmin_i& qos_admin, CosNotification::EventBatch& unsent, int flush_queue - TAO_ENV_ARG_DECL) const; + ACE_ENV_ARG_DECL) const; protected: CORBA::Any* data_; @@ -243,14 +243,14 @@ public: virtual CORBA::Boolean is_special_event_type (void) const; virtual const TAO_Notify_EventType& event_type (void) const; - virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter TAO_ENV_ARG_DECL); - virtual void do_push (CosEventComm::PushConsumer_ptr consumer TAO_ENV_ARG_DECL) const; - virtual void do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer TAO_ENV_ARG_DECL) const; + virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL); + virtual void do_push (CosEventComm::PushConsumer_ptr consumer ACE_ENV_ARG_DECL) const; + virtual void do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer ACE_ENV_ARG_DECL) const; virtual void do_push (CosNotifyComm::SequencePushConsumer_ptr consumer, const TAO_Notify_QoSAdmin_i& qos_admin, CosNotification::EventBatch& unsent, int flush_queue - TAO_ENV_ARG_DECL) const; + ACE_ENV_ARG_DECL) const; protected: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp index 708164dc121..6e98a60de08 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp @@ -23,7 +23,7 @@ TAO_Notify_EventChannelFactory_i::~TAO_Notify_EventChannelFactory_i (void) } CosNotifyChannelAdmin::EventChannelFactory_ptr -TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA TAO_ENV_ARG_DECL) +TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA ACE_ENV_ARG_DECL) { TAO_Notify_EventChannelFactory_i* channelfactory; ACE_NEW_THROW_EX (channelfactory, @@ -33,22 +33,22 @@ TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA TA PortableServer::ServantBase_var channelfactory_var (channelfactory); - channelfactory->init_i (default_POA TAO_ENV_ARG_PARAMETER); + channelfactory->init_i (default_POA ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannelFactory::_nil ()); CORBA::Object_var obj = channelfactory->poa_factory_-> activate_object (channelfactory->my_POA_.in (), - channelfactory TAO_ENV_ARG_PARAMETER); + channelfactory ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannelFactory::_nil ()); return CosNotifyChannelAdmin::EventChannelFactory - ::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + ::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_EventChannelFactory_i::init_i (PortableServer::POA_ptr default_POA TAO_ENV_ARG_DECL) +TAO_Notify_EventChannelFactory_i::init_i (PortableServer::POA_ptr default_POA ACE_ENV_ARG_DECL) { - TAO_Notify_Factory::init (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Notify_Factory::init (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->my_POA_ = PortableServer::POA::_duplicate (default_POA); @@ -60,23 +60,23 @@ TAO_Notify_EventChannelFactory_i::init_i (PortableServer::POA_ptr default_POA TA // The POA that we should activate the Event Channels in. this->ec_POA_ = this->poa_factory_-> - create_event_channel_POA (this->my_POA_.in () TAO_ENV_ARG_PARAMETER); + create_event_channel_POA (this->my_POA_.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->lock_ = - this->channel_objects_factory_->create_channel_factory_lock (TAO_ENV_SINGLE_ARG_PARAMETER); + this->channel_objects_factory_->create_channel_factory_lock (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->default_filter_factory_ = - this->create_default_filter_factory_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->create_default_filter_factory_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CosNotifyChannelAdmin::EventChannelFactory_ptr -TAO_Notify_EventChannelFactory_i::get_ref (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_EventChannelFactory_i::get_ref (ACE_ENV_SINGLE_ARG_DECL) { return CosNotifyChannelAdmin::EventChannelFactory ::_narrow (this->poa_factory_-> - servant_to_reference (this->my_POA_.in (), this TAO_ENV_ARG_PARAMETER)); + servant_to_reference (this->my_POA_.in (), this ACE_ENV_ARG_PARAMETER)); } void @@ -88,33 +88,33 @@ TAO_Notify_EventChannelFactory_i::event_channel_destroyed (CosNotifyChannelAdmin ACE_DEBUG ((LM_DEBUG, "event_channel_destroyed %d\n", channel_id)); } -void TAO_Notify_EventChannelFactory_i::shutdown (TAO_ENV_SINGLE_ARG_DECL -#if !defined (TAO_HAS_EXCEPTIONS) || defined (TAO_ENV_BKWD_COMPAT) +void TAO_Notify_EventChannelFactory_i::shutdown (ACE_ENV_SINGLE_ARG_DECL +#if !defined (TAO_HAS_EXCEPTIONS) || defined (ACE_ENV_BKWD_COMPAT) , #endif CORBA::Boolean destroy_children) { if (destroy_children == 1) { - this->poa_factory_->destroy_POA (this->ec_POA_.in () TAO_ENV_ARG_PARAMETER); + this->poa_factory_->destroy_POA (this->ec_POA_.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->poa_factory_->deactivate_object(this->default_filter_factory_.in (), this->my_POA_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } // Deactivate ourselves. this->poa_factory_->deactivate_object (this, this->my_POA_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CosNotifyChannelAdmin::EventChannel_ptr TAO_Notify_EventChannelFactory_i::create_channel(const CosNotification::QoSProperties& initial_qos, const CosNotification::AdminProperties& initial_admin, CosNotifyChannelAdmin::ChannelID_out ec_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -124,7 +124,7 @@ TAO_Notify_EventChannelFactory_i::create_channel(const CosNotification::QoSPrope { TAO_Notify_EventChannel_i* channel = this->channel_objects_factory_->create_event_channel (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil ()); PortableServer::ServantBase_var channel_var (channel); @@ -140,12 +140,12 @@ TAO_Notify_EventChannelFactory_i::create_channel(const CosNotification::QoSPrope } channel->init (ec_id, initial_qos, initial_admin, this->my_POA_.in (), this->ec_POA_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil ()); CORBA::Object_var obj = this->poa_factory_-> activate_object_with_id (ec_id, this->ec_POA_.in (), channel - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil ()); this->ec_ids_.next (); @@ -153,18 +153,18 @@ TAO_Notify_EventChannelFactory_i::create_channel(const CosNotification::QoSPrope } CosNotifyChannelAdmin::ChannelIDSeq* -TAO_Notify_EventChannelFactory_i::get_all_channels (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_EventChannelFactory_i::get_all_channels (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); - return this->ec_ids_.get_sequence (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->ec_ids_.get_sequence (ACE_ENV_SINGLE_ARG_PARAMETER); } CosNotifyChannelAdmin::EventChannel_ptr -TAO_Notify_EventChannelFactory_i::get_event_channel (CosNotifyChannelAdmin::ChannelID id TAO_ENV_ARG_DECL) +TAO_Notify_EventChannelFactory_i::get_event_channel (CosNotifyChannelAdmin::ChannelID id ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyChannelAdmin::ChannelNotFound @@ -175,7 +175,7 @@ TAO_Notify_EventChannelFactory_i::get_event_channel (CosNotifyChannelAdmin::Chan ACE_TRY { obj = this->poa_factory_->id_to_reference (id, this->ec_POA_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY // Translate any exception to "not found" @@ -185,14 +185,14 @@ TAO_Notify_EventChannelFactory_i::get_event_channel (CosNotifyChannelAdmin::Chan ACE_ENDTRY; ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil ()); - return CosNotifyChannelAdmin::EventChannel::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + return CosNotifyChannelAdmin::EventChannel::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); } CosNotifyFilter::FilterFactory_ptr -TAO_Notify_EventChannelFactory_i::create_default_filter_factory_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_EventChannelFactory_i::create_default_filter_factory_i (ACE_ENV_SINGLE_ARG_DECL) { TAO_Notify_FilterFactory_i* filterfactory = - this->channel_objects_factory_->create_filter_factory (TAO_ENV_SINGLE_ARG_PARAMETER); + this->channel_objects_factory_->create_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyFilter::FilterFactory::_nil ()); PortableServer::ServantBase_var filterfactory_var (filterfactory); @@ -202,7 +202,7 @@ TAO_Notify_EventChannelFactory_i::create_default_filter_factory_i (TAO_ENV_SINGL CORBA::Object_var obj = this->poa_factory_->activate_object (this->my_POA_.in (), - filterfactory TAO_ENV_ARG_PARAMETER); + filterfactory ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyFilter::FilterFactory::_nil ()); return CosNotifyFilter::FilterFactory::_narrow (obj.in ()); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h index 243a60aa35d..7bbde23e510 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h @@ -61,15 +61,15 @@ public: virtual ~TAO_Notify_EventChannelFactory_i (void); // Destructor - static CosNotifyChannelAdmin::EventChannelFactory_ptr create (PortableServer::POA_ptr default_POA TAO_ENV_ARG_DECL); + static CosNotifyChannelAdmin::EventChannelFactory_ptr create (PortableServer::POA_ptr default_POA ACE_ENV_ARG_DECL); // Create a factory servant and activates it with the default POA. // Also creates a resource factory and assigns it this default_POA. - CosNotifyChannelAdmin::EventChannelFactory_ptr get_ref (TAO_ENV_SINGLE_ARG_DECL); + CosNotifyChannelAdmin::EventChannelFactory_ptr get_ref (ACE_ENV_SINGLE_ARG_DECL); // Get the CORBA object. - void shutdown (TAO_ENV_SINGLE_ARG_DECL -#if !defined (TAO_HAS_EXCEPTIONS) || defined (TAO_ENV_BKWD_COMPAT) + void shutdown (ACE_ENV_SINGLE_ARG_DECL +#if !defined (TAO_HAS_EXCEPTIONS) || defined (ACE_ENV_BKWD_COMPAT) , // This is ugly -- destroy_children should come BEFORE the env arg. #endif CORBA::Boolean destroy_children = 0); @@ -89,7 +89,7 @@ virtual CosNotifyChannelAdmin::EventChannel_ptr create_channel ( const CosNotification::QoSProperties & initial_qos, const CosNotification::AdminProperties & initial_admin, CosNotifyChannelAdmin::ChannelID_out id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -98,7 +98,7 @@ virtual CosNotifyChannelAdmin::EventChannel_ptr create_channel ( )); virtual CosNotifyChannelAdmin::ChannelIDSeq * get_all_channels ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -106,7 +106,7 @@ virtual CosNotifyChannelAdmin::ChannelIDSeq * get_all_channels ( virtual CosNotifyChannelAdmin::EventChannel_ptr get_event_channel ( CosNotifyChannelAdmin::ChannelID id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -117,10 +117,10 @@ virtual CosNotifyChannelAdmin::EventChannel_ptr get_event_channel ( TAO_Notify_EventChannelFactory_i (void); // Constructor - void init_i (PortableServer::POA_ptr default_POA TAO_ENV_ARG_DECL); + void init_i (PortableServer::POA_ptr default_POA ACE_ENV_ARG_DECL); // Initializes this object. - CosNotifyFilter::FilterFactory_ptr create_default_filter_factory_i (TAO_ENV_SINGLE_ARG_DECL); + CosNotifyFilter::FilterFactory_ptr create_default_filter_factory_i (ACE_ENV_SINGLE_ARG_DECL); // Create the default filter factory. // = Data members diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp index 721f1e02010..628b37fc18e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp @@ -50,7 +50,7 @@ TAO_Notify_EventChannel_i::~TAO_Notify_EventChannel_i (void) } void -TAO_Notify_EventChannel_i::init (CosNotifyChannelAdmin::ChannelID channel_id, const CosNotification::QoSProperties& initial_qos, const CosNotification::AdminProperties& initial_admin, PortableServer::POA_ptr default_POA, PortableServer::POA_ptr my_POA TAO_ENV_ARG_DECL) +TAO_Notify_EventChannel_i::init (CosNotifyChannelAdmin::ChannelID channel_id, const CosNotification::QoSProperties& initial_qos, const CosNotification::AdminProperties& initial_admin, PortableServer::POA_ptr default_POA, PortableServer::POA_ptr my_POA ACE_ENV_ARG_DECL) { this->channel_id_ = channel_id; @@ -58,40 +58,40 @@ TAO_Notify_EventChannel_i::init (CosNotifyChannelAdmin::ChannelID channel_id, co this->default_POA_ = PortableServer::POA::_duplicate (default_POA); this->lock_ = - this->channel_objects_factory_->create_event_channel_lock (TAO_ENV_SINGLE_ARG_PARAMETER); + this->channel_objects_factory_->create_event_channel_lock (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->event_manager_ = - this->event_manager_objects_factory_->create_event_manager (this TAO_ENV_ARG_PARAMETER); + this->event_manager_objects_factory_->create_event_manager (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Set these before initializing the event manger. - this->set_qos (initial_qos TAO_ENV_ARG_PARAMETER); + this->set_qos (initial_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->event_manager_->init (TAO_ENV_SINGLE_ARG_PARAMETER); + this->event_manager_->init (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // try to set initial admin params // This must be set after initializing the event manager // since it is the one that owns the admin properties. - this->set_admin (initial_admin TAO_ENV_ARG_PARAMETER); + this->set_admin (initial_admin ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Create the POA for the CA's this->CA_POA_ = this->poa_factory_->create_consumer_admin_POA (this->my_POA_.in (), channel_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Create the POA for the SA's this->SA_POA_ = this->poa_factory_->create_supplier_admin_POA (this->my_POA_.in (), channel_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->event_listener_list_ = - TAO_Notify_Factory::get_collection_factory ()->create_event_listener_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Notify_Factory::get_collection_factory ()->create_event_listener_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Create the default Consumer Admin. Because the ID_Pool is being used @@ -99,11 +99,11 @@ TAO_Notify_EventChannel_i::init (CosNotifyChannelAdmin::ChannelID channel_id, co CosNotifyChannelAdmin::AdminID id_unused; CosNotifyChannelAdmin::ConsumerAdmin_var def_consumer_admin = - this->new_for_consumers (default_op_, id_unused TAO_ENV_ARG_PARAMETER); + this->new_for_consumers (default_op_, id_unused ACE_ENV_ARG_PARAMETER); ACE_CHECK; CosNotifyChannelAdmin::SupplierAdmin_var def_supplier_admin = - this->new_for_suppliers (default_op_, id_unused TAO_ENV_ARG_PARAMETER); + this->new_for_suppliers (default_op_, id_unused ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -132,10 +132,10 @@ TAO_Notify_EventChannel_i::get_default_POA (void) } CosNotifyChannelAdmin::EventChannel_ptr -TAO_Notify_EventChannel_i::get_ref (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_EventChannel_i::get_ref (ACE_ENV_SINGLE_ARG_DECL) { CORBA::Object_var obj = this->poa_factory_-> - servant_to_reference (this->my_POA_.in (), this TAO_ENV_ARG_PARAMETER); + servant_to_reference (this->my_POA_.in (), this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil ()); return CosNotifyChannelAdmin::EventChannel::_narrow (obj.in ()); @@ -143,47 +143,47 @@ TAO_Notify_EventChannel_i::get_ref (TAO_ENV_SINGLE_ARG_DECL) void -TAO_Notify_EventChannel_i::unregister_listener (TAO_Notify_EventListener* group_listener TAO_ENV_ARG_DECL) +TAO_Notify_EventChannel_i::unregister_listener (TAO_Notify_EventListener* group_listener ACE_ENV_ARG_DECL) { // UnRegister the group listener. - this->event_listener_list_->disconnected (group_listener TAO_ENV_ARG_PARAMETER); + this->event_listener_list_->disconnected (group_listener ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_Notify_EventChannel_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_EventChannel_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - this->event_manager_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->event_manager_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Deactivate ourselves. this->poa_factory_->deactivate_object (this, this->my_POA_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // shutdown consumer admins's. TAO_Notify_Shutdown_Worker shutdown_worker; - this->event_listener_list_->for_each (&shutdown_worker TAO_ENV_ARG_PARAMETER); + this->event_listener_list_->for_each (&shutdown_worker ACE_ENV_ARG_PARAMETER); ACE_CHECK; // release all references. - this->event_listener_list_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->event_listener_list_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // @@ TODO: We need a way to send shutdown messages to the proxy consumers too. // (event listeners are proxy suppliers or CA's in disguise) this->poa_factory_->destroy_POA (this->CA_POA_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->poa_factory_->destroy_POA (this->SA_POA_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } const TAO_Notify_QoSAdmin_i& @@ -193,32 +193,32 @@ TAO_Notify_EventChannel_i::qos_admin (void) const } CosNotifyChannelAdmin::EventChannelFactory_ptr -TAO_Notify_EventChannel_i::MyFactory (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_EventChannel_i::MyFactory (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->channel_factory_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->channel_factory_->get_ref (ACE_ENV_SINGLE_ARG_PARAMETER); } CosNotifyChannelAdmin::ConsumerAdmin_ptr -TAO_Notify_EventChannel_i::default_consumer_admin (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_EventChannel_i::default_consumer_admin (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->get_consumeradmin (this->default_id_ TAO_ENV_ARG_PARAMETER); + return this->get_consumeradmin (this->default_id_ ACE_ENV_ARG_PARAMETER); } CosNotifyChannelAdmin::SupplierAdmin_ptr -TAO_Notify_EventChannel_i::default_supplier_admin (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_EventChannel_i::default_supplier_admin (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->get_supplieradmin (this->default_id_ TAO_ENV_ARG_PARAMETER); + return this->get_supplieradmin (this->default_id_ ACE_ENV_ARG_PARAMETER); } CosNotifyFilter::FilterFactory_ptr -TAO_Notify_EventChannel_i::default_filter_factory (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) +TAO_Notify_EventChannel_i::default_filter_factory (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -227,14 +227,14 @@ TAO_Notify_EventChannel_i::default_filter_factory (TAO_ENV_SINGLE_ARG_DECL_NOT_U } CosNotifyChannelAdmin::ConsumerAdmin_ptr -TAO_Notify_EventChannel_i::new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id TAO_ENV_ARG_DECL) +TAO_Notify_EventChannel_i::new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { // @@ use auto_ptr TAO_Notify_ConsumerAdmin_i* consumer_admin = - this->channel_objects_factory_->create_consumer_admin (this TAO_ENV_ARG_PARAMETER); + this->channel_objects_factory_->create_consumer_admin (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ()); PortableServer::ServantBase_var consumeradmin_var (consumer_admin); @@ -247,18 +247,18 @@ TAO_Notify_EventChannel_i::new_for_consumers (CosNotifyChannelAdmin::InterFilter id = this->consumer_admin_ids_.get (); } - consumer_admin->init (id, op, this->CA_POA_.in () TAO_ENV_ARG_PARAMETER); + consumer_admin->init (id, op, this->CA_POA_.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ()); CORBA::Object_var obj = this->poa_factory_->activate_object_with_id (id, this->CA_POA_.in (), consumer_admin - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ()); // Register the group listener. - this->event_listener_list_->connected (consumer_admin TAO_ENV_ARG_PARAMETER); + this->event_listener_list_->connected (consumer_admin ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ()); this->consumer_admin_ids_.next (); @@ -266,13 +266,13 @@ TAO_Notify_EventChannel_i::new_for_consumers (CosNotifyChannelAdmin::InterFilter } CosNotifyChannelAdmin::SupplierAdmin_ptr -TAO_Notify_EventChannel_i::new_for_suppliers (CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id TAO_ENV_ARG_DECL) +TAO_Notify_EventChannel_i::new_for_suppliers (CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { TAO_Notify_SupplierAdmin_i* supplieradmin = - this->channel_objects_factory_->create_supplier_admin (this TAO_ENV_ARG_PARAMETER); + this->channel_objects_factory_->create_supplier_admin (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil ()); PortableServer::ServantBase_var supplieradmin_var (supplieradmin); @@ -283,14 +283,14 @@ TAO_Notify_EventChannel_i::new_for_suppliers (CosNotifyChannelAdmin::InterFilter id = this->supplier_admin_ids_.get (); } - supplieradmin->init (id, op, this->SA_POA_.in () TAO_ENV_ARG_PARAMETER); + supplieradmin->init (id, op, this->SA_POA_.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil ()); CORBA::Object_var obj = this->poa_factory_-> activate_object_with_id (id, this->SA_POA_.in (), supplieradmin - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil ()); this->supplier_admin_ids_.next (); @@ -298,7 +298,7 @@ TAO_Notify_EventChannel_i::new_for_suppliers (CosNotifyChannelAdmin::InterFilter } CosNotifyChannelAdmin::ConsumerAdmin_ptr -TAO_Notify_EventChannel_i::get_consumeradmin (CosNotifyChannelAdmin::AdminID id TAO_ENV_ARG_DECL) +TAO_Notify_EventChannel_i::get_consumeradmin (CosNotifyChannelAdmin::AdminID id ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyChannelAdmin::AdminNotFound @@ -306,14 +306,14 @@ TAO_Notify_EventChannel_i::get_consumeradmin (CosNotifyChannelAdmin::AdminID id { CORBA::Object_var obj = this->poa_factory_->id_to_reference (id, this->CA_POA_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ()); return CosNotifyChannelAdmin::ConsumerAdmin::_narrow (obj.in ()); } CosNotifyChannelAdmin::SupplierAdmin_ptr -TAO_Notify_EventChannel_i::get_supplieradmin (CosNotifyChannelAdmin::AdminID id TAO_ENV_ARG_DECL) +TAO_Notify_EventChannel_i::get_supplieradmin (CosNotifyChannelAdmin::AdminID id ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyChannelAdmin::AdminNotFound @@ -321,23 +321,23 @@ TAO_Notify_EventChannel_i::get_supplieradmin (CosNotifyChannelAdmin::AdminID id { CORBA::Object_var obj = this->poa_factory_->id_to_reference (id, this->SA_POA_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil ()); return CosNotifyChannelAdmin::SupplierAdmin::_narrow (obj.in ()); } CosNotifyChannelAdmin::AdminIDSeq* -TAO_Notify_EventChannel_i::get_all_consumeradmins (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_EventChannel_i::get_all_consumeradmins (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->consumer_admin_ids_.get_sequence (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->consumer_admin_ids_.get_sequence (ACE_ENV_SINGLE_ARG_PARAMETER); } CosNotifyChannelAdmin::AdminIDSeq* -TAO_Notify_EventChannel_i::get_all_supplieradmins (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_EventChannel_i::get_all_supplieradmins (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -346,63 +346,63 @@ TAO_Notify_EventChannel_i::get_all_supplieradmins (TAO_ENV_SINGLE_ARG_DECL) CORBA::INTERNAL ()); ACE_CHECK_RETURN (0); - return this->supplier_admin_ids_.get_sequence (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->supplier_admin_ids_.get_sequence (ACE_ENV_SINGLE_ARG_PARAMETER); } CosNotification::QoSProperties* -TAO_Notify_EventChannel_i::get_qos (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_EventChannel_i::get_qos (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->qos_admin_.get_qos (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->qos_admin_.get_qos (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_EventChannel_i::set_qos (const CosNotification::QoSProperties & qos TAO_ENV_ARG_DECL) +TAO_Notify_EventChannel_i::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotification::UnsupportedQoS )) { - this->qos_admin_.set_qos (qos TAO_ENV_ARG_PARAMETER); + this->qos_admin_.set_qos (qos ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_EventChannel_i::validate_qos (const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos TAO_ENV_ARG_DECL) +TAO_Notify_EventChannel_i::validate_qos (const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotification::UnsupportedQoS )) { - this->qos_admin_.validate_qos (required_qos, available_qos TAO_ENV_ARG_PARAMETER); + this->qos_admin_.validate_qos (required_qos, available_qos ACE_ENV_ARG_PARAMETER); } CosNotification::AdminProperties* -TAO_Notify_EventChannel_i::get_admin (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_EventChannel_i::get_admin (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { // Delegate to Event Manager. - return this->event_manager_->admin_properties ()->get_admin (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->event_manager_->admin_properties ()->get_admin (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_EventChannel_i::set_admin (const CosNotification::AdminProperties & admin TAO_ENV_ARG_DECL) +TAO_Notify_EventChannel_i::set_admin (const CosNotification::AdminProperties & admin ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotification::UnsupportedAdmin )) { - this->event_manager_->admin_properties ()->set_admin (admin TAO_ENV_ARG_PARAMETER); + this->event_manager_->admin_properties ()->set_admin (admin ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->event_manager_->update_task_admins (); } CosEventChannelAdmin::ConsumerAdmin_ptr -TAO_Notify_EventChannel_i::for_consumers (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_EventChannel_i::for_consumers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -412,25 +412,25 @@ TAO_Notify_EventChannel_i::for_consumers (TAO_ENV_SINGLE_ARG_DECL) // TODO: find a way to disable the destroy method in the default Admin. CORBA::Object_var obj = - this->get_consumeradmin (this->default_id_ TAO_ENV_ARG_PARAMETER); + this->get_consumeradmin (this->default_id_ ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosEventChannelAdmin::ConsumerAdmin::_nil ()); return CosEventChannelAdmin::ConsumerAdmin::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CosEventChannelAdmin::SupplierAdmin_ptr -TAO_Notify_EventChannel_i::for_suppliers (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_EventChannel_i::for_suppliers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { CORBA::Object_var obj = - this->get_supplieradmin (this->default_id_ TAO_ENV_ARG_PARAMETER); + this->get_supplieradmin (this->default_id_ ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosEventChannelAdmin::SupplierAdmin::_nil ()); return CosEventChannelAdmin::SupplierAdmin::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h index 3847d750794..c8757fcb99a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h @@ -76,7 +76,7 @@ class TAO_Notify_Export TAO_Notify_EventChannel_i : public virtual POA_CosNotify const CosNotification::AdminProperties& initial_admin, PortableServer::POA_ptr default_POA, PortableServer::POA_ptr my_POA - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize this object. // checks if the and are valid. // creates default filter, consumer admin and supplier admin. @@ -85,7 +85,7 @@ class TAO_Notify_Export TAO_Notify_EventChannel_i : public virtual POA_CosNotify PortableServer::POA_ptr get_default_POA (void); // Get the default POA. - CosNotifyChannelAdmin::EventChannel_ptr get_ref (TAO_ENV_SINGLE_ARG_DECL); + CosNotifyChannelAdmin::EventChannel_ptr get_ref (ACE_ENV_SINGLE_ARG_DECL); // Get the CORBA object for this servant TAO_Notify_Event_Manager* get_event_manager (void); @@ -98,34 +98,34 @@ class TAO_Notify_Export TAO_Notify_EventChannel_i : public virtual POA_CosNotify void supplier_admin_destroyed (CosNotifyChannelAdmin::AdminID SA_ID); // This id is no longer in use.It can be reused by . - void unregister_listener (TAO_Notify_EventListener* group_listener TAO_ENV_ARG_DECL); + void unregister_listener (TAO_Notify_EventListener* group_listener ACE_ENV_ARG_DECL); // Consumer Admin's are Group Listeners that are registered automatically with the EC when a ConsumerAdmin // is created. When a consumer is destroyed, it asks the EC to unregister itself. // = Interface methods virtual CosNotifyChannelAdmin::EventChannelFactory_ptr MyFactory ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr default_consumer_admin ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyChannelAdmin::SupplierAdmin_ptr default_supplier_admin ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyFilter::FilterFactory_ptr default_filter_factory ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -134,7 +134,7 @@ virtual CosNotifyFilter::FilterFactory_ptr default_filter_factory ( virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr new_for_consumers ( CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -143,7 +143,7 @@ virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr new_for_consumers ( virtual CosNotifyChannelAdmin::SupplierAdmin_ptr new_for_suppliers ( CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -151,7 +151,7 @@ virtual CosNotifyChannelAdmin::SupplierAdmin_ptr new_for_suppliers ( virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr get_consumeradmin ( CosNotifyChannelAdmin::AdminID id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -160,7 +160,7 @@ virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr get_consumeradmin ( virtual CosNotifyChannelAdmin::SupplierAdmin_ptr get_supplieradmin ( CosNotifyChannelAdmin::AdminID id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -168,21 +168,21 @@ virtual CosNotifyChannelAdmin::SupplierAdmin_ptr get_supplieradmin ( )); virtual CosNotifyChannelAdmin::AdminIDSeq * get_all_consumeradmins ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyChannelAdmin::AdminIDSeq * get_all_supplieradmins ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotification::QoSProperties * get_qos ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -190,7 +190,7 @@ virtual CosNotification::QoSProperties * get_qos ( virtual void set_qos ( const CosNotification::QoSProperties & qos - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -200,7 +200,7 @@ virtual CosNotification::QoSProperties * get_qos ( virtual void validate_qos ( const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -208,7 +208,7 @@ virtual CosNotification::QoSProperties * get_qos ( )); virtual CosNotification::AdminProperties * get_admin ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -216,7 +216,7 @@ virtual CosNotification::QoSProperties * get_qos ( virtual void set_admin ( const CosNotification::AdminProperties & admin - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -224,21 +224,21 @@ virtual CosNotification::QoSProperties * get_qos ( )); virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.cpp index fa626cea37d..84c80dfe3f9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.cpp @@ -30,9 +30,9 @@ TAO_Notify_Event_Dispatch_Command::~TAO_Notify_Event_Dispatch_Command () } int -TAO_Notify_Event_Dispatch_Command::execute (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Event_Dispatch_Command::execute (ACE_ENV_SINGLE_ARG_DECL) { - this->event_listener_->dispatch_event (*this->event_ TAO_ENV_ARG_PARAMETER); + this->event_listener_->dispatch_event (*this->event_ ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.h index b1646aabdcd..86dd58ea0f5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.h @@ -45,7 +45,7 @@ class TAO_Notify_Export TAO_Notify_Event_Dispatch_Command : public TAO_Notify_Co ~TAO_Notify_Event_Dispatch_Command (); - virtual int execute (TAO_ENV_SINGLE_ARG_DECL); + virtual int execute (ACE_ENV_SINGLE_ARG_DECL); // Command callback protected: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.cpp index 161f142ebf4..a2628852f52 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.cpp @@ -37,7 +37,7 @@ TAO_Notify_Event_Manager::~TAO_Notify_Event_Manager () } void -TAO_Notify_Event_Manager::init (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Event_Manager::init (ACE_ENV_SINGLE_ARG_DECL) { ACE_NEW_THROW_EX (this->lock_, ACE_Lock_Adapter (), @@ -48,25 +48,25 @@ TAO_Notify_Event_Manager::init (TAO_ENV_SINGLE_ARG_DECL) this->admin_properties_ = new TAO_Notify_AdminProperties (); this->event_map_ = - this->emo_factory_->create_event_map (TAO_ENV_SINGLE_ARG_PARAMETER); + this->emo_factory_->create_event_map (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->event_processor_ = - this->emo_factory_->create_event_processor (this TAO_ENV_ARG_PARAMETER); + this->emo_factory_->create_event_processor (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->updates_dispatching_task_ = - this->emo_factory_->create_updates_task (TAO_ENV_SINGLE_ARG_PARAMETER); + this->emo_factory_->create_updates_task (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Init the objects - this->event_map_->init (TAO_ENV_SINGLE_ARG_PARAMETER); + this->event_map_->init (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; TAO_Notify_QoSAdmin_i* qos_admin = (TAO_Notify_QoSAdmin_i*)&(this->event_channel_->qos_admin ()); - this->event_processor_->init (qos_admin TAO_ENV_ARG_PARAMETER); + this->event_processor_->init (qos_admin ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (this->updates_dispatching_task_->init_task ( @@ -79,54 +79,54 @@ TAO_Notify_Event_Manager::init (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_Notify_Event_Manager::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Event_Manager::shutdown (ACE_ENV_SINGLE_ARG_DECL) { ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); ACE_CHECK; - this->event_processor_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->event_processor_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->event_map_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->event_map_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->updates_dispatching_task_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->updates_dispatching_task_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_Event_Manager::subscribe_for_events (TAO_Notify_EventListener* event_listener, const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL) +TAO_Notify_Event_Manager::subscribe_for_events (TAO_Notify_EventListener* event_listener, const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ACE_ENV_ARG_DECL) { TAO_Notify_EventType_List added_update, removed_update; this->event_map_->subscribe_for_events (event_listener, added_update, - added TAO_ENV_ARG_PARAMETER); + added ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->event_map_->unsubscribe_from_events (event_listener, removed_update, - removed TAO_ENV_ARG_PARAMETER); + removed ACE_ENV_ARG_PARAMETER); ACE_CHECK; // if either of the lists are *not* empty, send updates if (added_update.is_empty () == 0 || removed_update.is_empty () == 0) this->dispatch_updates_i (this->event_map_->subscription_change_listeners (), - added_update, removed_update TAO_ENV_ARG_PARAMETER); + added_update, removed_update ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_Event_Manager::update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL) +TAO_Notify_Event_Manager::update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ACE_ENV_ARG_DECL) { TAO_Notify_EventType_List added_list; TAO_Notify_EventType_List removed_list; this->event_map_->update_publication_list (added, removed, - added_list, removed_list TAO_ENV_ARG_PARAMETER); + added_list, removed_list ACE_ENV_ARG_PARAMETER); ACE_CHECK; // if either of the lists are *not* empty, send updates if (added_list.is_empty () == 0 || removed_list.is_empty () == 0) this->dispatch_updates_i (this->event_map_->publication_change_listeners (), - added_list, removed_list TAO_ENV_ARG_PARAMETER); + added_list, removed_list ACE_ENV_ARG_PARAMETER); } void @@ -136,7 +136,7 @@ TAO_Notify_Event_Manager::update_task_admins (void) } void -TAO_Notify_Event_Manager::dispatch_updates_i (TAO_Notify_UpdateListener_List* update_listener_list, TAO_Notify_EventType_List& added, TAO_Notify_EventType_List& removed TAO_ENV_ARG_DECL) +TAO_Notify_Event_Manager::dispatch_updates_i (TAO_Notify_UpdateListener_List* update_listener_list, TAO_Notify_EventType_List& added, TAO_Notify_EventType_List& removed ACE_ENV_ARG_DECL) { ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); @@ -144,7 +144,7 @@ TAO_Notify_Event_Manager::dispatch_updates_i (TAO_Notify_UpdateListener_List* up TAO_Notify_Update_Worker update_worker (this->updates_dispatching_task_, added, removed); - update_listener_list->for_each (&update_worker TAO_ENV_ARG_PARAMETER); + update_listener_list->for_each (&update_worker ACE_ENV_ARG_PARAMETER); } /********************************************************************/ @@ -157,13 +157,13 @@ TAO_Notify_Update_Worker::TAO_Notify_Update_Worker (TAO_Notify_Worker_Task * upd } void -TAO_Notify_Update_Worker::work (TAO_Notify_UpdateListener* listener TAO_ENV_ARG_DECL) +TAO_Notify_Update_Worker::work (TAO_Notify_UpdateListener* listener ACE_ENV_ARG_DECL) { TAO_Notify_Update_Dispatch_Command* mb = new TAO_Notify_Update_Dispatch_Command (listener, this->added_, this->removed_); - this->updates_dispatching_task_->process_event (mb TAO_ENV_ARG_PARAMETER); + this->updates_dispatching_task_->process_event (mb ACE_ENV_ARG_PARAMETER); } /********************************************************************/ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h index 0df63cd44bd..cf07091dab9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h @@ -59,34 +59,34 @@ class TAO_Notify_Export TAO_Notify_Event_Manager ~TAO_Notify_Event_Manager (); // Destructor. - void init (TAO_ENV_SINGLE_ARG_DECL); + void init (ACE_ENV_SINGLE_ARG_DECL); // Init - void shutdown (TAO_ENV_SINGLE_ARG_DECL); + void shutdown (ACE_ENV_SINGLE_ARG_DECL); // Shutdown operations. // = Publish/Subscribe management // = Subscription - void subscribe_for_events (TAO_Notify_EventListener* event_listener, const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL); + void subscribe_for_events (TAO_Notify_EventListener* event_listener, const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ACE_ENV_ARG_DECL); // Subscribes for events . // Unsubscribes for events . // = Publications - void update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL); + void update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ACE_ENV_ARG_DECL); // Suppliers can send anonymous requests to the Event Manager to indicate // what kind of events they expect to produce. // = Updates - void register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL); + void register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL); // Registers the subscription update listener with the Event Manager. - void unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL); + void unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL); // Unregister from subscription updates. - void register_for_publication_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL); + void register_for_publication_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL); // Registers the publication update listener with the Event Manager. - void unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL); + void unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL); // Unregister from publication updates. // = Accessors @@ -111,7 +111,7 @@ class TAO_Notify_Export TAO_Notify_Event_Manager // = Event forwarding methods. void process_event (TAO_Notify_Event* event, TAO_Notify_EventSource* event_source - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Delivers the event to listeners subscribed for // is the source to the Event Manager. @@ -122,7 +122,7 @@ protected: void dispatch_updates_i (TAO_Notify_UpdateListener_List* update_listener_list, TAO_Notify_EventType_List& added, TAO_Notify_EventType_List& removed - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Dispatch the updates to the // = Data members. @@ -163,7 +163,7 @@ class TAO_Notify_Export TAO_Notify_Update_Worker : public TAO_ESF_Workerreject_new_events () == 1 && admin_properties_->queue_full ()) @@ -16,36 +16,36 @@ TAO_Notify_Event_Manager::process_event (TAO_Notify_Event* event, this->event_processor_->evaluate_source_filter (event, event_source - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // Start by checking if the event passes through the Source's filter. } ACE_INLINE void -TAO_Notify_Event_Manager::register_for_publication_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL) +TAO_Notify_Event_Manager::register_for_publication_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL) { this->event_map_->register_for_publication_updates (update_listener - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE void -TAO_Notify_Event_Manager::register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL) +TAO_Notify_Event_Manager::register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL) { this->event_map_->register_for_subscription_updates (update_listener - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE void -TAO_Notify_Event_Manager:: unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL) +TAO_Notify_Event_Manager:: unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL) { this->event_map_->unregister_from_subscription_updates (update_listener - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE void -TAO_Notify_Event_Manager::unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL) +TAO_Notify_Event_Manager::unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL) { this->event_map_->unregister_from_publication_updates(update_listener - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE TAO_Notify_Event_Map* diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager_Objects_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager_Objects_Factory.h index 77c84b86954..cd4e92af434 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager_Objects_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager_Objects_Factory.h @@ -47,23 +47,23 @@ class TAO_Notify_Export TAO_Notify_EMO_Factory : public ACE_Service_Object public: virtual ~TAO_Notify_EMO_Factory (){}; - virtual TAO_Notify_Event_Manager* create_event_manager (TAO_Notify_EventChannel_i* channel TAO_ENV_ARG_DECL)= 0; + virtual TAO_Notify_Event_Manager* create_event_manager (TAO_Notify_EventChannel_i* channel ACE_ENV_ARG_DECL)= 0; // Create an event manager. - virtual TAO_Notify_Event_Map* create_event_map (TAO_ENV_SINGLE_ARG_DECL)= 0; + virtual TAO_Notify_Event_Map* create_event_map (ACE_ENV_SINGLE_ARG_DECL)= 0; // Create the event map. - virtual TAO_Notify_Event_Processor* create_event_processor (TAO_Notify_Event_Manager* event_manager TAO_ENV_ARG_DECL)= 0; + virtual TAO_Notify_Event_Processor* create_event_processor (TAO_Notify_Event_Manager* event_manager ACE_ENV_ARG_DECL)= 0; // Create event processor. // = Create processing tasks. - virtual TAO_Notify_Worker_Task* create_source_eval_task (TAO_ENV_SINGLE_ARG_DECL)= 0; - virtual TAO_Notify_Worker_Task* create_lookup_task (TAO_ENV_SINGLE_ARG_DECL)= 0; - virtual TAO_Notify_Worker_Task* create_listener_eval_task (TAO_ENV_SINGLE_ARG_DECL)= 0; + virtual TAO_Notify_Worker_Task* create_source_eval_task (ACE_ENV_SINGLE_ARG_DECL)= 0; + virtual TAO_Notify_Worker_Task* create_lookup_task (ACE_ENV_SINGLE_ARG_DECL)= 0; + virtual TAO_Notify_Worker_Task* create_listener_eval_task (ACE_ENV_SINGLE_ARG_DECL)= 0; - virtual TAO_Notify_Worker_Task* create_dispatching_task (TAO_ENV_SINGLE_ARG_DECL)= 0; + virtual TAO_Notify_Worker_Task* create_dispatching_task (ACE_ENV_SINGLE_ARG_DECL)= 0; // Task that dispatches events. - virtual TAO_Notify_Worker_Task* create_updates_task (TAO_ENV_SINGLE_ARG_DECL)= 0; + virtual TAO_Notify_Worker_Task* create_updates_task (ACE_ENV_SINGLE_ARG_DECL)= 0; // Task that dispatches updates. // Destroy processing tasks. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.cpp index 1ccbc9eb6aa..7881ebdfd17 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.cpp @@ -41,23 +41,23 @@ TAO_Notify_Event_Map::~TAO_Notify_Event_Map () } void -TAO_Notify_Event_Map::init (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Event_Map::init (ACE_ENV_SINGLE_ARG_DECL) { this->default_subscription_list_ = - this->collection_factory_->create_event_listener_list (TAO_ENV_SINGLE_ARG_PARAMETER); + this->collection_factory_->create_event_listener_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Create the default list of listeners. this->subscription_change_listeners_ - = this->collection_factory_->create_update_listener_list (TAO_ENV_SINGLE_ARG_PARAMETER); + = this->collection_factory_->create_update_listener_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->publication_change_listeners_ - = this->collection_factory_->create_update_listener_list (TAO_ENV_SINGLE_ARG_PARAMETER); + = this->collection_factory_->create_update_listener_list (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_Event_Map::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Event_Map::shutdown (ACE_ENV_SINGLE_ARG_DECL) { // Shutdown all event listener lists in the event map. EVENT_RECIPIENT_MAP::ITERATOR iterator (this->event_recipient_map_); @@ -66,21 +66,21 @@ TAO_Notify_Event_Map::shutdown (TAO_ENV_SINGLE_ARG_DECL) iterator.next (entry) != 0; iterator.advance ()) { - entry->int_id_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + entry->int_id_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } - default_subscription_list_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + default_subscription_list_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - subscription_change_listeners_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + subscription_change_listeners_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - publication_change_listeners_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + publication_change_listeners_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_Event_Map::subscribe_for_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List& update, const CosNotification::EventTypeSeq & added TAO_ENV_ARG_DECL) +TAO_Notify_Event_Map::subscribe_for_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List& update, const CosNotification::EventTypeSeq & added ACE_ENV_ARG_DECL) { TAO_Notify_EventListener_List* event_listener_list; TAO_Notify_EventType event_type; @@ -101,7 +101,7 @@ TAO_Notify_Event_Map::subscribe_for_events (TAO_Notify_EventListener* event_list { // create the list. TAO_Notify_EventListener_List* new_list = - this->collection_factory_->create_event_listener_list (TAO_ENV_SINGLE_ARG_PARAMETER); + this->collection_factory_->create_event_listener_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // add the list to the recipient map. @@ -109,7 +109,7 @@ TAO_Notify_Event_Map::subscribe_for_events (TAO_Notify_EventListener* event_list event_listener_list = new_list; } - event_listener_list->connected (event_listener TAO_ENV_ARG_PARAMETER); + event_listener_list->connected (event_listener ACE_ENV_ARG_PARAMETER); ACE_CHECK; // mirror changes in the subscription list @@ -119,7 +119,7 @@ TAO_Notify_Event_Map::subscribe_for_events (TAO_Notify_EventListener* event_list } void -TAO_Notify_Event_Map::unsubscribe_from_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List &update, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL) +TAO_Notify_Event_Map::unsubscribe_from_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List &update, const CosNotification::EventTypeSeq & removed ACE_ENV_ARG_DECL) { TAO_Notify_EventListener_List* event_listener_list; TAO_Notify_EventType event_type; @@ -137,7 +137,7 @@ TAO_Notify_Event_Map::unsubscribe_from_events (TAO_Notify_EventListener* event_l // remove from the list. - event_listener_list->disconnected (event_listener TAO_ENV_ARG_PARAMETER); + event_listener_list->disconnected (event_listener ACE_ENV_ARG_PARAMETER); ACE_CHECK; // If this was the last entry in the list then we should remove @@ -157,27 +157,27 @@ TAO_Notify_Event_Map::unsubscribe_from_events (TAO_Notify_EventListener* event_l } void -TAO_Notify_Event_Map::register_for_publication_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL) +TAO_Notify_Event_Map::register_for_publication_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL) { - this->publication_change_listeners_->connected (update_listener TAO_ENV_ARG_PARAMETER); + this->publication_change_listeners_->connected (update_listener ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_Event_Map::register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL) +TAO_Notify_Event_Map::register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL) { - this->subscription_change_listeners_->connected (update_listener TAO_ENV_ARG_PARAMETER); + this->subscription_change_listeners_->connected (update_listener ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_Event_Map:: unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL) +TAO_Notify_Event_Map:: unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL) { - this->subscription_change_listeners_->disconnected (update_listener TAO_ENV_ARG_PARAMETER); + this->subscription_change_listeners_->disconnected (update_listener ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_Event_Map::unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL) +TAO_Notify_Event_Map::unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL) { - this->publication_change_listeners_->disconnected (update_listener TAO_ENV_ARG_PARAMETER); + this->publication_change_listeners_->disconnected (update_listener ACE_ENV_ARG_PARAMETER); } CosNotification::EventTypeSeq* @@ -209,7 +209,7 @@ TAO_Notify_Event_Map::obtain_subscription_types (void) } void -TAO_Notify_Event_Map::update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, TAO_Notify_EventType_List &added_list, TAO_Notify_EventType_List &removed_list TAO_ENV_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) +TAO_Notify_Event_Map::update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, TAO_Notify_EventType_List &added_list, TAO_Notify_EventType_List &removed_list ACE_ENV_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/) { TAO_Notify_EventType event_type; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.h index ef139ca3353..9f94b5e31c3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.h @@ -57,35 +57,35 @@ public: virtual ~TAO_Notify_Event_Map (); // Destructor. - void init (TAO_ENV_SINGLE_ARG_DECL); + void init (ACE_ENV_SINGLE_ARG_DECL); // Init - void shutdown (TAO_ENV_SINGLE_ARG_DECL); + void shutdown (ACE_ENV_SINGLE_ARG_DECL); // Shutdown releases all listeners. // = Subscribe and Unsubscribe methods. - void subscribe_for_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List& update, const CosNotification::EventTypeSeq & added TAO_ENV_ARG_DECL); + void subscribe_for_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List& update, const CosNotification::EventTypeSeq & added ACE_ENV_ARG_DECL); - void unsubscribe_from_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List &update, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL); + void unsubscribe_from_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List &update, const CosNotification::EventTypeSeq & removed ACE_ENV_ARG_DECL); // = Publish and Unpublish methods // Later: - void update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, TAO_Notify_EventType_List &added_list, TAO_Notify_EventType_List &removed_list TAO_ENV_ARG_DECL); + void update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, TAO_Notify_EventType_List &added_list, TAO_Notify_EventType_List &removed_list ACE_ENV_ARG_DECL); // Suppliers can send anonymous requests to the Event Manager to indicate // what kind of events they expect to produce. // = Subscription Updates - void register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL); + void register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL); // Registers the subscription update listener with the Event Manager. - void unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL); + void unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL); // Unregister from subscription updates. // = Publication Updates - void register_for_publication_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL); + void register_for_publication_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL); // Registers the publication update listener with the Event Manager. - void unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL); + void unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL); // Unregister from publication updates. // = Subscription list lookup diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.cpp index cb487af32f8..ce55df28f1a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.cpp @@ -29,9 +29,9 @@ TAO_Notify_Event_Processor::~TAO_Notify_Event_Processor () void TAO_Notify_Event_Processor::init (TAO_Notify_QoSAdmin_i* qos_properties - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->lookup_task_ = this->emo_factory_->create_lookup_task (TAO_ENV_SINGLE_ARG_PARAMETER); + this->lookup_task_ = this->emo_factory_->create_lookup_task (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Get hold of the admin properties. @@ -43,15 +43,15 @@ TAO_Notify_Event_Processor::init (TAO_Notify_QoSAdmin_i* qos_properties } void -TAO_Notify_Event_Processor::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Event_Processor::shutdown (ACE_ENV_SINGLE_ARG_DECL) { - this->lookup_task_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->lookup_task_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); } void TAO_Notify_Event_Processor::evaluate_source_filter (TAO_Notify_Event* event, TAO_Notify_EventSource* event_source - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // TODO: use cache allocator here. // @@ Pradeep: you shouldn't be allocating at all! If this must go @@ -64,22 +64,22 @@ TAO_Notify_Event_Processor::evaluate_source_filter (TAO_Notify_Event* event, ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " "Evaluating listener filter\n")); - event_source->filter_eval_task ()->process_event (mb TAO_ENV_ARG_PARAMETER); + event_source->filter_eval_task ()->process_event (mb ACE_ENV_ARG_PARAMETER); } void TAO_Notify_Event_Processor::lookup_subscriptions (TAO_Notify_Event* event, TAO_Notify_EventSource* /*event_source*/ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_Notify_Lookup_Command* lookup = new TAO_Notify_Lookup_Command (this, event, this->event_manager_->event_map ()); - this->lookup_task_->process_event (lookup TAO_ENV_ARG_PARAMETER); + this->lookup_task_->process_event (lookup ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_Event_Processor::evaluate_listener_filter (TAO_Notify_Event* event, TAO_Notify_EventListener* event_listener, CORBA::Boolean eval_parent TAO_ENV_ARG_DECL) +TAO_Notify_Event_Processor::evaluate_listener_filter (TAO_Notify_Event* event, TAO_Notify_EventListener* event_listener, CORBA::Boolean eval_parent ACE_ENV_ARG_DECL) { // @@ Pradeep: you should use ACE_NEW here.... // @@ Pradeep: do you really need to allocate this guy from the @@ -90,14 +90,14 @@ TAO_Notify_Event_Processor::evaluate_listener_filter (TAO_Notify_Event* event, T TAO_Notify_Listener_Filter_Eval_Command* mb = new TAO_Notify_Listener_Filter_Eval_Command (this, event, event_listener, eval_parent); - event_listener->filter_eval_task ()->process_event (mb TAO_ENV_ARG_PARAMETER); + event_listener->filter_eval_task ()->process_event (mb ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_Event_Processor::dispatch_event (TAO_Notify_Event* event, TAO_Notify_EventListener* event_listener TAO_ENV_ARG_DECL) +TAO_Notify_Event_Processor::dispatch_event (TAO_Notify_Event* event, TAO_Notify_EventListener* event_listener ACE_ENV_ARG_DECL) { TAO_Notify_Event_Dispatch_Command* dispatch = new TAO_Notify_Event_Dispatch_Command (this, event, event_listener); - event_listener->event_dispatch_task ()->process_event (dispatch TAO_ENV_ARG_PARAMETER); + event_listener->event_dispatch_task ()->process_event (dispatch ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.h index 888730b1326..d4d98499699 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.h @@ -58,34 +58,34 @@ class TAO_Notify_Export TAO_Notify_Event_Processor virtual ~TAO_Notify_Event_Processor (); void init (TAO_Notify_QoSAdmin_i* qos_properties - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Init - void shutdown (TAO_ENV_SINGLE_ARG_DECL); + void shutdown (ACE_ENV_SINGLE_ARG_DECL); // Shutdown operations. void evaluate_source_filter (TAO_Notify_Event* event, TAO_Notify_EventSource* event_source - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Event processing entry point. // = Callbacks for Source/Event Listeners. void lookup_subscriptions (TAO_Notify_Event* event, TAO_Notify_EventSource* event_source - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // This method is called by an Event_Source after it has // successfully evaluated its filter. void evaluate_listener_filter (TAO_Notify_Event* event, TAO_Notify_EventListener* event_listener, CORBA::Boolean eval_parent - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // This method is called by the subscription lookup command asking // that be delivered to . void dispatch_event (TAO_Notify_Event* event, TAO_Notify_EventListener* event_listener - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // This method is called by an Event_Listener after it has // successfully evaluated its filter. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.cpp index 7b9859e70f4..99ac21f7715 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.cpp @@ -16,7 +16,7 @@ TAO_Notify_Collection_Factory* TAO_Notify_Factory::collection_factory_ = 0; TAO_Notify_EMO_Factory* TAO_Notify_Factory::emo_factory_ = 0; void -TAO_Notify_Factory::init (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Factory::init (ACE_ENV_SINGLE_ARG_DECL) { co_factory_ = ACE_Dynamic_Service ::instance (TAO_NOTIFY_DEF_CO_FACTORY_NAME); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.h index e5476598473..a5c48f02e74 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.h @@ -62,7 +62,7 @@ class TAO_Notify_Export TAO_Notify_Factory protected: friend class TAO_Notify_EventChannelFactory_i; - static void init (TAO_ENV_SINGLE_ARG_DECL); + static void init (ACE_ENV_SINGLE_ARG_DECL); // Initalize the services. static void shutdown (void); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp index 5f385bb3e87..ecf40231947 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp @@ -14,7 +14,7 @@ TAO_Notify_FilterAdmin_i::~TAO_Notify_FilterAdmin_i (void) } CORBA::Boolean -TAO_Notify_FilterAdmin_i::match (TAO_Notify_Event &event TAO_ENV_ARG_DECL) +TAO_Notify_FilterAdmin_i::match (TAO_Notify_Event &event ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyFilter::UnsupportedFilterableData @@ -32,7 +32,7 @@ TAO_Notify_FilterAdmin_i::match (TAO_Notify_Event &event TAO_ENV_ARG_DECL) for (; iter.next (entry); iter.advance ()) { - ret_val = event.do_match (entry->int_id_.in () TAO_ENV_ARG_PARAMETER); + ret_val = event.do_match (entry->int_id_.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (ret_val == 1) @@ -45,7 +45,7 @@ TAO_Notify_FilterAdmin_i::match (TAO_Notify_Event &event TAO_ENV_ARG_DECL) CosNotifyFilter::FilterID TAO_Notify_FilterAdmin_i::add_filter ( CosNotifyFilter::Filter_ptr new_filter - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -69,7 +69,7 @@ TAO_Notify_FilterAdmin_i::add_filter ( } } -void TAO_Notify_FilterAdmin_i::remove_filter (CosNotifyFilter::FilterID filter_id TAO_ENV_ARG_DECL) +void TAO_Notify_FilterAdmin_i::remove_filter (CosNotifyFilter::FilterID filter_id ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyFilter::FilterNotFound @@ -84,7 +84,7 @@ void TAO_Notify_FilterAdmin_i::remove_filter (CosNotifyFilter::FilterID filter_i CosNotifyFilter::Filter_ptr TAO_Notify_FilterAdmin_i::get_filter ( CosNotifyFilter::FilterID filter - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -102,28 +102,28 @@ TAO_Notify_FilterAdmin_i::get_filter ( } CosNotifyFilter::FilterIDSeq* -TAO_Notify_FilterAdmin_i::get_all_filters (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_FilterAdmin_i::get_all_filters (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->filter_ids_.get_sequence(TAO_ENV_SINGLE_ARG_PARAMETER); + return this->filter_ids_.get_sequence(ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_FilterAdmin_i::remove_all_filters (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_FilterAdmin_i::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { CosNotifyFilter::FilterIDSeq* id_list = - this->get_all_filters (TAO_ENV_SINGLE_ARG_PARAMETER); + this->get_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; for (CORBA::ULong i = 0; i < id_list->length (); ++i) { CosNotifyFilter::FilterID id = (*id_list)[i]; - this->remove_filter (id TAO_ENV_ARG_PARAMETER); + this->remove_filter (id ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h index 76783881955..a821c0c0205 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h @@ -42,7 +42,7 @@ public: // Destructor // = match operation on all the filters - CORBA::Boolean match (TAO_Notify_Event &event TAO_ENV_ARG_DECL) + CORBA::Boolean match (TAO_Notify_Event &event ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyFilter::UnsupportedFilterableData @@ -51,7 +51,7 @@ public: virtual CosNotifyFilter::FilterID add_filter ( CosNotifyFilter::Filter_ptr new_filter - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -59,7 +59,7 @@ public: virtual void remove_filter ( CosNotifyFilter::FilterID filter - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -68,7 +68,7 @@ public: virtual CosNotifyFilter::Filter_ptr get_filter ( CosNotifyFilter::FilterID filter - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -76,14 +76,14 @@ public: )); virtual CosNotifyFilter::FilterIDSeq * get_all_filters ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void remove_all_filters ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.cpp index 100337158d5..388bdefeee2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.cpp @@ -16,11 +16,11 @@ TAO_Notify_FilterFactory_i::~TAO_Notify_FilterFactory_i (void) } CosNotifyFilter::FilterFactory_ptr -TAO_Notify_FilterFactory_i::get_ref (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_FilterFactory_i::get_ref (ACE_ENV_SINGLE_ARG_DECL) { CosNotifyFilter::FilterFactory_var filterfactory; - filterfactory = _this (TAO_ENV_SINGLE_ARG_PARAMETER); + filterfactory = _this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyFilter::FilterFactory::_nil ()); return filterfactory._retn (); @@ -29,7 +29,7 @@ TAO_Notify_FilterFactory_i::get_ref (TAO_ENV_SINGLE_ARG_DECL) CosNotifyFilter::Filter_ptr TAO_Notify_FilterFactory_i::create_filter ( const char *constraint_grammar - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -47,14 +47,14 @@ TAO_Notify_FilterFactory_i::create_filter ( TAO_Notify_Filter_i (constraint_grammar), CORBA::NO_MEMORY ()); - return filter->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + return filter->get_ref (ACE_ENV_SINGLE_ARG_PARAMETER); } CosNotifyFilter::MappingFilter_ptr TAO_Notify_FilterFactory_i::create_mapping_filter ( const char * /*constraint_grammar*/, const CORBA::Any & /*default_value*/ - TAO_ENV_ARG_DECL_NOT_USED //TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_ARG_DECL_NOT_USED //ACE_ENV_SINGLE_ARG_PARAMETER ) ACE_THROW_SPEC (( CORBA::SystemException, diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.h index d6b57eb7794..72eb9e53166 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.h @@ -46,12 +46,12 @@ public: // Destructor CosNotifyFilter::FilterFactory_ptr - get_ref (TAO_ENV_SINGLE_ARG_DECL); + get_ref (ACE_ENV_SINGLE_ARG_DECL); // Activate with the default POA virtual CosNotifyFilter::Filter_ptr create_filter ( const char * constraint_grammar - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -61,7 +61,7 @@ public: virtual CosNotifyFilter::MappingFilter_ptr create_mapping_filter ( const char * constraint_grammar, const CORBA::Any & default_value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp index 25a119d2098..8c9bfaeb18b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp @@ -18,8 +18,8 @@ TAO_Notify_Filter_i::TAO_Notify_Filter_i (const char* constraint_grammar) // Implementation skeleton destructor TAO_Notify_Filter_i::~TAO_Notify_Filter_i (void) { - TAO_ENV_DECLARE_NEW_ENV; - this->remove_all_constraints (TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_DECLARE_NEW_CORBA_ENV; + this->remove_all_constraints (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (TAO_debug_level > 0) @@ -29,7 +29,7 @@ TAO_Notify_Filter_i::~TAO_Notify_Filter_i (void) } CosNotifyFilter::Filter_ptr -TAO_Notify_Filter_i::get_ref (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Filter_i::get_ref (ACE_ENV_SINGLE_ARG_DECL) { PortableServer::POA_var my_POA = _default_POA (); @@ -37,21 +37,21 @@ TAO_Notify_Filter_i::get_ref (TAO_ENV_SINGLE_ARG_DECL) PortableServer::ObjectId_var oid = my_POA->activate_object (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyFilter::Filter::_nil ()); CORBA::Object_var obj = my_POA->id_to_reference (oid.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyFilter::Filter::_nil ()); return CosNotifyFilter::Filter::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } char* TAO_Notify_Filter_i::constraint_grammar ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED + ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC (( CORBA::SystemException @@ -63,7 +63,7 @@ TAO_Notify_Filter_i::constraint_grammar ( void TAO_Notify_Filter_i::add_constraints_i ( const CosNotifyFilter::ConstraintInfoSeq& constraint_info_seq - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -87,7 +87,7 @@ TAO_Notify_Filter_i::add_constraints_i ( notify_constr_expr->interpreter.build_tree ( expr.constraint_expr.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -120,7 +120,7 @@ TAO_Notify_Filter_i::add_constraints_i ( CosNotifyFilter::ConstraintInfoSeq* TAO_Notify_Filter_i::add_constraints ( const CosNotifyFilter::ConstraintExpSeq& constraint_list - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -163,7 +163,7 @@ TAO_Notify_Filter_i::add_constraints ( } this->add_constraints_i (*infoseq - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); auto_infoseq.release (); @@ -175,7 +175,7 @@ void TAO_Notify_Filter_i::modify_constraints ( const CosNotifyFilter::ConstraintIDSeq & del_list, const CosNotifyFilter::ConstraintInfoSeq & modify_list - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -229,7 +229,7 @@ TAO_Notify_Filter_i::modify_constraints ( ACE_TRY { this->add_constraints_i (modify_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -273,7 +273,7 @@ TAO_Notify_Filter_i::modify_constraints ( CosNotifyFilter::ConstraintInfoSeq * TAO_Notify_Filter_i::get_constraints ( const CosNotifyFilter::ConstraintIDSeq & id_list - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyFilter::ConstraintNotFound)) @@ -308,7 +308,7 @@ TAO_Notify_Filter_i::get_constraints ( } CosNotifyFilter::ConstraintInfoSeq * -TAO_Notify_Filter_i::get_all_constraints (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Filter_i::get_all_constraints (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { size_t current_size = this->constraint_expr_list_.current_size (); @@ -344,7 +344,7 @@ TAO_Notify_Filter_i::get_all_constraints (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_Notify_Filter_i::remove_all_constraints (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Notify_Filter_i::remove_all_constraints (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { CONSTRAINT_EXPR_LIST_ITER iter (this->constraint_expr_list_); @@ -364,10 +364,10 @@ TAO_Notify_Filter_i::remove_all_constraints (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } void -TAO_Notify_Filter_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Filter_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->remove_all_constraints (TAO_ENV_SINGLE_ARG_PARAMETER); + this->remove_all_constraints (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::POA_var my_POA = _default_POA (); @@ -379,7 +379,7 @@ TAO_Notify_Filter_i::destroy (TAO_ENV_SINGLE_ARG_DECL) CORBA::Boolean TAO_Notify_Filter_i::match (const CORBA::Any & /*filterable_data */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyFilter::UnsupportedFilterableData)) { @@ -390,7 +390,7 @@ TAO_Notify_Filter_i::match (const CORBA::Any & /*filterable_data */ CORBA::Boolean TAO_Notify_Filter_i::match_structured ( const CosNotification::StructuredEvent & filterable_data - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyFilter::UnsupportedFilterableData)) @@ -424,7 +424,7 @@ TAO_Notify_Filter_i::match_structured ( CORBA::Boolean TAO_Notify_Filter_i::match_typed ( const CosNotification::PropertySeq & /* filterable_data */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyFilter::UnsupportedFilterableData)) @@ -436,7 +436,7 @@ TAO_Notify_Filter_i::match_typed ( CosNotifyFilter::CallbackID TAO_Notify_Filter_i::attach_callback ( CosNotifyComm::NotifySubscribe_ptr /* callback */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -447,7 +447,7 @@ TAO_Notify_Filter_i::attach_callback ( void TAO_Notify_Filter_i::detach_callback ( CosNotifyFilter::CallbackID /* callback */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyFilter::CallbackNotFound)) @@ -456,7 +456,7 @@ TAO_Notify_Filter_i::detach_callback ( } CosNotifyFilter::CallbackIDSeq * -TAO_Notify_Filter_i::get_callbacks (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Filter_i::get_callbacks (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h index 6559a4e397b..8afd12e2f7f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h @@ -53,11 +53,11 @@ public: virtual ~TAO_Notify_Filter_i (void); CosNotifyFilter::Filter_ptr - get_ref (TAO_ENV_SINGLE_ARG_DECL); + get_ref (ACE_ENV_SINGLE_ARG_DECL); // Activate with the default POA virtual char * constraint_grammar ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -65,7 +65,7 @@ virtual char * constraint_grammar ( virtual CosNotifyFilter::ConstraintInfoSeq * add_constraints ( const CosNotifyFilter::ConstraintExpSeq & constraint_list - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -75,7 +75,7 @@ virtual CosNotifyFilter::ConstraintInfoSeq * add_constraints ( virtual void modify_constraints ( const CosNotifyFilter::ConstraintIDSeq & del_list, const CosNotifyFilter::ConstraintInfoSeq & modify_list - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -85,7 +85,7 @@ virtual void modify_constraints ( virtual CosNotifyFilter::ConstraintInfoSeq * get_constraints ( const CosNotifyFilter::ConstraintIDSeq & id_list - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -93,21 +93,21 @@ virtual CosNotifyFilter::ConstraintInfoSeq * get_constraints ( )); virtual CosNotifyFilter::ConstraintInfoSeq * get_all_constraints ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void remove_all_constraints ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -115,7 +115,7 @@ virtual void destroy ( virtual CORBA::Boolean match ( const CORBA::Any & filterable_data - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -124,7 +124,7 @@ virtual CORBA::Boolean match ( virtual CORBA::Boolean match_structured ( const CosNotification::StructuredEvent & filterable_data - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -133,7 +133,7 @@ virtual CORBA::Boolean match_structured ( virtual CORBA::Boolean match_typed ( const CosNotification::PropertySeq & filterable_data - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -142,7 +142,7 @@ virtual CORBA::Boolean match_typed ( virtual CosNotifyFilter::CallbackID attach_callback ( CosNotifyComm::NotifySubscribe_ptr callback - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -150,7 +150,7 @@ virtual CosNotifyFilter::CallbackID attach_callback ( virtual void detach_callback ( CosNotifyFilter::CallbackID callback - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -158,7 +158,7 @@ virtual void detach_callback ( )); virtual CosNotifyFilter::CallbackIDSeq * get_callbacks ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -167,7 +167,7 @@ virtual CosNotifyFilter::CallbackIDSeq * get_callbacks ( private: void add_constraints_i ( const CosNotifyFilter::ConstraintInfoSeq& constraint_info_seq - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.cpp index 3e917878450..b0cc56bcf1d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.cpp @@ -51,7 +51,7 @@ TAO_Notify_ID_Pool_Ex::~TAO_Notify_ID_Pool_Ex () } template ID_TYPE_SEQ* -TAO_Notify_ID_Pool_Ex::get_sequence (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ID_Pool_Ex::get_sequence (ACE_ENV_SINGLE_ARG_DECL) { // Figure out the length of the list. size_t len = this->active_list_.size (); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.h index 33471fc7b10..c88b497b7df 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.h @@ -78,7 +78,7 @@ class TAO_Notify_ID_Pool_Ex : public TAO_Notify_ID_Pool TAO_Notify_ID_Pool_Ex (void); ~TAO_Notify_ID_Pool_Ex (); - ID_TYPE_SEQ* get_sequence (TAO_ENV_SINGLE_ARG_DECL); + ID_TYPE_SEQ* get_sequence (ACE_ENV_SINGLE_ARG_DECL); // Get a list of all ids in use. // Essentially converts the to a Sequence. }; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.cpp index 1e75f974275..7be49ac9fe3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.cpp @@ -26,15 +26,15 @@ TAO_Notify_Listener_Filter_Eval_Command::~TAO_Notify_Listener_Filter_Eval_Comman } int -TAO_Notify_Listener_Filter_Eval_Command::execute (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Listener_Filter_Eval_Command::execute (ACE_ENV_SINGLE_ARG_DECL) { CORBA::Boolean result = - this->event_listener_->evaluate_filter (*this->event_, this->eval_parent_ TAO_ENV_ARG_PARAMETER); + this->event_listener_->evaluate_filter (*this->event_, this->eval_parent_ ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (result == 1) { - this->event_processor_->dispatch_event (this->event_, this->event_listener_ TAO_ENV_ARG_PARAMETER); + this->event_processor_->dispatch_event (this->event_, this->event_listener_ ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.h index daaf4567e9b..1526a3ed433 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.h @@ -45,7 +45,7 @@ class TAO_Notify_Export TAO_Notify_Listener_Filter_Eval_Command : public TAO_Not ~TAO_Notify_Listener_Filter_Eval_Command(); - virtual int execute (TAO_ENV_SINGLE_ARG_DECL); + virtual int execute (ACE_ENV_SINGLE_ARG_DECL); // Command callback protected: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Listeners.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Listeners.h index bb15333aaff..458c8c29c1d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Listeners.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Listeners.h @@ -71,18 +71,18 @@ class TAO_Notify_Export TAO_Notify_EventListener : virtual public TAO_Notify_Re public: virtual void dispatch_event (TAO_Notify_Event &event - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; // Callback methods to supply the event to the listener. virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean eval_parent - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; // Evaluates true if this event is acceptable by the listener. // The is a hint to the listener to help it determine // if its wise to evaluate the parents filter too. This helps in // implementing the "interfilter group operator" logic. - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) = 0; + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) = 0; // Ask the listener to relinquish any bindings and prepare to be // disposed. @@ -107,7 +107,7 @@ class TAO_Notify_Export TAO_Notify_EventSource : virtual public TAO_Notify_RefCo // TODO: add a shutdown method to this interface!! virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; // Evaluates true if this event is acceptable by the Source. virtual TAO_Notify_Worker_Task* filter_eval_task (void) = 0; @@ -130,7 +130,7 @@ class TAO_Notify_Export TAO_Notify_UpdateListener : virtual public TAO_Notify_Re public: virtual void dispatch_update (TAO_Notify_EventType_List& added, TAO_Notify_EventType_List& removed - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; // Callback method to supply updates. }; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.cpp index b2f1b14b23d..46ca4442051 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.cpp @@ -23,7 +23,7 @@ TAO_Notify_Lookup_Command::~TAO_Notify_Lookup_Command () } int -TAO_Notify_Lookup_Command::execute (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Lookup_Command::execute (ACE_ENV_SINGLE_ARG_DECL) { // If the event is *not* the special event // send it to the list that matches it. @@ -42,7 +42,7 @@ TAO_Notify_Lookup_Command::execute (TAO_ENV_SINGLE_ARG_DECL) if (event_map_->find (this->event_->event_type (), listener_list) == 0) { - listener_list->for_each (this TAO_ENV_ARG_PARAMETER); + listener_list->for_each (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } } @@ -50,7 +50,7 @@ TAO_Notify_Lookup_Command::execute (TAO_ENV_SINGLE_ARG_DECL) // if (this->default_subscription_list_->is_empty () == 0) // @@ can't do this test - is_empty is not impl. { - event_map_->default_subscription_list ()->for_each (this TAO_ENV_ARG_PARAMETER); + event_map_->default_subscription_list ()->for_each (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } @@ -59,8 +59,8 @@ TAO_Notify_Lookup_Command::execute (TAO_ENV_SINGLE_ARG_DECL) void TAO_Notify_Lookup_Command::work (TAO_Notify_EventListener* event_listener - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->event_processor_->evaluate_listener_filter (this->event_, event_listener, 1 TAO_ENV_ARG_PARAMETER); + this->event_processor_->evaluate_listener_filter (this->event_, event_listener, 1 ACE_ENV_ARG_PARAMETER); // Note the last parameter, we want the parent filter to be evaluated. } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.h index 07a769906e5..a860df2e3f7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.h @@ -46,11 +46,11 @@ class TAO_Notify_Export TAO_Notify_Lookup_Command : public TAO_Notify_Command, p ~TAO_Notify_Lookup_Command (); - virtual int execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + virtual int execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); // Command callback // = TAO_ESF_Worker method - void work (TAO_Notify_EventListener* listener TAO_ENV_ARG_DECL); + void work (TAO_Notify_EventListener* listener ACE_ENV_ARG_DECL); protected: // = Data member TAO_Notify_Event_Map* event_map_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.cpp index 7ae2676c1c2..34cfcdf67bd 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.cpp @@ -56,7 +56,7 @@ TAO_Notify_MT_Worker_Task::init_task ( } void -TAO_Notify_MT_Worker_Task::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/) +TAO_Notify_MT_Worker_Task::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/) { // Put a shutdown message in the task queue and wait here till all // threads exit. @@ -71,8 +71,8 @@ TAO_Notify_MT_Worker_Task::close (u_long) TAO_Notify_Shutdown_Command * mb = new TAO_Notify_Shutdown_Command (); - TAO_ENV_DECLARE_NEW_ENV; - this->process_event (mb TAO_ENV_ARG_PARAMETER); + ACE_DECLARE_NEW_CORBA_ENV; + this->process_event (mb ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // We can not wait for ourselves to quit @@ -90,10 +90,10 @@ TAO_Notify_MT_Worker_Task::close (u_long) } int -TAO_Notify_MT_Worker_Task::process_event (TAO_Notify_Command *mb TAO_ENV_ARG_DECL, ACE_Time_Value *tv) +TAO_Notify_MT_Worker_Task::process_event (TAO_Notify_Command *mb ACE_ENV_ARG_DECL, ACE_Time_Value *tv) { // Execute the buffering strategy. - this->buffering_strategy_->execute (this->msg_queue (), mb TAO_ENV_ARG_PARAMETER, tv); + this->buffering_strategy_->execute (this->msg_queue (), mb ACE_ENV_ARG_PARAMETER, tv); ACE_CHECK_RETURN (-1); return 0; @@ -114,7 +114,7 @@ TAO_Notify_MT_Worker_Task::update_qos (TAO_Notify_QoSAdmin_i& qos_admin) // set on say the event channel or the supplier proxy. ACE_TRY_NEW_ENV { - CosNotification::QoSProperties_var qos = qos_admin.get_qos (TAO_ENV_SINGLE_ARG_PARAMETER); + CosNotification::QoSProperties_var qos = qos_admin.get_qos (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; for (CORBA::ULong index = 0; index < qos->length (); ++index) @@ -185,7 +185,7 @@ TAO_Notify_MT_Worker_Task::svc (void) if (command != 0) { - result = command->execute (TAO_ENV_SINGLE_ARG_PARAMETER); + result = command->execute (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -212,7 +212,7 @@ TAO_Notify_Shutdown_Command::TAO_Notify_Shutdown_Command (void) } int -TAO_Notify_Shutdown_Command::execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/) +TAO_Notify_Shutdown_Command::execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/) { return -1; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.h index fa2bea56446..a86f1661e48 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.h @@ -58,10 +58,10 @@ public: TAO_Notify_QoSAdmin_i* const qos_properties); // Init the task - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL); // shutdown this task. - virtual int process_event (TAO_Notify_Command *mb TAO_ENV_ARG_DECL, ACE_Time_Value *tv = 0); + virtual int process_event (TAO_Notify_Command *mb ACE_ENV_ARG_DECL, ACE_Time_Value *tv = 0); // Process the command. virtual void update_admin (TAO_Notify_AdminProperties& admin); @@ -102,7 +102,7 @@ class TAO_Notify_Export TAO_Notify_Shutdown_Command : public TAO_Notify_Command TAO_Notify_Shutdown_Command (void); - virtual int execute (TAO_ENV_SINGLE_ARG_DECL); + virtual int execute (ACE_ENV_SINGLE_ARG_DECL); // Returns -1. This signals worker threads to finish servicing requests. }; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_POA_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_POA_Factory.h index 6160260a456..dd072e486d5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_POA_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_POA_Factory.h @@ -42,41 +42,41 @@ class TAO_Notify_Export TAO_Notify_POA_Factory : public ACE_Service_Object // public: // = POA creation methods. - virtual PortableServer::POA_ptr create_event_channel_POA (PortableServer::POA_ptr parent_poa TAO_ENV_ARG_DECL) = 0; + virtual PortableServer::POA_ptr create_event_channel_POA (PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL) = 0; // Create the POA to activate Event Channels in. - virtual PortableServer::POA_ptr create_supplier_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL) = 0; + virtual PortableServer::POA_ptr create_supplier_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id ACE_ENV_ARG_DECL) = 0; // Create the POA to activate SA's in. - virtual PortableServer::POA_ptr create_consumer_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL) = 0; + virtual PortableServer::POA_ptr create_consumer_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id ACE_ENV_ARG_DECL) = 0; // Create the POA to activate CA's in. - virtual PortableServer::POA_ptr create_proxy_pushconsumer_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL) = 0; + virtual PortableServer::POA_ptr create_proxy_pushconsumer_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id ACE_ENV_ARG_DECL) = 0; // Create the POA to activate proxy push consumers in. - virtual PortableServer::POA_ptr create_proxy_pushsupplier_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL) = 0; + virtual PortableServer::POA_ptr create_proxy_pushsupplier_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id ACE_ENV_ARG_DECL) = 0; // Create the POA to activate proxy push suppliers in. // = Object activation and POA methods - virtual CORBA::Object_ptr activate_object_with_id (CORBA::Long id, PortableServer::POA_ptr poa,PortableServer::Servant servant TAO_ENV_ARG_DECL) = 0; + virtual CORBA::Object_ptr activate_object_with_id (CORBA::Long id, PortableServer::POA_ptr poa,PortableServer::Servant servant ACE_ENV_ARG_DECL) = 0; // Converts to an ObjectId and registers with the POA . - virtual CORBA::Object_ptr activate_object (PortableServer::POA_ptr poa,PortableServer::Servant servant TAO_ENV_ARG_DECL) = 0; + virtual CORBA::Object_ptr activate_object (PortableServer::POA_ptr poa,PortableServer::Servant servant ACE_ENV_ARG_DECL) = 0; // Registers with the POA . - virtual CORBA::Object_ptr servant_to_reference (PortableServer::POA_ptr poa,PortableServer::Servant servant TAO_ENV_ARG_DECL) = 0; + virtual CORBA::Object_ptr servant_to_reference (PortableServer::POA_ptr poa,PortableServer::Servant servant ACE_ENV_ARG_DECL) = 0; // Registers with the POA . - virtual CORBA::Object_ptr id_to_reference (CORBA::Long id, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL) = 0; + virtual CORBA::Object_ptr id_to_reference (CORBA::Long id, PortableServer::POA_ptr poa ACE_ENV_ARG_DECL) = 0; // Look for the Object with id in . - virtual void destroy_POA (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL) = 0; + virtual void destroy_POA (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL) = 0; // Destroy the - virtual void deactivate_object (CORBA::Object_ptr obj, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL) = 0; + virtual void deactivate_object (CORBA::Object_ptr obj, PortableServer::POA_ptr poa ACE_ENV_ARG_DECL) = 0; // Deactivate the object. - virtual void deactivate_object (PortableServer::Servant servant, PortableServer::POA_ptr TAO_ENV_ARG_DECL) = 0; + virtual void deactivate_object (PortableServer::Servant servant, PortableServer::POA_ptr ACE_ENV_ARG_DECL) = 0; // Deactivate the object. }; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.cpp index 9a1d5fdb1a9..0eb9eaaba70 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.cpp @@ -23,14 +23,14 @@ TAO_Notify_ProxyConsumer::TAO_Notify_ProxyConsumer (TAO_Notify_Sup } template void -TAO_Notify_ProxyConsumer::init (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL) +TAO_Notify_ProxyConsumer::init (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL) { this->proxy_id_ = proxy_id; TAO_Notify_CO_Factory* cof = TAO_Notify_Factory::get_channel_objects_factory (); - this->lock_ = cof->create_proxy_consumer_lock (TAO_ENV_SINGLE_ARG_PARAMETER); + this->lock_ = cof->create_proxy_consumer_lock (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Create the task to forward filtering commands to: @@ -39,7 +39,7 @@ TAO_Notify_ProxyConsumer::init (CosNotifyChannelAdmin::ProxyID pro this->event_manager_->resource_factory (); this->filter_eval_task_ = - event_manager_objects_factory->create_source_eval_task (TAO_ENV_SINGLE_ARG_PARAMETER); + event_manager_objects_factory->create_source_eval_task (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Get hold of the admin properties. @@ -58,7 +58,7 @@ TAO_Notify_ProxyConsumer::~TAO_Notify_ProxyConsumer (void) ACE_DECLARE_NEW_CORBA_ENV; this->event_manager_->unregister_from_subscription_updates (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; delete this->lock_; @@ -67,7 +67,7 @@ TAO_Notify_ProxyConsumer::~TAO_Notify_ProxyConsumer (void) this->supplier_admin_->_remove_ref (); // @@: Move this to on_disconnected - this->filter_eval_task_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->filter_eval_task_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; TAO_Notify_EMO_Factory* event_manager_objects_factory = @@ -77,27 +77,27 @@ TAO_Notify_ProxyConsumer::~TAO_Notify_ProxyConsumer (void) } template CORBA::Boolean -TAO_Notify_ProxyConsumer::evaluate_filter (TAO_Notify_Event &event TAO_ENV_ARG_DECL) +TAO_Notify_ProxyConsumer::evaluate_filter (TAO_Notify_Event &event ACE_ENV_ARG_DECL) { // check if it passes the parent filter. CORBA::Boolean bval = this->supplier_admin_->get_filter_admin ().match (event - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Boolean ret_val; - ret_val = this->supplier_admin_->MyOperator (TAO_ENV_SINGLE_ARG_PARAMETER); + ret_val = this->supplier_admin_->MyOperator (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (ret_val == CosNotifyChannelAdmin::AND_OP) { - ret_val = bval && this->filter_admin_.match (event TAO_ENV_ARG_PARAMETER); + ret_val = bval && this->filter_admin_.match (event ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } else { - ret_val = bval || this->filter_admin_.match (event TAO_ENV_ARG_PARAMETER); + ret_val = bval || this->filter_admin_.match (event ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -111,7 +111,7 @@ TAO_Notify_ProxyConsumer::filter_eval_task (void) } template void -TAO_Notify_ProxyConsumer::on_connected (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ProxyConsumer::on_connected (ACE_ENV_SINGLE_ARG_DECL) { // Get hold of the admin properties. TAO_Notify_AdminProperties* const admin_properties = @@ -124,14 +124,14 @@ TAO_Notify_ProxyConsumer::on_connected (TAO_ENV_SINGLE_ARG_DECL) supplier_count->value () >= admin_properties->max_suppliers ()) ACE_THROW (CORBA::IMP_LIMIT ()); // we've reached the limit of suppliers connected. - this->event_manager_->register_for_subscription_updates (this TAO_ENV_ARG_PARAMETER); + this->event_manager_->register_for_subscription_updates (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; (*supplier_count)++; } template void -TAO_Notify_ProxyConsumer::on_disconnected (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) +TAO_Notify_ProxyConsumer::on_disconnected (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/) { // Get hold of the admin properties. TAO_Notify_AdminProperties* const admin_properties = @@ -141,17 +141,17 @@ TAO_Notify_ProxyConsumer::on_disconnected (TAO_ENV_SINGLE_ARG_DECL } template void -TAO_Notify_ProxyConsumer::offer_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL) +TAO_Notify_ProxyConsumer::offer_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyComm::InvalidEventType )) { - this->event_manager_->update_publication_list (added, removed TAO_ENV_ARG_PARAMETER); + this->event_manager_->update_publication_list (added, removed ACE_ENV_ARG_PARAMETER); } template CosNotification::EventTypeSeq* -TAO_Notify_ProxyConsumer::obtain_subscription_types (CosNotifyChannelAdmin::ObtainInfoMode mode TAO_ENV_ARG_DECL) +TAO_Notify_ProxyConsumer::obtain_subscription_types (CosNotifyChannelAdmin::ObtainInfoMode mode ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -170,39 +170,39 @@ TAO_Notify_ProxyConsumer::obtain_subscription_types (CosNotifyChan // if updates are currently off, switch them on. if (this->updates_on_ == 0) this->event_manager_->register_for_subscription_updates (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } else { // if updates are currently on, switch them off. if (this->updates_on_ == 1) this->event_manager_->unregister_from_subscription_updates (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } return event_type_seq; } template CosNotifyChannelAdmin::SupplierAdmin_ptr -TAO_Notify_ProxyConsumer::MyAdmin (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ProxyConsumer::MyAdmin (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->supplier_admin_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->supplier_admin_->get_ref (ACE_ENV_SINGLE_ARG_PARAMETER); } template void TAO_Notify_ProxyConsumer::set_qos ( const CosNotification::QoSProperties & qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotification::UnsupportedQoS )) { // Call our base class set_qos (). - TAO_Notify_Proxy::set_qos (qos TAO_ENV_ARG_PARAMETER); + TAO_Notify_Proxy::set_qos (qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Then update our task's qos diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.h index 035f48d0cf1..cb550e3ab1e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.h @@ -52,24 +52,24 @@ public: virtual ~TAO_Notify_ProxyConsumer (void); // Destructor - void init (CosNotifyChannelAdmin::ProxyID myID TAO_ENV_ARG_DECL); + void init (CosNotifyChannelAdmin::ProxyID myID ACE_ENV_ARG_DECL); // Init the Proxy. // = TAO_Notify_EventSource methods. - virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event TAO_ENV_ARG_DECL); + virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event ACE_ENV_ARG_DECL); // Evaluates true if this event is acceptable by the Source. TAO_Notify_Worker_Task* filter_eval_task (void); // The Worker task associated with the event listener for filter evaluation. - virtual CosNotifyChannelAdmin::SupplierAdmin_ptr MyAdmin (TAO_ENV_SINGLE_ARG_DECL) + virtual CosNotifyChannelAdmin::SupplierAdmin_ptr MyAdmin (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotification::EventTypeSeq * obtain_subscription_types ( CosNotifyChannelAdmin::ObtainInfoMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -78,7 +78,7 @@ public: virtual void offer_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -89,7 +89,7 @@ public: // so we can update the qos on our tasks. virtual void set_qos ( const CosNotification::QoSProperties & qos - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -98,10 +98,10 @@ public: protected: // = Helper methods - void on_connected (TAO_ENV_SINGLE_ARG_DECL); + void on_connected (ACE_ENV_SINGLE_ARG_DECL); // Derived classes should call this when their suppliers connect. - void on_disconnected (TAO_ENV_SINGLE_ARG_DECL); + void on_disconnected (ACE_ENV_SINGLE_ARG_DECL); // Derived classes should call this when their suppliers disconnect. // = Data members diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.cpp index 009798f4939..567124efd80 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.cpp @@ -21,7 +21,7 @@ TAO_Notify_ProxyPushConsumer_i::~TAO_Notify_ProxyPushConsumer_i (void) } void -TAO_Notify_ProxyPushConsumer_i::connect_any_push_supplier (CosEventComm::PushSupplier_ptr push_supplier TAO_ENV_ARG_DECL) +TAO_Notify_ProxyPushConsumer_i::connect_any_push_supplier (CosEventComm::PushSupplier_ptr push_supplier ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected @@ -39,7 +39,7 @@ TAO_Notify_ProxyPushConsumer_i::connect_any_push_supplier (CosEventComm::PushSup CosEventComm::PushSupplier::_duplicate (push_supplier); this->notify_push_supplier_ = - CosNotifyComm::PushSupplier::_narrow (push_supplier TAO_ENV_ARG_PARAMETER); + CosNotifyComm::PushSupplier::_narrow (push_supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!CORBA::is_nil (this->notify_push_supplier_.in ())) @@ -60,7 +60,7 @@ TAO_Notify_ProxyPushConsumer_i::connect_any_push_supplier (CosEventComm::PushSup CORBA::INTERNAL ()); ACE_TRY_CHECK; - this->on_connected (TAO_ENV_SINGLE_ARG_PARAMETER); + this->on_connected (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -80,7 +80,7 @@ TAO_Notify_ProxyPushConsumer_i::connect_any_push_supplier (CosEventComm::PushSup } void -TAO_Notify_ProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL) +TAO_Notify_ProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed ACE_ENV_ARG_DECL) { { ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, @@ -94,7 +94,7 @@ TAO_Notify_ProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq ACE_TRY { this->notify_push_supplier_->subscription_change (added, removed - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHALL @@ -105,7 +105,7 @@ TAO_Notify_ProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq } void -TAO_Notify_ProxyPushConsumer_i::push (const CORBA::Any & data TAO_ENV_ARG_DECL) +TAO_Notify_ProxyPushConsumer_i::push (const CORBA::Any & data ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosEventComm::Disconnected @@ -125,7 +125,7 @@ TAO_Notify_ProxyPushConsumer_i::push (const CORBA::Any & data TAO_ENV_ARG_DECL) TAO_Notify_Any* notify_event = new TAO_Notify_Any(data_copy); - this->event_manager_->process_event (notify_event, this TAO_ENV_ARG_PARAMETER); + this->event_manager_->process_event (notify_event, this ACE_ENV_ARG_PARAMETER); ACE_CHECK; notify_event->_decr_refcnt (); @@ -133,7 +133,7 @@ TAO_Notify_ProxyPushConsumer_i::push (const CORBA::Any & data TAO_ENV_ARG_DECL) void TAO_Notify_ProxyPushConsumer_i::disconnect_push_consumer ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -141,10 +141,10 @@ TAO_Notify_ProxyPushConsumer_i::disconnect_push_consumer ( { // ask our parent to deactivate us. this->supplier_admin_-> - deactivate_proxy_pushconsumer (this TAO_ENV_ARG_PARAMETER); + deactivate_proxy_pushconsumer (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->on_disconnected (TAO_ENV_SINGLE_ARG_PARAMETER); + this->on_disconnected (ACE_ENV_SINGLE_ARG_PARAMETER); } // = TAO_Notify_CosEC_ProxyPushConsumer_i @@ -161,32 +161,32 @@ TAO_Notify_CosEC_ProxyPushConsumer_i::~TAO_Notify_CosEC_ProxyPushConsumer_i (voi } void -TAO_Notify_CosEC_ProxyPushConsumer_i::init (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_CosEC_ProxyPushConsumer_i::init (ACE_ENV_SINGLE_ARG_DECL) { // Pass the default id. - this->notify_proxy_.init (0 TAO_ENV_ARG_PARAMETER); + this->notify_proxy_.init (0 ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data TAO_ENV_ARG_DECL) +TAO_Notify_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->notify_proxy_.push (data TAO_ENV_ARG_PARAMETER); + this->notify_proxy_.push (data ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_CosEC_ProxyPushConsumer_i::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_CosEC_ProxyPushConsumer_i::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->notify_proxy_.disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + this->notify_proxy_.disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_CosEC_ProxyPushConsumer_i::connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier TAO_ENV_ARG_DECL) +TAO_Notify_CosEC_ProxyPushConsumer_i::connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected)) { - this->notify_proxy_.connect_any_push_supplier (push_supplier TAO_ENV_ARG_PARAMETER); + this->notify_proxy_.connect_any_push_supplier (push_supplier ACE_ENV_ARG_PARAMETER); } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.h index 81c2a6a3d64..8da7670887d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.h @@ -55,7 +55,7 @@ public: // Destructor // = Interface methods - void push (const CORBA::Any & data TAO_ENV_ARG_DECL) + void push (const CORBA::Any & data ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosEventComm::Disconnected @@ -63,7 +63,7 @@ public: virtual void connect_any_push_supplier ( CosEventComm::PushSupplier_ptr push_supplier - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -71,7 +71,7 @@ public: )); virtual void disconnect_push_consumer ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -79,7 +79,7 @@ virtual void disconnect_push_consumer ( protected: // = Helper methods - virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL); + virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed ACE_ENV_ARG_DECL); // = Data members CORBA::Boolean notify_style_supplier_; @@ -113,20 +113,20 @@ public: virtual ~TAO_Notify_CosEC_ProxyPushConsumer_i (void); // Destructor. - void init (TAO_ENV_SINGLE_ARG_DECL); + void init (ACE_ENV_SINGLE_ARG_DECL); // init. virtual void push (const CORBA::Any &data - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Suppliers call this method to pass data to connected consumers. - virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL) + virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Disconnects the supplier from the event communication. virtual void connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected)); // Connects a push supplier. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.cpp index 7c45f284d4c..049cc32f249 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.cpp @@ -20,24 +20,24 @@ TAO_Notify_ProxyPushSupplier_i::~TAO_Notify_ProxyPushSupplier_i (void) } void -TAO_Notify_ProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event &event TAO_ENV_ARG_DECL) +TAO_Notify_ProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event &event ACE_ENV_ARG_DECL) { ACE_TRY { - event.do_push (this->cosec_push_consumer_.in () TAO_ENV_ARG_PARAMETER); + event.do_push (this->cosec_push_consumer_.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHALL { ACE_DEBUG ((LM_DEBUG, "Exception dispatching any event\n")); // misbehaving client, - this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); } ACE_ENDTRY; } void -TAO_Notify_ProxyPushSupplier_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL) +TAO_Notify_ProxyPushSupplier_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed ACE_ENV_ARG_DECL) { { ACE_GUARD (ACE_Lock, ace_mon, *this->lock_); @@ -47,7 +47,7 @@ TAO_Notify_ProxyPushSupplier_i::dispatch_update_i (CosNotification::EventTypeSeq ACE_TRY { - this->notify_push_consumer_->offer_change (added, removed TAO_ENV_ARG_PARAMETER); + this->notify_push_consumer_->offer_change (added, removed ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHALL @@ -58,7 +58,7 @@ TAO_Notify_ProxyPushSupplier_i::dispatch_update_i (CosNotification::EventTypeSeq } void -TAO_Notify_ProxyPushSupplier_i::connect_any_push_consumer (CosEventComm::PushConsumer_ptr push_consumer TAO_ENV_ARG_DECL) +TAO_Notify_ProxyPushSupplier_i::connect_any_push_consumer (CosEventComm::PushConsumer_ptr push_consumer ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected, @@ -79,7 +79,7 @@ TAO_Notify_ProxyPushSupplier_i::connect_any_push_consumer (CosEventComm::PushCon CosEventComm::PushConsumer::_duplicate (push_consumer); this->notify_push_consumer_ = - CosNotifyComm::PushConsumer::_narrow (push_consumer TAO_ENV_ARG_PARAMETER); + CosNotifyComm::PushConsumer::_narrow (push_consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!CORBA::is_nil (this->notify_push_consumer_.in ())) @@ -101,7 +101,7 @@ TAO_Notify_ProxyPushSupplier_i::connect_any_push_consumer (CosEventComm::PushCon CORBA::INTERNAL ()); ACE_CHECK; - this->on_connected (TAO_ENV_SINGLE_ARG_PARAMETER); + this->on_connected (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -117,31 +117,31 @@ TAO_Notify_ProxyPushSupplier_i::connect_any_push_consumer (CosEventComm::PushCon } void -TAO_Notify_ProxyPushSupplier_i::shutdown_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ProxyPushSupplier_i::shutdown_i (ACE_ENV_SINGLE_ARG_DECL) { - this->on_disconnected (TAO_ENV_SINGLE_ARG_PARAMETER); + this->on_disconnected (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // ask our parent to deactivate us. this->consumer_admin_-> - deactivate_proxy_pushsupplier (this TAO_ENV_ARG_PARAMETER); + deactivate_proxy_pushsupplier (this ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_ProxyPushSupplier_i::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ProxyPushSupplier_i::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { // unregister with CA - this->consumer_admin_->unregister_listener (this TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->unregister_listener (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->shutdown_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->shutdown_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_ProxyPushSupplier_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ProxyPushSupplier_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) { // Tell the consumer that we're going away ... // @@ Later, lookup a "notify_on_disconnect" option. @@ -153,12 +153,12 @@ TAO_Notify_ProxyPushSupplier_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) return; } - this->shutdown_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->shutdown_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_TRY { - this->cosec_push_consumer_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + this->cosec_push_consumer_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHALL @@ -181,25 +181,25 @@ TAO_Notify_CosEC_ProxyPushSupplier_i::~TAO_Notify_CosEC_ProxyPushSupplier_i (voi } void -TAO_Notify_CosEC_ProxyPushSupplier_i::init (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_CosEC_ProxyPushSupplier_i::init (ACE_ENV_SINGLE_ARG_DECL) { - this->notify_proxy_.init (0 TAO_ENV_ARG_PARAMETER); + this->notify_proxy_.init (0 ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->notify_proxy_.disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + this->notify_proxy_.disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_CosEC_ProxyPushSupplier_i::connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer TAO_ENV_ARG_DECL) +TAO_Notify_CosEC_ProxyPushSupplier_i::connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected, CosEventChannelAdmin::TypeError)) { - this->notify_proxy_.connect_any_push_consumer (push_consumer TAO_ENV_ARG_PARAMETER); + this->notify_proxy_.connect_any_push_consumer (push_consumer ACE_ENV_ARG_PARAMETER); } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.h index 97f2fdde840..bf7748e077b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.h @@ -55,7 +55,7 @@ public: // = Interface methods virtual void connect_any_push_consumer ( CosEventComm::PushConsumer_ptr push_consumer - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -64,23 +64,23 @@ public: )); virtual void disconnect_push_supplier ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL); // Shutdown. protected: - void shutdown_i (TAO_ENV_SINGLE_ARG_DECL); + void shutdown_i (ACE_ENV_SINGLE_ARG_DECL); // Shutdown - virtual void dispatch_event_i (TAO_Notify_Event &event TAO_ENV_ARG_DECL); + virtual void dispatch_event_i (TAO_Notify_Event &event ACE_ENV_ARG_DECL); // Deliver the event to the consumer. - virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL); + virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed ACE_ENV_ARG_DECL); // Deliver the update to the consumer. // = Data Members. @@ -114,14 +114,14 @@ public: ~TAO_Notify_CosEC_ProxyPushSupplier_i (void); // Destructor. - void init (TAO_ENV_SINGLE_ARG_DECL); + void init (ACE_ENV_SINGLE_ARG_DECL); // Init. - virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL) + virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Ends the event communication and disposes this object. - virtual void connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer TAO_ENV_ARG_DECL) + virtual void connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected, CosEventChannelAdmin::TypeError)); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.cpp index 55009cd0b51..cc540f3a9af 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.cpp @@ -25,9 +25,9 @@ TAO_Notify_ProxySupplier::TAO_Notify_ProxySupplier (TAO_Notify_Con } template void -TAO_Notify_ProxySupplier::init (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL) +TAO_Notify_ProxySupplier::init (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL) { - consumer_admin_->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_admin_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->proxy_id_ = proxy_id; @@ -35,7 +35,7 @@ TAO_Notify_ProxySupplier::init (CosNotifyChannelAdmin::ProxyID pro TAO_Notify_CO_Factory* cof = TAO_Notify_Factory::get_channel_objects_factory (); - this->lock_ = cof->create_proxy_supplier_lock (TAO_ENV_SINGLE_ARG_PARAMETER); + this->lock_ = cof->create_proxy_supplier_lock (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; TAO_Notify_EMO_Factory* event_manager_objects_factory = @@ -43,11 +43,11 @@ TAO_Notify_ProxySupplier::init (CosNotifyChannelAdmin::ProxyID pro // Create the task to forward filtering/dispatching commands to: this->dispatching_task_ = - event_manager_objects_factory->create_dispatching_task (TAO_ENV_SINGLE_ARG_PARAMETER); + event_manager_objects_factory->create_dispatching_task (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->filter_eval_task_ = - event_manager_objects_factory->create_listener_eval_task (TAO_ENV_SINGLE_ARG_PARAMETER); + event_manager_objects_factory->create_listener_eval_task (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Get hold of the admin properties. @@ -67,7 +67,7 @@ TAO_Notify_ProxySupplier::~TAO_Notify_ProxySupplier (void) { ACE_DECLARE_NEW_CORBA_ENV; this->event_manager_->unregister_from_publication_updates (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // unsubscribe it to our current subscriptions. @@ -78,14 +78,14 @@ TAO_Notify_ProxySupplier::~TAO_Notify_ProxySupplier (void) added.length (0); this->event_manager_->subscribe_for_events (this, - added, removed TAO_ENV_ARG_PARAMETER); + added, removed ACE_ENV_ARG_PARAMETER); ACE_CHECK; delete this->lock_; this->consumer_admin_->proxy_pushsupplier_destroyed (this->proxy_id_); - consumer_admin_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_admin_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; TAO_Notify_EMO_Factory* event_manager_objects_factory = @@ -96,23 +96,23 @@ TAO_Notify_ProxySupplier::~TAO_Notify_ProxySupplier (void) } template CORBA::Boolean -TAO_Notify_ProxySupplier::evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean eval_parent TAO_ENV_ARG_DECL) +TAO_Notify_ProxySupplier::evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean eval_parent ACE_ENV_ARG_DECL) { if (eval_parent == 1) { CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator = - consumer_admin_->MyOperator (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_admin_->MyOperator (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Inter-filter group operator. CORBA::Boolean bval = - this->consumer_admin_->get_filter_admin ().match (event TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->get_filter_admin ().match (event ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ((bval == 1 && filter_operator == CosNotifyChannelAdmin::AND_OP) || (bval == 0 && filter_operator == CosNotifyChannelAdmin::OR_OP)) { - bval = this->filter_admin_.match (event TAO_ENV_ARG_PARAMETER); + bval = this->filter_admin_.match (event ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return bval; } @@ -127,14 +127,14 @@ TAO_Notify_ProxySupplier::evaluate_filter (TAO_Notify_Event &event } else { - int status = this->filter_admin_.match (event TAO_ENV_ARG_PARAMETER); + int status = this->filter_admin_.match (event ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return status; } } template void -TAO_Notify_ProxySupplier::dispatch_event (TAO_Notify_Event &event TAO_ENV_ARG_DECL) +TAO_Notify_ProxySupplier::dispatch_event (TAO_Notify_Event &event ACE_ENV_ARG_DECL) { if (this->is_connected_ == 0) { @@ -156,7 +156,7 @@ TAO_Notify_ProxySupplier::dispatch_event (TAO_Notify_Event &event if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " "dispatching event\n")); - this->dispatch_event_i (event TAO_ENV_ARG_PARAMETER); + this->dispatch_event_i (event ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -174,7 +174,7 @@ TAO_Notify_ProxySupplier::filter_eval_task (void) } template void -TAO_Notify_ProxySupplier::subscription_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL) +TAO_Notify_ProxySupplier::subscription_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyComm::InvalidEventType @@ -183,7 +183,7 @@ TAO_Notify_ProxySupplier::subscription_change (const CosNotificati if (this->is_connected_ == 1) { this->event_manager_->subscribe_for_events (this, - added, removed TAO_ENV_ARG_PARAMETER); + added, removed ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -199,7 +199,7 @@ TAO_Notify_ProxySupplier::subscription_change (const CosNotificati } template void -TAO_Notify_ProxySupplier::on_connected (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ProxySupplier::on_connected (ACE_ENV_SINGLE_ARG_DECL) { // Get hold of the admin properties. TAO_Notify_AdminProperties* const admin_properties = @@ -213,7 +213,7 @@ TAO_Notify_ProxySupplier::on_connected (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW (CORBA::IMP_LIMIT ()); // we've reached the limit of consumers connected. // register with CA - this->consumer_admin_->register_listener (this TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->register_listener (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; CosNotification::EventTypeSeq added; @@ -227,17 +227,17 @@ TAO_Notify_ProxySupplier::on_connected (TAO_ENV_SINGLE_ARG_DECL) this->subscription_list_.populate (added); this->event_manager_->subscribe_for_events (this, - added, removed TAO_ENV_ARG_PARAMETER); + added, removed ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->event_manager_->register_for_publication_updates (this TAO_ENV_ARG_PARAMETER); + this->event_manager_->register_for_publication_updates (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; (*consumer_count)++; } template void -TAO_Notify_ProxySupplier::on_disconnected (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ProxySupplier::on_disconnected (ACE_ENV_SINGLE_ARG_DECL) { { ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, @@ -261,18 +261,18 @@ TAO_Notify_ProxySupplier::on_disconnected (TAO_ENV_SINGLE_ARG_DECL this->subscription_list_.populate (removed); this->event_manager_->subscribe_for_events (this, - added, removed TAO_ENV_ARG_PARAMETER); + added, removed ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->event_manager_->unregister_from_publication_updates (this TAO_ENV_ARG_PARAMETER); + this->event_manager_->unregister_from_publication_updates (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; // shutdown the tasks. - this->dispatching_task_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->dispatching_task_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->filter_eval_task_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->filter_eval_task_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Get hold of the admin properties. @@ -283,7 +283,7 @@ TAO_Notify_ProxySupplier::on_disconnected (TAO_ENV_SINGLE_ARG_DECL } template void -TAO_Notify_ProxySupplier::suspend_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) +TAO_Notify_ProxySupplier::suspend_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyChannelAdmin::ConnectionAlreadyInactive, @@ -294,7 +294,7 @@ TAO_Notify_ProxySupplier::suspend_connection (TAO_ENV_SINGLE_ARG_D } template void -TAO_Notify_ProxySupplier::resume_connection (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ProxySupplier::resume_connection (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyChannelAdmin::ConnectionAlreadyActive, @@ -312,7 +312,7 @@ TAO_Notify_ProxySupplier::resume_connection (TAO_ENV_SINGLE_ARG_DE while (this->event_list_.dequeue_head (event) == 0) { - this->dispatch_event_i (*event TAO_ENV_ARG_PARAMETER); + this->dispatch_event_i (*event ACE_ENV_ARG_PARAMETER); ACE_CHECK; delete event; @@ -321,16 +321,16 @@ TAO_Notify_ProxySupplier::resume_connection (TAO_ENV_SINGLE_ARG_DE } template CosNotifyChannelAdmin::ConsumerAdmin_ptr -TAO_Notify_ProxySupplier::MyAdmin (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ProxySupplier::MyAdmin (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->consumer_admin_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->consumer_admin_->get_ref (ACE_ENV_SINGLE_ARG_PARAMETER); } template CosNotifyFilter::MappingFilter_ptr -TAO_Notify_ProxySupplier::priority_filter (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ProxySupplier::priority_filter (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -340,7 +340,7 @@ TAO_Notify_ProxySupplier::priority_filter (TAO_ENV_SINGLE_ARG_DECL } template void -TAO_Notify_ProxySupplier::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/ TAO_ENV_ARG_DECL) +TAO_Notify_ProxySupplier::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/ ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -349,7 +349,7 @@ TAO_Notify_ProxySupplier::priority_filter (CosNotifyFilter::Mappin } template CosNotifyFilter::MappingFilter_ptr -TAO_Notify_ProxySupplier::lifetime_filter (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ProxySupplier::lifetime_filter (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -359,7 +359,7 @@ TAO_Notify_ProxySupplier::lifetime_filter (TAO_ENV_SINGLE_ARG_DECL } template void -TAO_Notify_ProxySupplier::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/ TAO_ENV_ARG_DECL) +TAO_Notify_ProxySupplier::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/ ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -368,7 +368,7 @@ TAO_Notify_ProxySupplier::lifetime_filter (CosNotifyFilter::Mappin } template CosNotification::EventTypeSeq* -TAO_Notify_ProxySupplier::obtain_offered_types (CosNotifyChannelAdmin::ObtainInfoMode mode TAO_ENV_ARG_DECL) +TAO_Notify_ProxySupplier::obtain_offered_types (CosNotifyChannelAdmin::ObtainInfoMode mode ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -387,14 +387,14 @@ TAO_Notify_ProxySupplier::obtain_offered_types (CosNotifyChannelAd // if updates are currently off, switch them on. if (this->updates_on_ == 0) this->event_manager_->register_for_publication_updates (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } else { // if updates are currently on, switch them off. if (this->updates_on_ == 1) this->event_manager_->unregister_from_publication_updates (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } return event_type_seq; } @@ -402,14 +402,14 @@ TAO_Notify_ProxySupplier::obtain_offered_types (CosNotifyChannelAd template void TAO_Notify_ProxySupplier::set_qos ( const CosNotification::QoSProperties & qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotification::UnsupportedQoS )) { // Call our base class set_qos (). - TAO_Notify_Proxy::set_qos (qos TAO_ENV_ARG_PARAMETER); + TAO_Notify_Proxy::set_qos (qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Then update our task's qos diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.h index de1cc1522de..4d172d15b13 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.h @@ -47,13 +47,13 @@ public: virtual ~TAO_Notify_ProxySupplier (void); // Destructor - void init (CosNotifyChannelAdmin::ProxyID myID TAO_ENV_ARG_DECL); + void init (CosNotifyChannelAdmin::ProxyID myID ACE_ENV_ARG_DECL); // Init the Proxy. // = Notify_Event_Listener methods - virtual void dispatch_event (TAO_Notify_Event &event TAO_ENV_ARG_DECL); + virtual void dispatch_event (TAO_Notify_Event &event ACE_ENV_ARG_DECL); - virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean eval_parent TAO_ENV_ARG_DECL); + virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean eval_parent ACE_ENV_ARG_DECL); virtual TAO_Notify_Worker_Task* event_dispatch_task (void); // The Worker task associated with the event listener for event dispatching @@ -63,14 +63,14 @@ public: // = Interface methods virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr MyAdmin ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void suspend_connection ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -79,7 +79,7 @@ public: )); virtual void resume_connection ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -88,7 +88,7 @@ public: )); virtual CosNotifyFilter::MappingFilter_ptr priority_filter ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -96,14 +96,14 @@ public: virtual void priority_filter ( CosNotifyFilter::MappingFilter_ptr priority_filter - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyFilter::MappingFilter_ptr lifetime_filter ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -111,7 +111,7 @@ public: virtual void lifetime_filter ( CosNotifyFilter::MappingFilter_ptr lifetime_filter - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -119,7 +119,7 @@ public: virtual CosNotification::EventTypeSeq * obtain_offered_types ( CosNotifyChannelAdmin::ObtainInfoMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -128,7 +128,7 @@ public: virtual void subscription_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -139,7 +139,7 @@ public: // so we can update the qos on our tasks. virtual void set_qos ( const CosNotification::QoSProperties & qos - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -148,13 +148,13 @@ public: protected: // = Helper methods - virtual void dispatch_event_i (TAO_Notify_Event &event TAO_ENV_ARG_DECL) = 0; + virtual void dispatch_event_i (TAO_Notify_Event &event ACE_ENV_ARG_DECL) = 0; // Derived classes should implement this. - void on_connected (TAO_ENV_SINGLE_ARG_DECL); + void on_connected (ACE_ENV_SINGLE_ARG_DECL); // Derived classes should call this when their consumers connect. - void on_disconnected (TAO_ENV_SINGLE_ARG_DECL); + void on_disconnected (ACE_ENV_SINGLE_ARG_DECL); // Derived classes should call this when their consumers disconnect. // = Data members diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.cpp index 90f946d3ec4..690b25585e7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.cpp @@ -50,19 +50,19 @@ TAO_Notify_Proxy::_decr_refcnt (void) } template void -TAO_Notify_Proxy::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) +TAO_Notify_Proxy::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/) { this->_incr_refcnt (); } template void -TAO_Notify_Proxy::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) +TAO_Notify_Proxy::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/) { this->_decr_refcnt (); } template void -TAO_Notify_Proxy::dispatch_update (TAO_Notify_EventType_List& added_list, TAO_Notify_EventType_List& removed_list TAO_ENV_ARG_DECL) +TAO_Notify_Proxy::dispatch_update (TAO_Notify_EventType_List& added_list, TAO_Notify_EventType_List& removed_list ACE_ENV_ARG_DECL) { CosNotification::EventTypeSeq added (added_list.size ()); CosNotification::EventTypeSeq removed (removed_list.size ()); @@ -70,11 +70,11 @@ TAO_Notify_Proxy::dispatch_update (TAO_Notify_EventType_List& adde added_list.populate (added); removed_list.populate (removed); - this->dispatch_update_i (added, removed TAO_ENV_ARG_PARAMETER); + this->dispatch_update_i (added, removed ACE_ENV_ARG_PARAMETER); } template CosNotifyChannelAdmin::ProxyType -TAO_Notify_Proxy::MyType (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) +TAO_Notify_Proxy::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -83,7 +83,7 @@ TAO_Notify_Proxy::MyType (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_EN } template void -TAO_Notify_Proxy::validate_event_qos (const CosNotification::QoSProperties & /*required_qos*/, CosNotification::NamedPropertyRangeSeq_out /*available_qos*/ TAO_ENV_ARG_DECL) +TAO_Notify_Proxy::validate_event_qos (const CosNotification::QoSProperties & /*required_qos*/, CosNotification::NamedPropertyRangeSeq_out /*available_qos*/ ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotification::UnsupportedQoS @@ -93,25 +93,25 @@ TAO_Notify_Proxy::validate_event_qos (const CosNotification::QoSPr } template CosNotification::QoSProperties* -TAO_Notify_Proxy::get_qos (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Proxy::get_qos (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->qos_admin_.get_qos (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->qos_admin_.get_qos (ACE_ENV_SINGLE_ARG_PARAMETER); } template void -TAO_Notify_Proxy::set_qos (const CosNotification::QoSProperties & qos TAO_ENV_ARG_DECL) +TAO_Notify_Proxy::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotification::UnsupportedQoS )) { - this->qos_admin_.set_qos (qos TAO_ENV_ARG_PARAMETER); + this->qos_admin_.set_qos (qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->setup_qos_policies (TAO_ENV_SINGLE_ARG_PARAMETER); + this->setup_qos_policies (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -119,64 +119,64 @@ template void TAO_Notify_Proxy::validate_qos ( const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, CosNotification::UnsupportedQoS )) { - this->qos_admin_.validate_qos (required_qos, available_qos TAO_ENV_ARG_PARAMETER); + this->qos_admin_.validate_qos (required_qos, available_qos ACE_ENV_ARG_PARAMETER); } template CosNotifyFilter::FilterID -TAO_Notify_Proxy::add_filter (CosNotifyFilter::Filter_ptr new_filter TAO_ENV_ARG_DECL) +TAO_Notify_Proxy::add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->filter_admin_.add_filter (new_filter TAO_ENV_ARG_PARAMETER); + return this->filter_admin_.add_filter (new_filter ACE_ENV_ARG_PARAMETER); } template void TAO_Notify_Proxy::remove_filter ( CosNotifyFilter::FilterID filter - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyFilter::FilterNotFound )) { - this->filter_admin_.remove_filter (filter TAO_ENV_ARG_PARAMETER); + this->filter_admin_.remove_filter (filter ACE_ENV_ARG_PARAMETER); } template CosNotifyFilter::Filter_ptr -TAO_Notify_Proxy::get_filter (CosNotifyFilter::FilterID filter TAO_ENV_ARG_DECL) +TAO_Notify_Proxy::get_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyFilter::FilterNotFound )) { - return this->filter_admin_.get_filter (filter TAO_ENV_ARG_PARAMETER); + return this->filter_admin_.get_filter (filter ACE_ENV_ARG_PARAMETER); } template CosNotifyFilter::FilterIDSeq* -TAO_Notify_Proxy::get_all_filters (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Proxy::get_all_filters (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->filter_admin_.get_all_filters (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->filter_admin_.get_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER); } template void -TAO_Notify_Proxy::remove_all_filters (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Proxy::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - this->filter_admin_.remove_all_filters (TAO_ENV_SINGLE_ARG_PARAMETER); + this->filter_admin_.remove_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER); } template const TAO_Notify_QoSAdmin_i& @@ -187,9 +187,9 @@ TAO_Notify_Proxy::qos_admin (void) const template void TAO_Notify_Proxy::setup_qos_policies ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) { - this->filter_admin_.remove_all_filters (TAO_ENV_SINGLE_ARG_PARAMETER); + this->filter_admin_.remove_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER); } #endif /* TAO_NOTIFY_PROXY_T_C */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.h index cbfbb59f1c7..5660c3a0c83 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.h @@ -68,14 +68,14 @@ public: // Increment and decrement the reference count. // = The Servant methods - virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL); - virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL); + virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL); + virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL); // = Notify_Update_Listener methods - virtual void dispatch_update (TAO_Notify_EventType_List& added_list, TAO_Notify_EventType_List& removed_list TAO_ENV_ARG_DECL); + virtual void dispatch_update (TAO_Notify_EventType_List& added_list, TAO_Notify_EventType_List& removed_list ACE_ENV_ARG_DECL); virtual CosNotifyChannelAdmin::ProxyType MyType ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -84,7 +84,7 @@ public: virtual void validate_event_qos ( const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -92,7 +92,7 @@ public: )); virtual CosNotification::QoSProperties * get_qos ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -100,7 +100,7 @@ public: virtual void set_qos ( const CosNotification::QoSProperties & qos - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -110,7 +110,7 @@ public: virtual void validate_qos ( const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -119,7 +119,7 @@ public: virtual CosNotifyFilter::FilterID add_filter ( CosNotifyFilter::Filter_ptr new_filter - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -127,7 +127,7 @@ public: virtual void remove_filter ( CosNotifyFilter::FilterID filter - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -136,7 +136,7 @@ public: virtual CosNotifyFilter::Filter_ptr get_filter ( CosNotifyFilter::FilterID filter - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -144,14 +144,14 @@ public: )); virtual CosNotifyFilter::FilterIDSeq * get_all_filters ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void remove_all_filters ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -160,10 +160,10 @@ public: const TAO_Notify_QoSAdmin_i& qos_admin (void) const; protected: - virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL) = 0; + virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed ACE_ENV_ARG_DECL) = 0; // Derived types should implement this to deliver the update. - virtual void setup_qos_policies (TAO_ENV_SINGLE_ARG_DECL); + virtual void setup_qos_policies (ACE_ENV_SINGLE_ARG_DECL); // Derived types may implement this if they need to do something // directly after setting the qos policies. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.cpp index 40580ea329b..97287df8c1d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.cpp @@ -44,7 +44,7 @@ TAO_Notify_QoSAdmin_i::~TAO_Notify_QoSAdmin_i (void) } CosNotification::QoSProperties * TAO_Notify_QoSAdmin_i::get_qos ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -142,7 +142,7 @@ CosNotification::QoSProperties * TAO_Notify_QoSAdmin_i::get_qos ( void TAO_Notify_QoSAdmin_i::set_qos (const CosNotification::QoSProperties & qos - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -232,7 +232,7 @@ void TAO_Notify_QoSAdmin_i::validate_qos ( const CosNotification::QoSProperties & /*required_qos*/, CosNotification::NamedPropertyRangeSeq_out /*available_qos*/ - TAO_ENV_ARG_DECL_NOT_USED //TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_ARG_DECL_NOT_USED //ACE_ENV_SINGLE_ARG_PARAMETER ) ACE_THROW_SPEC (( CORBA::SystemException, diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.h index 049c0bdf25e..c53a847ca51 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.h @@ -44,7 +44,7 @@ public: // Destructor virtual CosNotification::QoSProperties * get_qos ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -52,7 +52,7 @@ public: virtual void set_qos ( const CosNotification::QoSProperties & qos - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -62,7 +62,7 @@ public: virtual void validate_qos ( const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.cpp index 3e30a801e72..d85cb9f24b3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.cpp @@ -20,7 +20,7 @@ TAO_Notify_SequenceProxyPushConsumer_i::~TAO_Notify_SequenceProxyPushConsumer_i } void -TAO_Notify_SequenceProxyPushConsumer_i::connect_sequence_push_supplier (CosNotifyComm::SequencePushSupplier_ptr push_supplier TAO_ENV_ARG_DECL) +TAO_Notify_SequenceProxyPushConsumer_i::connect_sequence_push_supplier (CosNotifyComm::SequencePushSupplier_ptr push_supplier ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected @@ -51,7 +51,7 @@ TAO_Notify_SequenceProxyPushConsumer_i::connect_sequence_push_supplier (CosNotif CORBA::INTERNAL ()); ACE_TRY_CHECK; - this->on_connected (TAO_ENV_SINGLE_ARG_PARAMETER); + this->on_connected (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -66,12 +66,12 @@ TAO_Notify_SequenceProxyPushConsumer_i::connect_sequence_push_supplier (CosNotif } void -TAO_Notify_SequenceProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL) +TAO_Notify_SequenceProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed ACE_ENV_ARG_DECL) { ACE_TRY { this->push_supplier_->subscription_change (added, removed - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHALL @@ -82,7 +82,7 @@ TAO_Notify_SequenceProxyPushConsumer_i::dispatch_update_i (CosNotification::Even } void -TAO_Notify_SequenceProxyPushConsumer_i::push_structured_events (const CosNotification::EventBatch & notifications TAO_ENV_ARG_DECL) +TAO_Notify_SequenceProxyPushConsumer_i::push_structured_events (const CosNotification::EventBatch & notifications ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosEventComm::Disconnected @@ -102,24 +102,24 @@ TAO_Notify_SequenceProxyPushConsumer_i::push_structured_events (const CosNotific new TAO_Notify_StructuredEvents (notifications); // Send 'em out - this->event_manager_->process_event (notify_events, this TAO_ENV_ARG_PARAMETER); + this->event_manager_->process_event (notify_events, this ACE_ENV_ARG_PARAMETER); ACE_CHECK; notify_events->_decr_refcnt (); } void -TAO_Notify_SequenceProxyPushConsumer_i::disconnect_sequence_push_consumer (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_SequenceProxyPushConsumer_i::disconnect_sequence_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { // ask our parent to deaactivate us. this->supplier_admin_-> - deactivate_proxy_pushconsumer (this TAO_ENV_ARG_PARAMETER); + deactivate_proxy_pushconsumer (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->on_disconnected (TAO_ENV_SINGLE_ARG_PARAMETER); + this->on_disconnected (ACE_ENV_SINGLE_ARG_PARAMETER); } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.h index c89f90c755f..8713adf8aa6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.h @@ -52,7 +52,7 @@ public: // = interface methods virtual void connect_sequence_push_supplier ( CosNotifyComm::SequencePushSupplier_ptr push_supplier - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -61,7 +61,7 @@ public: virtual void push_structured_events ( const CosNotification::EventBatch & notifications - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -69,7 +69,7 @@ public: )); virtual void disconnect_sequence_push_consumer ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -77,7 +77,7 @@ public: protected: // = Helper methods - virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL); + virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed ACE_ENV_ARG_DECL); // Sends updates to the supplier. // = Data members diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.cpp index 453388240c1..68af758ef3a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.cpp @@ -28,7 +28,7 @@ TAO_Notify_SequenceProxyPushSupplier_i::~TAO_Notify_SequenceProxyPushSupplier_i } void -TAO_Notify_SequenceProxyPushSupplier_i::connect_sequence_push_consumer (CosNotifyComm::SequencePushConsumer_ptr push_consumer TAO_ENV_ARG_DECL) +TAO_Notify_SequenceProxyPushSupplier_i::connect_sequence_push_consumer (CosNotifyComm::SequencePushConsumer_ptr push_consumer ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected, @@ -60,7 +60,7 @@ TAO_Notify_SequenceProxyPushSupplier_i::connect_sequence_push_consumer (CosNotif CORBA::INTERNAL ()); ACE_CHECK; - this->on_connected (TAO_ENV_SINGLE_ARG_PARAMETER); + this->on_connected (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -75,7 +75,7 @@ TAO_Notify_SequenceProxyPushSupplier_i::connect_sequence_push_consumer (CosNotif void TAO_Notify_SequenceProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event& events - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // If we are in this method then we are a SequenceProxyPushSupplier // connected up to a SequenceProxyPushConsumer and the only thing @@ -102,7 +102,7 @@ TAO_Notify_SequenceProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event& even this->qos_admin (), this->event_cache_, this->from_timeout_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } else { @@ -110,7 +110,7 @@ TAO_Notify_SequenceProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event& even this->qos_admin (), this->event_cache_, this->from_timeout_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_TRY_CHECK; } @@ -123,11 +123,11 @@ TAO_Notify_SequenceProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event& even } void -TAO_Notify_SequenceProxyPushSupplier_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL) +TAO_Notify_SequenceProxyPushSupplier_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed ACE_ENV_ARG_DECL) { ACE_TRY { - this->push_consumer_->offer_change (added, removed TAO_ENV_ARG_PARAMETER); + this->push_consumer_->offer_change (added, removed ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHALL @@ -138,22 +138,22 @@ TAO_Notify_SequenceProxyPushSupplier_i::dispatch_update_i (CosNotification::Even } void -TAO_Notify_SequenceProxyPushSupplier_i::disconnect_sequence_push_supplier(TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_SequenceProxyPushSupplier_i::disconnect_sequence_push_supplier(ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - this->on_disconnected (TAO_ENV_SINGLE_ARG_PARAMETER); + this->on_disconnected (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // ask our parent to deactivate us. this->consumer_admin_-> - deactivate_proxy_pushsupplier (this TAO_ENV_ARG_PARAMETER); + deactivate_proxy_pushsupplier (this ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_SequenceProxyPushSupplier_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_SequenceProxyPushSupplier_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) { // Tell the consumer that we're going away ... // @@ Later, lookup a "notify_on_disconnect" option. @@ -165,12 +165,12 @@ TAO_Notify_SequenceProxyPushSupplier_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) return; } - this->disconnect_sequence_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + this->disconnect_sequence_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_TRY { - this->push_consumer_->disconnect_sequence_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + this->push_consumer_->disconnect_sequence_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHALL @@ -183,7 +183,7 @@ TAO_Notify_SequenceProxyPushSupplier_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) void TAO_Notify_SequenceProxyPushSupplier_i::setup_qos_policies ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) { # if defined (ACE_CONFIG_WIN32_H) ACE_Time_Value interval ( @@ -198,7 +198,7 @@ TAO_Notify_SequenceProxyPushSupplier_i::setup_qos_policies ( TAO_Notify_CO_Factory* cof = TAO_Notify_Factory::get_channel_objects_factory (); - this->batch_lock_ = cof->create_proxy_supplier_lock (TAO_ENV_SINGLE_ARG_PARAMETER); + this->batch_lock_ = cof->create_proxy_supplier_lock (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Get back to the reactor to schedule the timer @@ -243,7 +243,7 @@ TAO_Notify_SequenceProxyPushSupplier_i::handle_timeout ( // the event cache will be flushed a split second before it // normally would. this->from_timeout_ = 1; - this->dispatch_event (dummy_events TAO_ENV_ARG_PARAMETER); + this->dispatch_event (dummy_events ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.h index 1e652f71358..9bf891c40c2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.h @@ -50,7 +50,7 @@ public: virtual void connect_sequence_push_consumer ( CosNotifyComm::SequencePushConsumer_ptr push_consumer - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -60,24 +60,24 @@ public: // @@ Pradeep: more indentation problems.... virtual void disconnect_sequence_push_supplier ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL); // Shutdown. protected: - virtual void dispatch_event_i (TAO_Notify_Event &event TAO_ENV_ARG_DECL); + virtual void dispatch_event_i (TAO_Notify_Event &event ACE_ENV_ARG_DECL); // Deliver the event to the consumer. - virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL); + virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed ACE_ENV_ARG_DECL); // Deliver the update to the consumer. - void setup_qos_policies (TAO_ENV_SINGLE_ARG_DECL); + void setup_qos_policies (ACE_ENV_SINGLE_ARG_DECL); // Do what we need to do after the qos policies are set. virtual int handle_timeout (const ACE_Time_Value& current_time, diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.cpp index 48619250ed9..d3ba6f93475 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.cpp @@ -24,16 +24,16 @@ TAO_Notify_Source_Filter_Eval_Command::~TAO_Notify_Source_Filter_Eval_Command () } int -TAO_Notify_Source_Filter_Eval_Command::execute (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Source_Filter_Eval_Command::execute (ACE_ENV_SINGLE_ARG_DECL) { CORBA::Boolean result = - this->event_source_->evaluate_filter (*this->event_ TAO_ENV_ARG_PARAMETER); + this->event_source_->evaluate_filter (*this->event_ ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (result == 1) { this->event_processor_-> - lookup_subscriptions (this->event_, this->event_source_ TAO_ENV_ARG_PARAMETER); + lookup_subscriptions (this->event_, this->event_source_ ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.h index 50fd2182489..68e9032839c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.h @@ -48,7 +48,7 @@ public: ~TAO_Notify_Source_Filter_Eval_Command (); // Destructor. - virtual int execute (TAO_ENV_SINGLE_ARG_DECL); + virtual int execute (ACE_ENV_SINGLE_ARG_DECL); // Command callback protected: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredEvents.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredEvents.cpp index 9c078458fb4..f7a3864d8e3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredEvents.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredEvents.cpp @@ -91,7 +91,7 @@ TAO_Notify_StructuredEvents::event_type (void) const CORBA::Boolean TAO_Notify_StructuredEvents::do_match (CosNotifyFilter::Filter_ptr filter - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " @@ -104,7 +104,7 @@ TAO_Notify_StructuredEvents::do_match (CosNotifyFilter::Filter_ptr filter for (CORBA::ULong i = 0; i < length; i++) { CORBA::Boolean matched = filter->match_structured (this->data_[i] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (matched) @@ -124,7 +124,7 @@ TAO_Notify_StructuredEvents::do_match (CosNotifyFilter::Filter_ptr filter void TAO_Notify_StructuredEvents::do_push (CosEventComm::PushConsumer_ptr consumer - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { CORBA::ULong sending_length = (this->match_called_ ? this->matching_.length () : @@ -134,14 +134,14 @@ TAO_Notify_StructuredEvents::do_push (CosEventComm::PushConsumer_ptr consumer CORBA::Any any; any <<= this->data_[(this->match_called_ ? this->matching_[i] : i)]; - consumer->push (any TAO_ENV_ARG_PARAMETER); + consumer->push (any ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } void TAO_Notify_StructuredEvents::do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { CORBA::ULong sending_length = (this->match_called_ ? this->matching_.length () : @@ -150,7 +150,7 @@ TAO_Notify_StructuredEvents::do_push (CosNotifyComm::StructuredPushConsumer_ptr { consumer->push_structured_event (this->data_[(this->match_called_ ? this->matching_[i] : i)] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -161,7 +161,7 @@ TAO_Notify_StructuredEvents::do_push ( const TAO_Notify_QoSAdmin_i& qos_admin, CosNotification::EventBatch& unsent, int flush_queue - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " @@ -190,7 +190,7 @@ TAO_Notify_StructuredEvents::do_push ( { matched[i] = unsent[i]; } - consumer->push_structured_events (matched TAO_ENV_ARG_PARAMETER); + consumer->push_structured_events (matched ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Shift the rest of the unsent messages to the front. @@ -229,7 +229,7 @@ TAO_Notify_StructuredEvents::do_push ( this->matching_[index] : index)]; start++; } - consumer->push_structured_events (matched TAO_ENV_ARG_PARAMETER); + consumer->push_structured_events (matched ACE_ENV_ARG_PARAMETER); ACE_CHECK; unsent.length (0); @@ -245,7 +245,7 @@ TAO_Notify_StructuredEvents::do_push ( this->matching_[start] : start)]; start++; } - consumer->push_structured_events (matched TAO_ENV_ARG_PARAMETER); + consumer->push_structured_events (matched ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredEvents.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredEvents.h index 0fbb4bbe639..a41afe4b417 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredEvents.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredEvents.h @@ -45,14 +45,14 @@ public: virtual CORBA::Boolean is_special_event_type (void) const; virtual const TAO_Notify_EventType& event_type (void) const; - virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter TAO_ENV_ARG_DECL); - virtual void do_push (CosEventComm::PushConsumer_ptr consumer TAO_ENV_ARG_DECL) const; - virtual void do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer TAO_ENV_ARG_DECL) const; + virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL); + virtual void do_push (CosEventComm::PushConsumer_ptr consumer ACE_ENV_ARG_DECL) const; + virtual void do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer ACE_ENV_ARG_DECL) const; virtual void do_push (CosNotifyComm::SequencePushConsumer_ptr consumer, const TAO_Notify_QoSAdmin_i& qos_admin, CosNotification::EventBatch& unsent, int flush_queue - TAO_ENV_ARG_DECL) const; + ACE_ENV_ARG_DECL) const; protected: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.cpp index c5a6f80b12f..277be4d1b89 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.cpp @@ -19,7 +19,7 @@ TAO_Notify_StructuredProxyPushConsumer_i::~TAO_Notify_StructuredProxyPushConsume } void -TAO_Notify_StructuredProxyPushConsumer_i::connect_structured_push_supplier (CosNotifyComm::StructuredPushSupplier_ptr push_supplier TAO_ENV_ARG_DECL) +TAO_Notify_StructuredProxyPushConsumer_i::connect_structured_push_supplier (CosNotifyComm::StructuredPushSupplier_ptr push_supplier ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected @@ -46,7 +46,7 @@ TAO_Notify_StructuredProxyPushConsumer_i::connect_structured_push_supplier (CosN CORBA::INTERNAL ()); ACE_TRY_CHECK; - this->on_connected (TAO_ENV_SINGLE_ARG_PARAMETER); + this->on_connected (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -61,12 +61,12 @@ TAO_Notify_StructuredProxyPushConsumer_i::connect_structured_push_supplier (CosN } void -TAO_Notify_StructuredProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL) +TAO_Notify_StructuredProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed ACE_ENV_ARG_DECL) { ACE_TRY { this->push_supplier_->subscription_change (added, removed - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHALL @@ -77,7 +77,7 @@ TAO_Notify_StructuredProxyPushConsumer_i::dispatch_update_i (CosNotification::Ev } void -TAO_Notify_StructuredProxyPushConsumer_i::push_structured_event (const CosNotification::StructuredEvent & notification TAO_ENV_ARG_DECL) +TAO_Notify_StructuredProxyPushConsumer_i::push_structured_event (const CosNotification::StructuredEvent & notification ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosEventComm::Disconnected @@ -100,24 +100,24 @@ TAO_Notify_StructuredProxyPushConsumer_i::push_structured_event (const CosNotifi TAO_Notify_StructuredEvent* notify_event = new TAO_Notify_StructuredEvent (notification_copy); - this->event_manager_->process_event (notify_event, this TAO_ENV_ARG_PARAMETER); + this->event_manager_->process_event (notify_event, this ACE_ENV_ARG_PARAMETER); ACE_CHECK; notify_event->_decr_refcnt (); } void -TAO_Notify_StructuredProxyPushConsumer_i::disconnect_structured_push_consumer (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_StructuredProxyPushConsumer_i::disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { // ask our parent to deactivate us. this->supplier_admin_-> - deactivate_proxy_pushconsumer (this TAO_ENV_ARG_PARAMETER); + deactivate_proxy_pushconsumer (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->on_disconnected (TAO_ENV_SINGLE_ARG_PARAMETER); + this->on_disconnected (ACE_ENV_SINGLE_ARG_PARAMETER); } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.h index 6f166c499e8..e83adff731d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.h @@ -58,7 +58,7 @@ public: // = interface methods virtual void connect_structured_push_supplier ( CosNotifyComm::StructuredPushSupplier_ptr push_supplier - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -67,7 +67,7 @@ public: virtual void push_structured_event ( const CosNotification::StructuredEvent & notification - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -75,7 +75,7 @@ virtual void push_structured_event ( )); virtual void disconnect_structured_push_consumer ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -83,7 +83,7 @@ virtual void push_structured_event ( protected: // = Helper methods - virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL); + virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed ACE_ENV_ARG_DECL); // dispatch updates to the supplier. // = Data members diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.cpp index ab811b694d9..00770c13a3a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.cpp @@ -18,7 +18,7 @@ TAO_Notify_StructuredProxyPushSupplier_i::~TAO_Notify_StructuredProxyPushSupplie } void -TAO_Notify_StructuredProxyPushSupplier_i::connect_structured_push_consumer (CosNotifyComm::StructuredPushConsumer_ptr push_consumer TAO_ENV_ARG_DECL) +TAO_Notify_StructuredProxyPushSupplier_i::connect_structured_push_consumer (CosNotifyComm::StructuredPushConsumer_ptr push_consumer ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected, @@ -53,7 +53,7 @@ TAO_Notify_StructuredProxyPushSupplier_i::connect_structured_push_consumer (CosN CORBA::INTERNAL ()); ACE_CHECK; - this->on_connected (TAO_ENV_SINGLE_ARG_PARAMETER); + this->on_connected (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -70,28 +70,28 @@ TAO_Notify_StructuredProxyPushSupplier_i::connect_structured_push_consumer (CosN } void -TAO_Notify_StructuredProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event &event TAO_ENV_ARG_DECL) +TAO_Notify_StructuredProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event &event ACE_ENV_ARG_DECL) { ACE_TRY { - event.do_push (this->push_consumer_.in () TAO_ENV_ARG_PARAMETER); + event.do_push (this->push_consumer_.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHALL { ACE_DEBUG ((LM_DEBUG, "Exception dispatching structured event\n")); // misbehaving client, - this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); // FUZZ: ignore check_for_ace_check + this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); // FUZZ: ignore check_for_ace_check } ACE_ENDTRY; } void -TAO_Notify_StructuredProxyPushSupplier_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL) +TAO_Notify_StructuredProxyPushSupplier_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed ACE_ENV_ARG_DECL) { ACE_TRY { - this->push_consumer_->offer_change (added, removed TAO_ENV_ARG_PARAMETER); + this->push_consumer_->offer_change (added, removed ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -104,31 +104,31 @@ TAO_Notify_StructuredProxyPushSupplier_i::dispatch_update_i (CosNotification::Ev } void -TAO_Notify_StructuredProxyPushSupplier_i::shutdown_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_StructuredProxyPushSupplier_i::shutdown_i (ACE_ENV_SINGLE_ARG_DECL) { - this->on_disconnected (TAO_ENV_SINGLE_ARG_PARAMETER); + this->on_disconnected (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // ask our parent to deactivate us. this->consumer_admin_-> - deactivate_proxy_pushsupplier (this TAO_ENV_ARG_PARAMETER); + deactivate_proxy_pushsupplier (this ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_StructuredProxyPushSupplier_i::disconnect_structured_push_supplier(TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_StructuredProxyPushSupplier_i::disconnect_structured_push_supplier(ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { // unregister with CA - this->consumer_admin_->unregister_listener (this TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->unregister_listener (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->shutdown_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->shutdown_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_StructuredProxyPushSupplier_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_StructuredProxyPushSupplier_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) { // Tell the consumer that we're going away ... // @@ Later, lookup a "notify_on_disconnect" option. @@ -140,12 +140,12 @@ TAO_Notify_StructuredProxyPushSupplier_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) return; } - this->shutdown_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->shutdown_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_TRY { - this->push_consumer_->disconnect_structured_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + this->push_consumer_->disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHALL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.h index 0e578846a02..b73ebe944dc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.h @@ -54,7 +54,7 @@ class TAO_Notify_Export TAO_Notify_StructuredProxyPushSupplier_i : public TAO_No virtual void connect_structured_push_consumer ( CosNotifyComm::StructuredPushConsumer_ptr push_consumer - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -63,24 +63,24 @@ class TAO_Notify_Export TAO_Notify_StructuredProxyPushSupplier_i : public TAO_No )); virtual void disconnect_structured_push_supplier ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL); // Shutdown. protected: // = Helper methods - void shutdown_i (TAO_ENV_SINGLE_ARG_DECL); + void shutdown_i (ACE_ENV_SINGLE_ARG_DECL); // Shutdown - virtual void dispatch_event_i (TAO_Notify_Event &event TAO_ENV_ARG_DECL); + virtual void dispatch_event_i (TAO_Notify_Event &event ACE_ENV_ARG_DECL); // Deliver the event to the consumer. - virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL); + virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed ACE_ENV_ARG_DECL); // Deliver the update to the consumer. // = Data Members diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp index d3a54d94d95..4e30fc27bc0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp @@ -50,7 +50,7 @@ void TAO_Notify_SupplierAdmin_i::init (CosNotifyChannelAdmin::AdminID my_id, CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator, PortableServer::POA_ptr my_POA - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->my_POA_ = PortableServer::POA::_duplicate (my_POA); @@ -60,12 +60,12 @@ TAO_Notify_SupplierAdmin_i::init (CosNotifyChannelAdmin::AdminID my_id, this->poa_factory_ = TAO_Notify_Factory::get_poa_factory (); this->lock_ = this->channel_objects_factory_-> - create_supplier_admin_lock (TAO_ENV_SINGLE_ARG_PARAMETER); + create_supplier_admin_lock (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->proxy_pushconsumer_POA_ = this->poa_factory_-> create_proxy_pushconsumer_POA (this->my_POA_.in (), my_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; my_id_ = my_id; @@ -73,14 +73,14 @@ TAO_Notify_SupplierAdmin_i::init (CosNotifyChannelAdmin::AdminID my_id, } CosNotifyChannelAdmin::SupplierAdmin_ptr -TAO_Notify_SupplierAdmin_i::get_ref (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_SupplierAdmin_i::get_ref (ACE_ENV_SINGLE_ARG_DECL) { // @@ Pradeep: if you get a chance to quantify this stuff you will // notice that this is a very expensive operation, you may want to // cache the result if it is invoked very often... CORBA::Object_var obj = this->poa_factory_-> - servant_to_reference (this->my_POA_.in (), this TAO_ENV_ARG_PARAMETER); + servant_to_reference (this->my_POA_.in (), this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil ()); return CosNotifyChannelAdmin::SupplierAdmin::_narrow (obj.in ()); @@ -102,15 +102,15 @@ TAO_Notify_SupplierAdmin_i::get_filter_admin (void) } void -TAO_Notify_SupplierAdmin_i::deactivate_proxy_pushconsumer (PortableServer::Servant servant TAO_ENV_ARG_DECL) +TAO_Notify_SupplierAdmin_i::deactivate_proxy_pushconsumer (PortableServer::Servant servant ACE_ENV_ARG_DECL) { this->poa_factory_-> deactivate_object (servant, this->proxy_pushconsumer_POA_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CosNotifyChannelAdmin::AdminID -TAO_Notify_SupplierAdmin_i::MyID (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) +TAO_Notify_SupplierAdmin_i::MyID (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -119,16 +119,16 @@ TAO_Notify_SupplierAdmin_i::MyID (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SING } CosNotifyChannelAdmin::EventChannel_ptr -TAO_Notify_SupplierAdmin_i::MyChannel (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_SupplierAdmin_i::MyChannel (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return event_channel_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + return event_channel_->get_ref (ACE_ENV_SINGLE_ARG_PARAMETER); } CosNotifyChannelAdmin::InterFilterGroupOperator -TAO_Notify_SupplierAdmin_i::MyOperator (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) +TAO_Notify_SupplierAdmin_i::MyOperator (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -137,7 +137,7 @@ TAO_Notify_SupplierAdmin_i::MyOperator (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_EN } CosNotifyChannelAdmin::ProxyIDSeq* -TAO_Notify_SupplierAdmin_i::push_consumers (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_SupplierAdmin_i::push_consumers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -146,11 +146,11 @@ TAO_Notify_SupplierAdmin_i::push_consumers (TAO_ENV_SINGLE_ARG_DECL) CORBA::INTERNAL ()); ACE_CHECK_RETURN (0); - return this->proxy_pushconsumer_ids_.get_sequence (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->proxy_pushconsumer_ids_.get_sequence (ACE_ENV_SINGLE_ARG_PARAMETER); } CosNotifyChannelAdmin::ProxyConsumer_ptr -TAO_Notify_SupplierAdmin_i::get_proxy_consumer (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL) +TAO_Notify_SupplierAdmin_i::get_proxy_consumer (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyChannelAdmin::ProxyNotFound @@ -159,74 +159,74 @@ TAO_Notify_SupplierAdmin_i::get_proxy_consumer (CosNotifyChannelAdmin::ProxyID p CORBA::Object_var obj = this->poa_factory_->id_to_reference (proxy_id, proxy_pushconsumer_POA_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxyConsumer::_nil ()); return CosNotifyChannelAdmin::ProxyConsumer::_narrow (obj.in ()); } CORBA::Object_ptr -TAO_Notify_SupplierAdmin_i::obtain_sequence_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL) +TAO_Notify_SupplierAdmin_i::obtain_sequence_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL) { TAO_Notify_SequenceProxyPushConsumer_i* seq_proxy_pushconsumer = this->channel_objects_factory_->create_seq_proxy_pushconsumer (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); PortableServer::ServantBase_var proxy_pushconsumer_var (seq_proxy_pushconsumer); - seq_proxy_pushconsumer->init (proxy_id TAO_ENV_ARG_PARAMETER); + seq_proxy_pushconsumer->init (proxy_id ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); return this->poa_factory_-> activate_object_with_id (proxy_id, this->proxy_pushconsumer_POA_.in (), seq_proxy_pushconsumer - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Object_ptr -TAO_Notify_SupplierAdmin_i::obtain_struct_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL) +TAO_Notify_SupplierAdmin_i::obtain_struct_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL) { TAO_Notify_StructuredProxyPushConsumer_i* struct_proxy_pushconsumer = this->channel_objects_factory_->create_struct_proxy_pushconsumer (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); PortableServer::ServantBase_var proxy_pushconsumer_var (struct_proxy_pushconsumer); - struct_proxy_pushconsumer->init (proxy_id TAO_ENV_ARG_PARAMETER); + struct_proxy_pushconsumer->init (proxy_id ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); return this->poa_factory_-> activate_object_with_id (proxy_id, this->proxy_pushconsumer_POA_.in (), struct_proxy_pushconsumer - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Object_ptr -TAO_Notify_SupplierAdmin_i::obtain_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL) +TAO_Notify_SupplierAdmin_i::obtain_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL) { TAO_Notify_ProxyPushConsumer_i* proxy_pushconsumer = this->channel_objects_factory_->create_proxy_pushconsumer (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); PortableServer::ServantBase_var proxy_pushconsumer_var (proxy_pushconsumer); - proxy_pushconsumer->init (proxy_id TAO_ENV_ARG_PARAMETER); + proxy_pushconsumer->init (proxy_id ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); return this->poa_factory_-> activate_object_with_id (proxy_id, this->proxy_pushconsumer_POA_.in (), proxy_pushconsumer - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CosNotifyChannelAdmin::ProxyConsumer_ptr -TAO_Notify_SupplierAdmin_i::obtain_notification_push_consumer (CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id TAO_ENV_ARG_DECL) +TAO_Notify_SupplierAdmin_i::obtain_notification_push_consumer (CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyChannelAdmin::AdminLimitExceeded @@ -246,7 +246,7 @@ TAO_Notify_SupplierAdmin_i::obtain_notification_push_consumer (CosNotifyChannelA { case CosNotifyChannelAdmin::ANY_EVENT: { - obj = this->obtain_proxy_pushconsumer_i (proxy_id TAO_ENV_ARG_PARAMETER); + obj = this->obtain_proxy_pushconsumer_i (proxy_id ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxyConsumer::_nil ()); } break; @@ -254,7 +254,7 @@ TAO_Notify_SupplierAdmin_i::obtain_notification_push_consumer (CosNotifyChannelA case CosNotifyChannelAdmin::STRUCTURED_EVENT: { obj = this->obtain_struct_proxy_pushconsumer_i (proxy_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxyConsumer::_nil ()); } break; @@ -262,7 +262,7 @@ TAO_Notify_SupplierAdmin_i::obtain_notification_push_consumer (CosNotifyChannelA case CosNotifyChannelAdmin::SEQUENCE_EVENT: { obj = this->obtain_sequence_proxy_pushconsumer_i (proxy_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxyConsumer::_nil ()); } break; @@ -274,113 +274,113 @@ TAO_Notify_SupplierAdmin_i::obtain_notification_push_consumer (CosNotifyChannelA this->proxy_pushconsumer_ids_.next (); // commit the current id. return CosNotifyChannelAdmin::ProxyConsumer::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_SupplierAdmin_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_SupplierAdmin_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->destory_child_POAs_ = 1; if (this->destory_child_POAs_ == 1) this->poa_factory_->destroy_POA (this->proxy_pushconsumer_POA_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // deactivate ourselves this->poa_factory_->deactivate_object (this, this->my_POA_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CosNotification::QoSProperties* -TAO_Notify_SupplierAdmin_i::get_qos (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_SupplierAdmin_i::get_qos (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->qos_admin_.get_qos (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->qos_admin_.get_qos (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_SupplierAdmin_i::set_qos (const CosNotification::QoSProperties & qos TAO_ENV_ARG_DECL) +TAO_Notify_SupplierAdmin_i::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotification::UnsupportedQoS )) { - this->qos_admin_.set_qos (qos TAO_ENV_ARG_PARAMETER); + this->qos_admin_.set_qos (qos ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_SupplierAdmin_i::validate_qos (const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos TAO_ENV_ARG_DECL) +TAO_Notify_SupplierAdmin_i::validate_qos (const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotification::UnsupportedQoS )) { - this->qos_admin_.validate_qos (required_qos, available_qos TAO_ENV_ARG_PARAMETER); + this->qos_admin_.validate_qos (required_qos, available_qos ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_SupplierAdmin_i::offer_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL) +TAO_Notify_SupplierAdmin_i::offer_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyComm::InvalidEventType )) { this->get_event_manager ()->update_publication_list (added, - removed TAO_ENV_ARG_PARAMETER); + removed ACE_ENV_ARG_PARAMETER); } CosNotifyFilter::FilterID -TAO_Notify_SupplierAdmin_i::add_filter (CosNotifyFilter::Filter_ptr new_filter TAO_ENV_ARG_DECL) +TAO_Notify_SupplierAdmin_i::add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->filter_admin_.add_filter (new_filter TAO_ENV_ARG_PARAMETER); + return this->filter_admin_.add_filter (new_filter ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_SupplierAdmin_i::remove_filter (CosNotifyFilter::FilterID filter TAO_ENV_ARG_DECL) +TAO_Notify_SupplierAdmin_i::remove_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyFilter::FilterNotFound )) { - this->filter_admin_.remove_filter (filter TAO_ENV_ARG_PARAMETER); + this->filter_admin_.remove_filter (filter ACE_ENV_ARG_PARAMETER); } CosNotifyFilter::Filter_ptr -TAO_Notify_SupplierAdmin_i::get_filter (CosNotifyFilter::FilterID filter TAO_ENV_ARG_DECL) +TAO_Notify_SupplierAdmin_i::get_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyFilter::FilterNotFound )) { - return this->filter_admin_.get_filter (filter TAO_ENV_ARG_PARAMETER); + return this->filter_admin_.get_filter (filter ACE_ENV_ARG_PARAMETER); } CosNotifyFilter::FilterIDSeq* -TAO_Notify_SupplierAdmin_i::get_all_filters (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_SupplierAdmin_i::get_all_filters (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->filter_admin_.get_all_filters (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->filter_admin_.get_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_SupplierAdmin_i::remove_all_filters (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_SupplierAdmin_i::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - this->filter_admin_.remove_all_filters (TAO_ENV_SINGLE_ARG_PARAMETER); + this->filter_admin_.remove_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER); } CosEventChannelAdmin::ProxyPushConsumer_ptr -TAO_Notify_SupplierAdmin_i::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_SupplierAdmin_i::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -393,14 +393,14 @@ TAO_Notify_SupplierAdmin_i::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL) PortableServer::ServantBase_var proxy_var (cosec_proxy); - cosec_proxy->init (TAO_ENV_SINGLE_ARG_PARAMETER); + cosec_proxy->init (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CosEventChannelAdmin::ProxyPushConsumer::_nil ()); PortableServer::POA_var def_poa = this->event_channel_->get_default_POA (); CORBA::Object_var obj = this->poa_factory_-> - activate_object (def_poa.in (), cosec_proxy TAO_ENV_ARG_PARAMETER); + activate_object (def_poa.in (), cosec_proxy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosEventChannelAdmin::ProxyPushConsumer::_nil ()); return CosEventChannelAdmin::ProxyPushConsumer::_narrow (obj.in ()); @@ -408,7 +408,7 @@ TAO_Notify_SupplierAdmin_i::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL) // = Pull Methods. CosNotifyChannelAdmin::ProxyIDSeq* -TAO_Notify_SupplierAdmin_i::pull_consumers (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_SupplierAdmin_i::pull_consumers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -421,7 +421,7 @@ TAO_Notify_SupplierAdmin_i::pull_consumers (TAO_ENV_SINGLE_ARG_DECL) } CosNotifyChannelAdmin::ProxyConsumer_ptr -TAO_Notify_SupplierAdmin_i::obtain_notification_pull_consumer (CosNotifyChannelAdmin::ClientType /*ctype*/, CosNotifyChannelAdmin::ProxyID_out /*proxy_id*/ TAO_ENV_ARG_DECL) +TAO_Notify_SupplierAdmin_i::obtain_notification_pull_consumer (CosNotifyChannelAdmin::ClientType /*ctype*/, CosNotifyChannelAdmin::ProxyID_out /*proxy_id*/ ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyChannelAdmin::AdminLimitExceeded @@ -432,7 +432,7 @@ TAO_Notify_SupplierAdmin_i::obtain_notification_pull_consumer (CosNotifyChannelA } CosEventChannelAdmin::ProxyPullConsumer_ptr -TAO_Notify_SupplierAdmin_i::obtain_pull_consumer (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_SupplierAdmin_i::obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.h index 0bf4940fbb9..3915e4cf514 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.h @@ -64,7 +64,7 @@ public: void init (CosNotifyChannelAdmin::AdminID myID, CosNotifyChannelAdmin::InterFilterGroupOperator myOperator, PortableServer::POA_ptr my_POA - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); //Initialize the Supplier Admin. // @@ Pradeep: could this method be const? Try to use const @@ -73,7 +73,7 @@ public: // Get our filter admin. void deactivate_proxy_pushconsumer (PortableServer::Servant servant - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Deactivate servant from . void proxy_pushconsumer_destroyed (CosNotifyChannelAdmin::ProxyID proxyID); @@ -81,13 +81,13 @@ public: // = Interface methods virtual CosNotifyChannelAdmin::AdminID MyID ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); - CosNotifyChannelAdmin::SupplierAdmin_ptr get_ref (TAO_ENV_SINGLE_ARG_DECL); + CosNotifyChannelAdmin::SupplierAdmin_ptr get_ref (ACE_ENV_SINGLE_ARG_DECL); // Return the CORBA object for this servant. TAO_Notify_Event_Manager* get_event_manager (void); @@ -96,28 +96,28 @@ public: // @@ Pradeep: Don't forget to indent this stuff, at the very least // it should not start in the first column! virtual CosNotifyChannelAdmin::EventChannel_ptr MyChannel ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyChannelAdmin::ProxyIDSeq * pull_consumers ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyChannelAdmin::ProxyIDSeq * push_consumers ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -125,7 +125,7 @@ virtual CosNotifyChannelAdmin::ProxyIDSeq * push_consumers ( virtual CosNotifyChannelAdmin::ProxyConsumer_ptr get_proxy_consumer ( CosNotifyChannelAdmin::ProxyID proxy_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -135,7 +135,7 @@ virtual CosNotifyChannelAdmin::ProxyConsumer_ptr get_proxy_consumer ( virtual CosNotifyChannelAdmin::ProxyConsumer_ptr obtain_notification_pull_consumer ( CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -145,7 +145,7 @@ virtual CosNotifyChannelAdmin::ProxyConsumer_ptr obtain_notification_pull_consum virtual CosNotifyChannelAdmin::ProxyConsumer_ptr obtain_notification_push_consumer ( CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -153,14 +153,14 @@ virtual CosNotifyChannelAdmin::ProxyConsumer_ptr obtain_notification_push_consum )); virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotification::QoSProperties * get_qos ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -168,7 +168,7 @@ virtual CosNotification::QoSProperties * get_qos ( virtual void set_qos ( const CosNotification::QoSProperties & qos - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -178,7 +178,7 @@ virtual void set_qos ( virtual void validate_qos ( const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -188,7 +188,7 @@ virtual void validate_qos ( virtual void offer_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -197,7 +197,7 @@ virtual void offer_change ( virtual CosNotifyFilter::FilterID add_filter ( CosNotifyFilter::Filter_ptr new_filter - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -205,7 +205,7 @@ virtual CosNotifyFilter::FilterID add_filter ( virtual void remove_filter ( CosNotifyFilter::FilterID filter - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -214,7 +214,7 @@ virtual void remove_filter ( virtual CosNotifyFilter::Filter_ptr get_filter ( CosNotifyFilter::FilterID filter - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -222,28 +222,28 @@ virtual CosNotifyFilter::Filter_ptr get_filter ( )); virtual CosNotifyFilter::FilterIDSeq * get_all_filters ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void remove_all_filters ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosEventChannelAdmin::ProxyPushConsumer_ptr obtain_push_consumer ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosEventChannelAdmin::ProxyPullConsumer_ptr obtain_pull_consumer ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -251,13 +251,13 @@ virtual CosEventChannelAdmin::ProxyPullConsumer_ptr obtain_pull_consumer ( protected: // = Helper methods - CORBA::Object_ptr obtain_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL); + CORBA::Object_ptr obtain_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL); // Obtain a proxy pushconsumer object - CORBA::Object_ptr obtain_struct_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL); + CORBA::Object_ptr obtain_struct_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL); // Obtain a structured proxy pushconsumer object. - CORBA::Object_ptr obtain_sequence_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL); + CORBA::Object_ptr obtain_sequence_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL); // Obtain a sequence pushconsumer object // = Data members diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.cpp index bd6586314b6..9df8ecd1499 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.cpp @@ -22,10 +22,10 @@ TAO_Notify_Update_Dispatch_Command::~TAO_Notify_Update_Dispatch_Command () } int -TAO_Notify_Update_Dispatch_Command::execute (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Update_Dispatch_Command::execute (ACE_ENV_SINGLE_ARG_DECL) { this->update_listener_->dispatch_update (this->added_, this->removed_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.h index e32a2c9ae3d..a02113c6653 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.h @@ -46,7 +46,7 @@ class TAO_Notify_Export TAO_Notify_Update_Dispatch_Command : public TAO_Notify_C ~TAO_Notify_Update_Dispatch_Command (); - virtual int execute (TAO_ENV_SINGLE_ARG_DECL); + virtual int execute (ACE_ENV_SINGLE_ARG_DECL); // Command callback protected: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.cpp index 840e27367cc..4c23104c958 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.cpp @@ -23,14 +23,14 @@ TAO_Notify_Worker_Task::init_task (TAO_Notify_AdminProperties* const, } void -TAO_Notify_Worker_Task::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Notify_Worker_Task::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { } int -TAO_Notify_Worker_Task::process_event (TAO_Notify_Command *mb TAO_ENV_ARG_DECL, ACE_Time_Value * /*tv*/) +TAO_Notify_Worker_Task::process_event (TAO_Notify_Command *mb ACE_ENV_ARG_DECL, ACE_Time_Value * /*tv*/) { - int result = mb->execute (TAO_ENV_SINGLE_ARG_PARAMETER); + int result = mb->execute (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_Message_Block::release (mb); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.h index 9b1ff867f97..be7ed7c5378 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.h @@ -54,10 +54,10 @@ public: TAO_Notify_QoSAdmin_i* const qos_properties); // Init the task - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL); // shutdown this task. - virtual int process_event (TAO_Notify_Command *mb TAO_ENV_ARG_DECL, ACE_Time_Value *tv = 0); + virtual int process_event (TAO_Notify_Command *mb ACE_ENV_ARG_DECL, ACE_Time_Value *tv = 0); // Process the command. virtual void update_admin (TAO_Notify_AdminProperties& admin); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.cpp index da75658fe8a..ff9e0e0d862 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.cpp @@ -22,7 +22,7 @@ PortableServer::ObjectId * TAO_POA_Hooks::create_id_for_reference ( TAO_POA &the_poa, CORBA::Object_ptr the_ref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, PortableServer::NotAGroupObject @@ -36,18 +36,18 @@ TAO_POA_Hooks::create_id_for_reference ( // Create a temporary object reference and then get the // ObjectId out of it. CORBA::Object_var obj_ref = the_poa.create_reference (repository_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); PortableServer::ObjectId_var obj_id = the_poa.reference_to_id (obj_ref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Associate the object reference with the group reference. this->associate_group_with_ref (the_poa, the_ref, obj_ref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return obj_id._retn (); @@ -114,7 +114,7 @@ int TAO_POA_Hooks::create_group_acceptors (CORBA::Object_ptr the_ref, TAO_PortableGroup_Acceptor_Registry &acceptor_registry, TAO_ORB_Core &orb_core - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { const TAO_MProfile& profiles = the_ref->_stubobj ()->base_profiles (); const TAO_Profile* profile; @@ -130,7 +130,7 @@ TAO_POA_Hooks::create_group_acceptors (CORBA::Object_ptr the_ref, { acceptor_registry.open (profile, orb_core - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); ++num; } @@ -147,7 +147,7 @@ PortableServer::IDs * TAO_POA_Hooks::reference_to_ids ( TAO_POA &/*the_poa*/, CORBA::Object_ptr /*the_ref*/ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, PortableServer::NotAGroupObject @@ -162,7 +162,7 @@ TAO_POA_Hooks::associate_group_with_ref ( TAO_POA &the_poa, CORBA::Object_ptr group_ref, CORBA::Object_ptr obj_ref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::NotAGroupObject)) { @@ -191,7 +191,7 @@ TAO_POA_Hooks::associate_group_with_ref ( this->create_group_acceptors (group_ref, this->request_dispatcher_.acceptor_registry_, the_poa.orb_core () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -201,7 +201,7 @@ TAO_POA_Hooks::associate_group_with_ref ( this->request_dispatcher_.group_map_.add_groupid_objectkey_pair ( group_id._retn (), key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -211,7 +211,7 @@ TAO_POA_Hooks::associate_reference_with_id ( TAO_POA &the_poa, CORBA::Object_ptr ref, const PortableServer::ObjectId & oid - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, PortableServer::NotAGroupObject @@ -222,14 +222,14 @@ TAO_POA_Hooks::associate_reference_with_id ( // it is much easier to extract the object key from the // reference. CORBA::Object_var obj_ref = the_poa.id_to_reference (oid - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Associate the object reference with the group reference. this->associate_group_with_ref (the_poa, ref, obj_ref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -238,7 +238,7 @@ TAO_POA_Hooks::disassociate_reference_with_id ( TAO_POA &/*the_poa*/, CORBA::Object_ptr /*ref*/, const PortableServer::ObjectId & /*oid*/ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, PortableServer::NotAGroupObject diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h b/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h index 46a1e55f737..bfcdcdfdb2e 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h @@ -49,7 +49,7 @@ public: virtual PortableServer::ObjectId * create_id_for_reference ( TAO_POA &the_poa, CORBA::Object_ptr the_ref - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -59,7 +59,7 @@ public: virtual PortableServer::IDs * reference_to_ids ( TAO_POA &the_poa, CORBA::Object_ptr the_ref - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -70,7 +70,7 @@ public: TAO_POA &the_poa, CORBA::Object_ptr ref, const PortableServer::ObjectId & oid - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -81,7 +81,7 @@ public: TAO_POA &the_poa, CORBA::Object_ptr ref, const PortableServer::ObjectId & oid - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -99,7 +99,7 @@ protected: int create_group_acceptors (CORBA::Object_ptr the_ref, TAO_PortableGroup_Acceptor_Registry &acceptor_registry, TAO_ORB_Core &orb_core - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Helper function to associate group references with /// object references. @@ -107,7 +107,7 @@ protected: TAO_POA &the_poa, CORBA::Object_ptr group_ref, CORBA::Object_ptr obj_ref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::NotAGroupObject)); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp index ff6909d98a8..b0c22ac01b0 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp @@ -35,7 +35,7 @@ TAO_PortableGroup_Acceptor_Registry::~TAO_PortableGroup_Acceptor_Registry (void) void TAO_PortableGroup_Acceptor_Registry::open (const TAO_Profile* profile, TAO_ORB_Core &orb_core - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Entry *entry; @@ -66,7 +66,7 @@ TAO_PortableGroup_Acceptor_Registry::open (const TAO_Profile* profile, this->open_i (profile, orb_core, factory - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // found = 1; // A usable protocol was found. @@ -83,7 +83,7 @@ void TAO_PortableGroup_Acceptor_Registry::open_i (const TAO_Profile* profile, TAO_ORB_Core &orb_core, TAO_ProtocolFactorySetItor &factory - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_Acceptor *acceptor = (*factory)->factory ()->make_acceptor (); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h index ff1e71bfc11..7c2ca835ed8 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h @@ -67,7 +67,7 @@ public: /// Open an acceptor based on a tagged profile. void open (const TAO_Profile* profile, TAO_ORB_Core &orb_core - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Close all open acceptors. int close_all (void); @@ -81,7 +81,7 @@ protected: void open_i (const TAO_Profile* profile, TAO_ORB_Core &orb_core, TAO_ProtocolFactorySetItor &factory - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Find an acceptor by using a profile. int find (const TAO_Profile* profile, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp index ff890a90c4e..d64270a8a82 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp @@ -37,7 +37,7 @@ TAO_PortableGroup_Loader::init (int /*argc*/, orb_initializer = temp_orb_initializer; PortableInterceptor::register_orb_initializer (orb_initializer.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp index f17c6673349..a3cadc7b45d 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp @@ -26,13 +26,13 @@ TAO_PortableGroup_ORBInitializer::TAO_PortableGroup_ORBInitializer () void TAO_PortableGroup_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Narrow to a TAO_ORBInitInfo object to get access to the // orb_core() TAO extension. TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (tao_info.in ())) @@ -76,7 +76,7 @@ TAO_PortableGroup_ORBInitializer::pre_init ( void TAO_PortableGroup_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h index d87e8c01871..0ee3a735d33 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h @@ -45,11 +45,11 @@ public: TAO_PortableGroup_ORBInitializer (); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp index 9902278a780..df24bdce259 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp @@ -18,7 +18,7 @@ void PortableGroup_Request_Dispatcher::dispatch (TAO_ORB_Core *orb_core, TAO_ServerRequest &request, CORBA::Object_out forward_to - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Check if the request contains a tagged profile @@ -39,7 +39,7 @@ PortableGroup_Request_Dispatcher::dispatch (TAO_ORB_Core *orb_core, orb_core, request, forward_to - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; return; @@ -52,6 +52,6 @@ PortableGroup_Request_Dispatcher::dispatch (TAO_ORB_Core *orb_core, orb_core->adapter_registry ()->dispatch (request.object_key (), request, forward_to - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h index 6bcc6a1a8c3..a80cba11a8c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h @@ -47,7 +47,7 @@ public: virtual void dispatch (TAO_ORB_Core *orb_core, TAO_ServerRequest &request, CORBA::Object_out forward_to - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp index 675b3986154..77d982f4c97 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp @@ -44,7 +44,7 @@ TAO_Portable_Group_Map::~TAO_Portable_Group_Map (void) void TAO_Portable_Group_Map::add_groupid_objectkey_pair (PortableGroup::TagGroupTaggedComponent *group_id, const TAO_ObjectKey &key - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Map_Entry *new_entry; @@ -96,7 +96,7 @@ TAO_Portable_Group_Map::add_groupid_objectkey_pair (PortableGroup::TagGroupTagge void TAO_Portable_Group_Map::remove_groupid_objectkey_pair (const PortableGroup::TagGroupTaggedComponent* /*group_id*/, const TAO_ObjectKey &/*key*/ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } @@ -107,7 +107,7 @@ TAO_Portable_Group_Map::dispatch (PortableGroup::TagGroupTaggedComponent* group_ TAO_ORB_Core *orb_core, TAO_ServerRequest &request, CORBA::Object_out forward_to - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Look up the GroupId. Map_Entry *entry; @@ -129,7 +129,7 @@ TAO_Portable_Group_Map::dispatch (PortableGroup::TagGroupTaggedComponent* group_ orb_core->adapter_registry ()->dispatch (entry->key, request, forward_to - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Reset the read pointer in the message block. diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h index da5d24348e3..b903f1d6a1e 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h @@ -83,13 +83,13 @@ public: /// This function takes ownership of the memory pointed to be group_id void add_groupid_objectkey_pair (PortableGroup::TagGroupTaggedComponent *group_id, const TAO_ObjectKey &key - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Remove a GroupId->ObjectKey mapping from the map. void remove_groupid_objectkey_pair (const PortableGroup::TagGroupTaggedComponent* group_id, const TAO_ObjectKey &key - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Dispatch a request to all of the ObjectIds that belong to /// the specified group. @@ -97,7 +97,7 @@ public: TAO_ORB_Core *orb_core, TAO_ServerRequest &request, CORBA::Object_out forward_to - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Id hash map. typedef ACE_Hash_Map_Manager_Ex< diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp index 49ad5487662..d364e2abfc4 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp @@ -88,7 +88,7 @@ TAO_UIPMC_Connector::close (void) int TAO_UIPMC_Connector::connect (TAO_GIOP_Invocation *invocation, TAO_Transport_Descriptor_Interface *desc - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { TAO_Transport *&transport = invocation->transport (); // ACE_Time_Value *max_wait_time = invocation->max_wait_time (); @@ -182,7 +182,7 @@ TAO_UIPMC_Connector::create_profile (TAO_InputCDR& cdr) } TAO_Profile * -TAO_UIPMC_Connector::make_profile (TAO_ENV_SINGLE_ARG_DECL) +TAO_UIPMC_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL) { // The endpoint should be of the form: // N.n@host:port/object_key diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h index d010698dc8c..00ee0ad7582 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h @@ -53,7 +53,7 @@ public: int close (void); int connect (TAO_GIOP_Invocation *invocation, TAO_Transport_Descriptor_Interface *desc - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int preconnect (const char *preconnections); TAO_Profile *create_profile (TAO_InputCDR& cdr); @@ -64,7 +64,7 @@ public: protected: /// = More TAO_Connector methods, please check the documentation on /// Pluggable.h - virtual TAO_Profile * make_profile (TAO_ENV_SINGLE_ARG_DECL); + virtual TAO_Profile * make_profile (ACE_ENV_SINGLE_ARG_DECL); /// Obtain UIPMC properties that must be used by this connector, i.e., /// initialize . diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp index 7fd2df47ffd..b232cb7842a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp @@ -74,7 +74,7 @@ TAO_UIPMC_Profile::TAO_UIPMC_Profile (const CORBA::Octet class_d_address[4], TAO_UIPMC_Profile::TAO_UIPMC_Profile (const char *string, TAO_ORB_Core *orb_core - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) : TAO_Profile (TAO_TAG_UIPMC_PROFILE, orb_core, TAO_GIOP_Message_Version (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR)), @@ -83,7 +83,7 @@ TAO_UIPMC_Profile::TAO_UIPMC_Profile (const char *string, tagged_profile_ () { this->add_group_component (); - this->parse_string (string TAO_ENV_ARG_PARAMETER); + this->parse_string (string ACE_ENV_ARG_PARAMETER); ACE_CHECK; addressing_mode_ = default_addressing_mode_; } @@ -177,7 +177,7 @@ TAO_UIPMC_Profile::decode (TAO_InputCDR& cdr) void TAO_UIPMC_Profile::parse_string (const char *string - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Remove the "N.n@" version prefix, if it exists, and verify the // version is one that we accept. @@ -400,7 +400,7 @@ TAO_UIPMC_Profile::is_equivalent (const TAO_Profile *other_profile) CORBA::ULong TAO_UIPMC_Profile::hash (CORBA::ULong max - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { // Get the hashvalue for all endpoints. CORBA::ULong hashval = this->endpoint_.hash (); @@ -430,7 +430,7 @@ TAO_UIPMC_Profile::endpoint_count (void) } char * -TAO_UIPMC_Profile::to_string (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_UIPMC_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { // @@ Frank: Update to pull out GroupID information... @@ -664,7 +664,7 @@ void TAO_UIPMC_Profile::request_target_specifier ( TAO_Target_Specification &target_spec, TAO_Target_Specification::TAO_Target_Address required_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Fill out the target specifier based on the required type. switch (required_type) @@ -695,7 +695,7 @@ TAO_UIPMC_Profile::supports_multicast (void) const void TAO_UIPMC_Profile::addressing_mode (CORBA::Short addr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // ** See race condition note about addressing mode in Profile.h ** switch (addr) diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h index 06fcd82e543..b5dd69c96ee 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h @@ -68,7 +68,7 @@ public: /// Create object using a string ior. TAO_UIPMC_Profile (const char *string, TAO_ORB_Core *orb_core - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Destructor is to be called only through <_decr_refcnt>. ~TAO_UIPMC_Profile (void); @@ -76,7 +76,7 @@ public: /// Initialize this object using the given input string. /// Url-style string contain only one endpoint. virtual void parse_string (const char *string - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /** * Return a string representation for this profile. @@ -84,7 +84,7 @@ public: * This is used to create url-style reference. Only one * endpoint is included into the string. */ - virtual char * to_string (TAO_ENV_SINGLE_ARG_DECL); + virtual char * to_string (ACE_ENV_SINGLE_ARG_DECL); /// Initialize this object using the given CDR octet string. virtual int decode (TAO_InputCDR& cdr); @@ -134,7 +134,7 @@ public: /// Return a hash value for this object. virtual CORBA::ULong hash (CORBA::ULong max - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Please refer to Profile.h for the documentation of this /// function. @@ -146,7 +146,7 @@ public: virtual void request_target_specifier ( TAO_Target_Specification &target_spec, TAO_Target_Specification::TAO_Target_Address required_type - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Returns true since this profile can specify multicast endpoints. virtual int supports_multicast (void) const; @@ -162,7 +162,7 @@ public: /// Set and validate the addressing mode if the remote ORB returns an /// exception. virtual void addressing_mode (CORBA::Short addr_mode - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp index 8a2eee3b877..41256ad7ba6 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp @@ -98,7 +98,7 @@ TAO_PropertySetFactory::~TAO_PropertySetFactory (void) // things. CosPropertyService::PropertySet_ptr -TAO_PropertySetFactory::create_propertyset (TAO_ENV_SINGLE_ARG_DECL) +TAO_PropertySetFactory::create_propertyset (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // New a TAO_PropertySet. @@ -109,7 +109,7 @@ TAO_PropertySetFactory::create_propertyset (TAO_ENV_SINGLE_ARG_DECL) size_t cur_len = this->propertyset_products_.length (); this->propertyset_products_.length (cur_len + 1); this->propertyset_products_[cur_len] = new_set; - return new_set->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return new_set->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } // Allows a client to create a new TAO_PropertySet with specific @@ -118,7 +118,7 @@ TAO_PropertySetFactory::create_propertyset (TAO_ENV_SINGLE_ARG_DECL) CosPropertyService::PropertySet_ptr TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService::PropertyTypes &allowed_property_types, const CosPropertyService::Properties &allowed_properties - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::ConstraintNotSupported)) { @@ -131,7 +131,7 @@ TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService ACE_NEW_RETURN (new_set, TAO_PropertySet (allowed_property_types, allowed_properties - TAO_ENV_ARG_PARAMETER), + ACE_ENV_ARG_PARAMETER), 0); ACE_TRY_CHECK; @@ -141,7 +141,7 @@ TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService this->propertyset_products_[products_len] = new_set; // All done. - propset_ptr = new_set->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + propset_ptr = new_set->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::UserException, ex) @@ -171,7 +171,7 @@ TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService CosPropertyService::PropertySet_ptr TAO_PropertySetFactory::create_initial_propertyset (const CosPropertyService::Properties &initial_properties - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::MultipleExceptions)) { @@ -183,7 +183,7 @@ TAO_PropertySetFactory::create_initial_propertyset (const CosPropertyService::Pr // New a TAO_PropertySet. ACE_NEW_RETURN (new_set, TAO_PropertySet (initial_properties - TAO_ENV_ARG_PARAMETER), + ACE_ENV_ARG_PARAMETER), 0); ACE_TRY_CHECK; @@ -193,7 +193,7 @@ TAO_PropertySetFactory::create_initial_propertyset (const CosPropertyService::Pr this->propertyset_products_[products_len] = new_set; // All done. - propset_ptr = new_set->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + propset_ptr = new_set->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CosPropertyService::MultipleExceptions, ex) @@ -241,7 +241,7 @@ TAO_PropertySetDefFactory::TAO_PropertySetDefFactory (void) // delete all these New'ed things. CosPropertyService::PropertySetDef_ptr -TAO_PropertySetDefFactory::create_propertysetdef (TAO_ENV_SINGLE_ARG_DECL) +TAO_PropertySetDefFactory::create_propertysetdef (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // New a TAO_PropertySetDef. @@ -254,7 +254,7 @@ TAO_PropertySetDefFactory::create_propertysetdef (TAO_ENV_SINGLE_ARG_DECL) this->propertysetdef_products_[cur_len] = new_set; CosPropertyService::PropertySetDef_ptr propsetdef_ptr = - new_set->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + new_set->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return propsetdef_ptr; @@ -263,7 +263,7 @@ TAO_PropertySetDefFactory::create_propertysetdef (TAO_ENV_SINGLE_ARG_DECL) CosPropertyService::PropertySetDef_ptr TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyService::PropertyTypes &allowed_property_types, const CosPropertyService::PropertyDefs &allowed_property_defs - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::ConstraintNotSupported)) { @@ -276,7 +276,7 @@ TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyS ACE_NEW_RETURN (new_set, TAO_PropertySetDef (allowed_property_types, allowed_property_defs - TAO_ENV_ARG_PARAMETER), + ACE_ENV_ARG_PARAMETER), 0); ACE_TRY_CHECK; @@ -286,7 +286,7 @@ TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyS this->propertysetdef_products_[products_len] = new_set; // All done. Return the pointer. - propsetdef_ptr = new_set->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + propsetdef_ptr = new_set->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::UserException, ex) @@ -316,7 +316,7 @@ TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyS CosPropertyService::PropertySetDef_ptr TAO_PropertySetDefFactory::create_initial_propertysetdef (const CosPropertyService::PropertyDefs &initial_property_defs - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::MultipleExceptions)) { @@ -328,7 +328,7 @@ TAO_PropertySetDefFactory::create_initial_propertysetdef (const CosPropertyServi // New a TAO_PropertySet using these lengths. ACE_NEW_RETURN (new_set, TAO_PropertySetDef (initial_property_defs - TAO_ENV_ARG_PARAMETER), + ACE_ENV_ARG_PARAMETER), 0); ACE_TRY_CHECK; @@ -338,7 +338,7 @@ TAO_PropertySetDefFactory::create_initial_propertysetdef (const CosPropertyServi this->propertysetdef_products_[products_len] = new_set; // All done. - propsetdef_ptr = new_set->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + propsetdef_ptr = new_set->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CosPropertyService::MultipleExceptions, ex) @@ -379,7 +379,7 @@ TAO_PropertySet::TAO_PropertySet (void) TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types, const CosPropertyService::Properties allowed_properties - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) : allowed_property_types_ (allowed_property_types), allowed_property_names_ (allowed_properties.length ()) { @@ -397,7 +397,7 @@ TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowe ACE_TRY { this->define_properties (allowed_properties - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -414,7 +414,7 @@ TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowe TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types, const CORBA::ULong number_of_allowed_properties - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) : allowed_property_types_ (allowed_property_types), allowed_property_names_ (number_of_allowed_properties) { @@ -425,14 +425,14 @@ TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowe TAO_PropertySet::TAO_PropertySet (const CosPropertyService::Properties initial_properties - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Define all the initial properties in the Property Set. All take // *normal* modes. ACE_TRY { this->define_properties (initial_properties - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -461,7 +461,7 @@ TAO_PropertySet::~TAO_PropertySet (void) void TAO_PropertySet::define_property (const char *property_name, const CORBA::Any &property_value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::InvalidPropertyName, CosPropertyService::ConflictingProperty, @@ -544,7 +544,7 @@ TAO_PropertySet::define_property (const char *property_name, CORBA::Boolean TAO_PropertySet::is_type_allowed (CORBA::TypeCode_ptr type) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; // If the sequence is empty, no constraints. if (this->allowed_property_types_.length () == 0) @@ -559,7 +559,7 @@ TAO_PropertySet::is_type_allowed (CORBA::TypeCode_ptr type) ACE_TRY { ret_val = this->allowed_property_types_[ti]->equal (type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ret_val == 1) @@ -608,7 +608,7 @@ TAO_PropertySet::is_property_allowed (const char* property_name) void TAO_PropertySet::define_properties (const CosPropertyService::Properties &nproperties - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::MultipleExceptions)) { @@ -625,7 +625,7 @@ TAO_PropertySet::define_properties (const CosPropertyService::Properties &nprope // Define this property. this->define_property (nproperties [pi].property_name.in (), nproperties [pi].property_value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CosPropertyService::InvalidPropertyName, ex) @@ -691,7 +691,7 @@ TAO_PropertySet::define_properties (const CosPropertyService::Properties &nprope CORBA::ULong -TAO_PropertySet::get_number_of_properties (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_PropertySet::get_number_of_properties (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->hash_table_.current_size (); @@ -707,7 +707,7 @@ void TAO_PropertySet::get_all_property_names (CORBA::ULong how_many, CosPropertyService::PropertyNames_out property_names, CosPropertyService::PropertyNamesIterator_out rest - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Allocating storage is a must. @@ -715,7 +715,7 @@ TAO_PropertySet::get_all_property_names (CORBA::ULong how_many, CosPropertyService::PropertyNames); size_t num_of_properties = - this->get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER); + this->get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (num_of_properties == 0) @@ -773,13 +773,13 @@ TAO_PropertySet::get_all_property_names (CORBA::ULong how_many, // Get the Interface ptr. CosPropertyService::PropertyNamesIterator_ptr iterator_ptr = - names_iterator->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + names_iterator->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // POA stuff todo here, since we have method in the // interface. // Give ownership of this servant to the POA. - names_iterator->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + names_iterator->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Init the out parameter. @@ -792,7 +792,7 @@ TAO_PropertySet::get_all_property_names (CORBA::ULong how_many, CORBA::Any * TAO_PropertySet::get_property_value (const char *property_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::PropertyNotFound, CosPropertyService::InvalidPropertyName)) @@ -829,7 +829,7 @@ TAO_PropertySet::get_property_value (const char *property_name CORBA::Boolean TAO_PropertySet::get_properties (const CosPropertyService::PropertyNames &property_names, CosPropertyService::Properties_out nproperties - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Allocate memory for the out parameter. @@ -853,7 +853,7 @@ TAO_PropertySet::get_properties (const CosPropertyService::PropertyNames &proper for (size_t i = 0; i < n; i++) { any_ptr = get_property_value (property_names [i] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (any_ptr != 0) @@ -885,7 +885,7 @@ void TAO_PropertySet::get_all_properties (CORBA::ULong how_many, CosPropertyService::Properties_out nproperties, CosPropertyService::PropertiesIterator_out rest - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Allocate memory for the out parameter. @@ -960,13 +960,13 @@ TAO_PropertySet::get_all_properties (CORBA::ULong how_many, // Get the interface ptr. CosPropertyService::PropertiesIterator_ptr iterator_ptr = - iterator->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + iterator->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // POA stuff todo here, since we have method in the // interface. // Give ownership of this servant to the POA. - iterator->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + iterator->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Init the out parameter. @@ -979,7 +979,7 @@ TAO_PropertySet::get_all_properties (CORBA::ULong how_many, void TAO_PropertySet::delete_property (const char *property_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::PropertyNotFound, CosPropertyService::InvalidPropertyName, @@ -1019,7 +1019,7 @@ TAO_PropertySet::delete_property (const char *property_name void TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &property_names - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::MultipleExceptions)) { @@ -1037,7 +1037,7 @@ TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &pro { // Delete this property. this->delete_property (property_names[pi] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CosPropertyService::InvalidPropertyName, ex) @@ -1089,7 +1089,7 @@ TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &pro CORBA::Boolean -TAO_PropertySet::delete_all_properties (TAO_ENV_SINGLE_ARG_DECL) +TAO_PropertySet::delete_all_properties (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Get all the property names in a names' sequence. @@ -1101,13 +1101,13 @@ TAO_PropertySet::delete_all_properties (TAO_ENV_SINGLE_ARG_DECL) CosPropertyService::PropertyNamesIterator_out iter_out (iter_ptr); CosPropertyService::PropertyNamesIterator_var iter; - CORBA::ULong size = this->get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong size = this->get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); this->get_all_property_names (size, names_out, iter_out - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Get the out values on to the var varibles. @@ -1116,7 +1116,7 @@ TAO_PropertySet::delete_all_properties (TAO_ENV_SINGLE_ARG_DECL) // Delete all these properties. this->delete_properties (names.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // All properties deleted. @@ -1128,7 +1128,7 @@ TAO_PropertySet::delete_all_properties (TAO_ENV_SINGLE_ARG_DECL) CORBA::Boolean TAO_PropertySet::is_property_defined (const char *property_name - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::InvalidPropertyName)) { @@ -1159,10 +1159,10 @@ TAO_PropertySetDef::TAO_PropertySetDef (void) TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyTypes allowed_property_types, const CosPropertyService::PropertyDefs allowed_property_defs - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) : TAO_PropertySet(allowed_property_types, allowed_property_defs.length () - TAO_ENV_ARG_PARAMETER) + ACE_ENV_ARG_PARAMETER) { // Set the length of the allowed property names. this->allowed_property_names_.length (allowed_property_defs.length ()); @@ -1176,7 +1176,7 @@ TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyTypes ACE_TRY { this->define_properties_with_modes (allowed_property_defs - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -1190,10 +1190,10 @@ TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyTypes // Constructor that the factory uses. TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyDefs initial_property_defs - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->define_properties_with_modes (initial_property_defs - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -1206,7 +1206,7 @@ TAO_PropertySetDef::~TAO_PropertySetDef (void) // Return the sequence that is there in side. void TAO_PropertySetDef::get_allowed_property_types (CosPropertyService::PropertyTypes_out property_types - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Copy contents of the sequence. @@ -1216,7 +1216,7 @@ TAO_PropertySetDef::get_allowed_property_types (CosPropertyService::PropertyType void TAO_PropertySetDef::get_allowed_properties (CosPropertyService::PropertyDefs_out property_defs - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // We have all the names, get the values and the modes from the Hash @@ -1240,7 +1240,7 @@ void TAO_PropertySetDef::define_property_with_mode (const char *property_name, const CORBA::Any &property_value, CosPropertyService::PropertyModeType property_mode - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::InvalidPropertyName, CosPropertyService::ConflictingProperty, @@ -1322,7 +1322,7 @@ TAO_PropertySetDef::define_property_with_mode (const char *property_name, // MultipleExceptions sequence and raise that. void TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::PropertyDefs &property_defs - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::MultipleExceptions)) { @@ -1341,7 +1341,7 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop this->define_property_with_mode (property_defs[i].property_name, property_defs[i].property_value, property_defs[i].property_mode - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CosPropertyService::InvalidPropertyName, ex) @@ -1415,7 +1415,7 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop // PropertyNotFound exceptions. CosPropertyService::PropertyModeType TAO_PropertySetDef::get_property_mode (const char *property_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::PropertyNotFound, CosPropertyService::InvalidPropertyName)) @@ -1453,7 +1453,7 @@ TAO_PropertySetDef::get_property_mode (const char *property_name CORBA::Boolean TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames &property_names, CosPropertyService::PropertyModes_out property_modes - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Allocate memory for the out parameter. @@ -1481,7 +1481,7 @@ TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames { // Invoke get_property_mode for this name. mode = this->get_property_mode (property_names[i] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Store the mode in the out sequence. @@ -1513,7 +1513,7 @@ TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames void TAO_PropertySetDef::set_property_mode (const char *property_name, CosPropertyService::PropertyModeType property_mode - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::InvalidPropertyName, CosPropertyService::PropertyNotFound, @@ -1607,7 +1607,7 @@ TAO_PropertySetDef::set_property_mode (const char *property_name, void TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes &property_modes - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::MultipleExceptions)) { @@ -1624,7 +1624,7 @@ TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes { this->set_property_mode (property_modes[i].property_name, property_modes[i].property_mode - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CosPropertyService::PropertyNotFound, ex) @@ -1689,7 +1689,7 @@ TAO_PropertyNamesIterator::~TAO_PropertyNamesIterator (void) // one exists. void -TAO_PropertyNamesIterator::reset (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_PropertyNamesIterator::reset (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->iterator_ = this->iterator_.map ().begin (); @@ -1702,7 +1702,7 @@ TAO_PropertyNamesIterator::reset (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) CORBA::Boolean TAO_PropertyNamesIterator::next_one (CORBA::String_out property_name - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { COSPROPERTY_HASH_ENTRY *entry_ptr; @@ -1721,7 +1721,7 @@ TAO_PropertyNamesIterator::next_one (CORBA::String_out property_name CORBA::Boolean TAO_PropertyNamesIterator::next_n (CORBA::ULong how_many, CosPropertyService::PropertyNames_out property_names - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Allocate memory for the out parameter. @@ -1754,22 +1754,22 @@ TAO_PropertyNamesIterator::next_n (CORBA::ULong how_many, } void -TAO_PropertyNamesIterator::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_PropertyNamesIterator::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Remove self from POA. Because of reference counting, the POA // will automatically delete the servant when all pending requests // on this servant are complete. - PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -1785,7 +1785,7 @@ TAO_PropertiesIterator::~TAO_PropertiesIterator (void) } void -TAO_PropertiesIterator::reset (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_PropertiesIterator::reset (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->iterator_ = this->iterator_.map ().begin (); @@ -1793,7 +1793,7 @@ TAO_PropertiesIterator::reset (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) CORBA::Boolean TAO_PropertiesIterator::next_one (CosPropertyService::Property_out aproperty - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { COSPROPERTY_HASH_ENTRY *entry_ptr; @@ -1816,7 +1816,7 @@ TAO_PropertiesIterator::next_one (CosPropertyService::Property_out aproperty CORBA::Boolean TAO_PropertiesIterator::next_n (CORBA::ULong how_many, CosPropertyService::Properties_out nproperties - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Allocate memory for the out parameter. @@ -1857,22 +1857,22 @@ TAO_PropertiesIterator::next_n (CORBA::ULong how_many, } void -TAO_PropertiesIterator::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_PropertiesIterator::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Remove self from POA. Because of reference counting, the POA // will automatically delete the servant when all pending requests // on this servant are complete. - PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h index 2e55d30489e..66f85f5542a 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h @@ -126,7 +126,7 @@ public: // Destructor. virtual CosPropertyService::PropertySet_ptr - create_propertyset (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + create_propertyset (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns a new TAO_PropertySet object. "The property set returned // will *not* have any initial properties." @@ -134,7 +134,7 @@ public: virtual CosPropertyService::PropertySet_ptr create_constrained_propertyset (const CosPropertyService::PropertyTypes &allowed_property_types, const CosPropertyService::Properties &allowed_properties - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::ConstraintNotSupported)); // Allows a client to create a new TAO_PropertySet with specific @@ -142,7 +142,7 @@ public: virtual CosPropertyService::PropertySet_ptr create_initial_propertyset (const CosPropertyService::Properties &initial_properties - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::MultipleExceptions)); // Allows a client to create a new TAO_PropertySet with specific @@ -179,14 +179,14 @@ public: // Destructor. virtual CosPropertyService::PropertySetDef_ptr - create_propertysetdef (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + create_propertysetdef (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns a new TAO_PropertySetDef object. virtual CosPropertyService::PropertySetDef_ptr create_constrained_propertysetdef (const CosPropertyService::PropertyTypes &allowed_property_types, const CosPropertyService::PropertyDefs &allowed_property_defs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::ConstraintNotSupported)); // Allows a client to create a new TAO_PropertySetDef with specific @@ -194,7 +194,7 @@ public: virtual CosPropertyService::PropertySetDef_ptr create_initial_propertysetdef (const CosPropertyService::PropertyDefs &initial_property_defs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::MultipleExceptions)); // Allows a client to create a new TAO_PropertySetDef with specific @@ -227,16 +227,16 @@ public: TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types, const CosPropertyService::Properties allowed_properties - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // Init values that the PropertySetFactory will want to specify. TAO_PropertySet (const CosPropertyService::Properties initial_properties - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // PropertySetFactory needs this constructor. TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types, const CORBA::ULong number_of_allowed_propertydefs - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // PropertySetDef's construction needs this. virtual ~TAO_PropertySet (void); @@ -244,7 +244,7 @@ public: virtual void define_property (const char *property_name, const CORBA::Any &property_value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::InvalidPropertyName, CosPropertyService::ConflictingProperty, @@ -256,12 +256,12 @@ public: // property name, duplicate name, type code over writing etc. virtual void define_properties (const CosPropertyService::Properties &nproperties - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::MultipleExceptions)); // Define a sequence of properties at a time. - virtual CORBA::ULong get_number_of_properties (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::ULong get_number_of_properties (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the number of properties that are currently defined in the // PropertySet. @@ -269,13 +269,13 @@ public: virtual void get_all_property_names (CORBA::ULong how_many, CosPropertyService::PropertyNames_out property_names, CosPropertyService::PropertyNamesIterator_out rest - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the names of all the properties that are currently defined in // the property set. virtual CORBA::Any *get_property_value (const char *property_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::PropertyNotFound, CosPropertyService::InvalidPropertyName)); @@ -283,21 +283,21 @@ public: virtual CORBA::Boolean get_properties (const CosPropertyService::PropertyNames &property_names, CosPropertyService::Properties_out nproperties - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Get all names and their property values. virtual void get_all_properties (CORBA::ULong how_many, CosPropertyService::Properties_out nproperties, CosPropertyService::PropertiesIterator_out rest - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns all of the property names currently defined in the // PropertySet. If the PropertySet contains more than how_many // property names, then the remaining property names are put into the PropertyNamesIterator. virtual void delete_property (const char *property_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::PropertyNotFound, CosPropertyService::InvalidPropertyName, @@ -305,17 +305,17 @@ public: // Delete a property given a name. virtual void delete_properties (const CosPropertyService::PropertyNames &property_names - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::MultipleExceptions)); // Delete all the these properties from this property set. - virtual CORBA::Boolean delete_all_properties (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Boolean delete_all_properties (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Delete everything from this property set. virtual CORBA::Boolean is_property_defined (const char *property_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::InvalidPropertyName)); // Tell whether this property is defined or no. Forget about the @@ -382,18 +382,18 @@ public: TAO_PropertySetDef (const CosPropertyService::PropertyTypes allowed_property_types, const CosPropertyService::PropertyDefs allowed_property - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // The factory uses this constructor. TAO_PropertySetDef (const CosPropertyService::PropertyDefs initial_property_defs - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // This is also for the factory. virtual ~TAO_PropertySetDef (void); // Destructor. virtual void get_allowed_property_types (CosPropertyService::PropertyTypes_out property_types - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Indicates which types of properties are supported by this // PropertySet. If the output sequence is empty, then there is no @@ -402,7 +402,7 @@ public: // get_allowed_properties output sequence is not empty. virtual void get_allowed_properties (CosPropertyService::PropertyDefs_out property_defs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Indicates which properties are supported by this PropertySet. If @@ -413,7 +413,7 @@ public: virtual void define_property_with_mode (const char *property_name, const CORBA::Any &property_value, CosPropertyService::PropertyModeType property_mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::InvalidPropertyName, CosPropertyService::ConflictingProperty, @@ -430,14 +430,14 @@ public: // exception is thrown. virtual void define_properties_with_modes (const CosPropertyService::PropertyDefs &property_defs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::MultipleExceptions)); // This operation will modify or add each of the properties in the // Properties parameter to the PropertySet. virtual CosPropertyService::PropertyModeType get_property_mode (const char *property_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::PropertyNotFound, CosPropertyService::InvalidPropertyName)); @@ -446,7 +446,7 @@ public: virtual CORBA::Boolean get_property_modes (const CosPropertyService::PropertyNames &property_names, CosPropertyService::PropertyModes_out property_modes - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Batch operation for getting the property. Invoke // get_property_mode for each name. Return value False indicates @@ -458,7 +458,7 @@ public: virtual void set_property_mode (const char *property_name, CosPropertyService::PropertyModeType property_mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::InvalidPropertyName, CosPropertyService::PropertyNotFound, @@ -475,7 +475,7 @@ public: // raised. virtual void set_property_modes (const CosPropertyService::PropertyModes &property_modes - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::MultipleExceptions)); // Batch operation for setting the property. Raises @@ -505,13 +505,13 @@ public: virtual ~TAO_PropertyNamesIterator (void); // Destructor. - virtual void reset (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void reset (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // The reset operation resets the position in an iterator to the // first property name, if one exists. virtual CORBA::Boolean next_one (CORBA::String_out property_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // The next_one operation returns true if an item exists at the // current position in the iterator with an output parameter of a @@ -520,7 +520,7 @@ public: virtual CORBA::Boolean next_n (CORBA::ULong how_many, CosPropertyService::PropertyNames_out property_names - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // The next_n operation returns true if an item exists at the // current position in the iterator and the how_many parameter was @@ -528,7 +528,7 @@ public: // with at most the how_many number of names. A return of false // signifies no more items in the iterator. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Destroys the iterator. private: @@ -568,12 +568,12 @@ public: virtual ~TAO_PropertiesIterator (void); // Destructor. - virtual void reset (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void reset (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Resets the position in an iterator to the first property, if one exists. virtual CORBA::Boolean next_one (CosPropertyService::Property_out aproperty - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // The next_one operation returns true if an item exists at the // current position in the iterator with an output parameter of a @@ -582,7 +582,7 @@ public: virtual CORBA::Boolean next_n (CORBA::ULong how_many, CosPropertyService::Properties_out nproperties - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // The next_n operation returns true if an item exists at the // current position in the iterator and the how_many parameter was @@ -590,7 +590,7 @@ public: // at most the how_many number of properties. A return of false // signifies no more items in the iterator. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Destroys the iterator. diff --git a/TAO/orbsvcs/orbsvcs/ReplicaLocator.cpp b/TAO/orbsvcs/orbsvcs/ReplicaLocator.cpp index 66a03582d03..e42168ee991 100644 --- a/TAO/orbsvcs/orbsvcs/ReplicaLocator.cpp +++ b/TAO/orbsvcs/orbsvcs/ReplicaLocator.cpp @@ -19,7 +19,7 @@ TAO_LB_ReplicaLocator::preinvoke ( PortableServer::POA_ptr /* adapter */, const char * /* operation */, PortableServer::ServantLocator::Cookie & /* the_cookie */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)) { @@ -27,7 +27,7 @@ TAO_LB_ReplicaLocator::preinvoke ( ACE_THROW_RETURN (CORBA::INTERNAL (), 0); CORBA::Object_var replica = - this->load_balancer_->replica (TAO_ENV_SINGLE_ARG_PARAMETER); + this->load_balancer_->replica (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Throw a forward exception to force the client to redirect its @@ -44,7 +44,7 @@ TAO_LB_ReplicaLocator::postinvoke ( const char * /* operation */, PortableServer::ServantLocator::Cookie /* the_cookie */, PortableServer::Servant /* the_servant */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // No-op diff --git a/TAO/orbsvcs/orbsvcs/ReplicaLocator.h b/TAO/orbsvcs/orbsvcs/ReplicaLocator.h index 9031dbb51fc..0507fd23d50 100644 --- a/TAO/orbsvcs/orbsvcs/ReplicaLocator.h +++ b/TAO/orbsvcs/orbsvcs/ReplicaLocator.h @@ -50,7 +50,7 @@ public: PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie & the_cookie - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)); @@ -60,7 +60,7 @@ public: const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/orbsvcs/ReplicaProxy.cpp b/TAO/orbsvcs/orbsvcs/ReplicaProxy.cpp index bfc9d025ba7..f111819e7f8 100644 --- a/TAO/orbsvcs/orbsvcs/ReplicaProxy.cpp +++ b/TAO/orbsvcs/orbsvcs/ReplicaProxy.cpp @@ -23,7 +23,7 @@ TAO_LB_ReplicaProxy::TAO_LB_ReplicaProxy (void) void TAO_LB_ReplicaProxy::current_load (CORBA::Float load - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ Ossama: this is the point were the load dampening should @@ -35,11 +35,11 @@ TAO_LB_ReplicaProxy::current_load (CORBA::Float load this->current_load_ = load; // ACE_DEBUG ((LM_DEBUG, "Load[%x] = %f\n", long(this), load)); - this->balancer_->load_changed (this TAO_ENV_ARG_PARAMETER); + this->balancer_->load_changed (this ACE_ENV_ARG_PARAMETER); } void -TAO_LB_ReplicaProxy::disconnect (TAO_ENV_SINGLE_ARG_DECL) +TAO_LB_ReplicaProxy::disconnect (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NotConnected, CORBA::SystemException)) { @@ -49,7 +49,7 @@ TAO_LB_ReplicaProxy::disconnect (TAO_ENV_SINGLE_ARG_DECL) if (this->connected_) { - this->balancer_->disconnect (this TAO_ENV_ARG_PARAMETER); + this->balancer_->disconnect (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->connected_ = 0; @@ -64,7 +64,7 @@ void TAO_LB_ReplicaProxy::connect (TAO_LB_LoadBalancer *balancer, LoadBalancing::ReplicaControl_ptr control, CORBA::Object_ptr replica - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NilControl, LoadBalancing::ReplicaProxy::NilReplica, CORBA::SystemException)) diff --git a/TAO/orbsvcs/orbsvcs/ReplicaProxy.h b/TAO/orbsvcs/orbsvcs/ReplicaProxy.h index 9eb629ea29f..8f29e644a6d 100644 --- a/TAO/orbsvcs/orbsvcs/ReplicaProxy.h +++ b/TAO/orbsvcs/orbsvcs/ReplicaProxy.h @@ -55,7 +55,7 @@ public: // Return a reference to the Replica. virtual void current_load (CORBA::Float load - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Send the value of the current load on the Object being load // balanced, where the definition of "load" is load balancing @@ -69,7 +69,7 @@ public: // without affecting the client, or detect rapid raises in load and // react proactively to those... - virtual void disconnect (TAO_ENV_SINGLE_ARG_DECL) + virtual void disconnect (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NotConnected, CORBA::SystemException)); // Send a request to disconnect from the LoadBalancer. @@ -93,7 +93,7 @@ private: void connect (TAO_LB_LoadBalancer *balancer, LoadBalancing::ReplicaControl_ptr control, CORBA::Object_ptr replica - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NilControl, LoadBalancing::ReplicaProxy::NilReplica, CORBA::SystemException)); diff --git a/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.cpp index 4da47b060d7..d587a309dfa 100644 --- a/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.cpp @@ -39,7 +39,7 @@ TAO_LB_Round_Robin_Strategy::~TAO_LB_Round_Robin_Strategy (void) } CORBA::Object_ptr -TAO_LB_Round_Robin_Strategy::replica (TAO_ENV_SINGLE_ARG_DECL) +TAO_LB_Round_Robin_Strategy::replica (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, diff --git a/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.h b/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.h index 93887fc6ac0..988e18ea25e 100644 --- a/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.h @@ -60,7 +60,7 @@ public: // Destructor // = The Load_Balancing_Strategy methods - virtual CORBA::Object_ptr replica (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Object_ptr replica (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual int insert (TAO_LB_ReplicaProxy *); virtual int remove (TAO_LB_ReplicaProxy *); diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp index 1faa1a245f8..181011de6f0 100644 --- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp @@ -29,7 +29,7 @@ ACE_Runtime_Scheduler (int config_count, RtecScheduler::handle_t ACE_Runtime_Scheduler::create (const char *entry_point - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME)) { @@ -48,10 +48,10 @@ ACE_Runtime_Scheduler::create (const char *entry_point RtecScheduler::handle_t ACE_Runtime_Scheduler::lookup (const char * entry_point - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return create (entry_point TAO_ENV_ARG_PARAMETER); + return create (entry_point ACE_ENV_ARG_PARAMETER); } @@ -59,7 +59,7 @@ ACE_Runtime_Scheduler::lookup (const char * entry_point RtecScheduler::RT_Info * ACE_Runtime_Scheduler::get (RtecScheduler::handle_t handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)) { @@ -110,7 +110,7 @@ ACE_Runtime_Scheduler::set (RtecScheduler::handle_t handle, RtecScheduler::Quantum_t quantum, CORBA::Long threads, RtecScheduler::Info_Type_t info_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)) { @@ -147,7 +147,7 @@ ACE_Runtime_Scheduler::priority (RtecScheduler::handle_t handle, RtecScheduler::OS_Priority& o_priority, RtecScheduler::Preemption_Subpriority_t& subpriority, RtecScheduler::Preemption_Priority_t& p_priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::NOT_SCHEDULED)) @@ -170,22 +170,22 @@ ACE_Runtime_Scheduler::entry_point_priority (const char * entry_point, RtecScheduler::OS_Priority& priority, RtecScheduler::Preemption_Subpriority_t& subpriority, RtecScheduler::Preemption_Priority_t& p_priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::NOT_SCHEDULED)) { - RtecScheduler::handle_t handle = lookup (entry_point TAO_ENV_ARG_PARAMETER); + RtecScheduler::handle_t handle = lookup (entry_point ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (handle < -1) - // The exception was thrown or is in TAO_ENV_SINGLE_ARG_PARAMETER already. + // The exception was thrown or is in ACE_ENV_SINGLE_ARG_PARAMETER already. return; this->priority (handle, priority, subpriority, p_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -197,7 +197,7 @@ ACE_Runtime_Scheduler::add_dependency (RtecScheduler::handle_t handle, RtecScheduler::handle_t /* dependency */, CORBA::Long /* number_of_calls */, RtecScheduler::Dependency_Type_t /* dependency_type */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)) { @@ -232,7 +232,7 @@ ACE_Runtime_Scheduler::compute_scheduling (CORBA::Long /* minimum_priority */, RtecScheduler::RT_Info_Set_out /* infos */, RtecScheduler::Config_Info_Set_out /* configs */, RtecScheduler::Scheduling_Anomaly_Set_out /* anomalies */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UTILIZATION_BOUND_EXCEEDED, RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS, @@ -251,7 +251,7 @@ void ACE_Runtime_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority, RtecScheduler::OS_Priority& priority, RtecScheduler::Dispatching_Type_t & d_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::NOT_SCHEDULED, RtecScheduler::UNKNOWN_PRIORITY_LEVEL)) @@ -284,7 +284,7 @@ ACE_Runtime_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priorit // to the number returned, inclusive. RtecScheduler::Preemption_Priority_t -ACE_Runtime_Scheduler::last_scheduled_priority (TAO_ENV_SINGLE_ARG_DECL) +ACE_Runtime_Scheduler::last_scheduled_priority (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::NOT_SCHEDULED)) { diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h index 61c7f6de038..1b85939bc90 100644 --- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h @@ -40,7 +40,7 @@ public: // Constructor. Initialize the data from the POD_RT_Info array. virtual RtecScheduler::handle_t create (const char * entry_point - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME)); // Create an RT_Info. In the config run scheduler this actually constructs @@ -48,13 +48,13 @@ public: // it's not present. virtual RtecScheduler::handle_t lookup (const char * entry_point - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC((CORBA::SystemException)); // Lookup a handle for an RT_Info, and return its handle, or an error // value if it's not present. virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)); // Return a pointer to the RT_Info corresponding to the passed handle. @@ -69,7 +69,7 @@ public: RtecScheduler::Quantum_t quantum, CORBA::Long threads, RtecScheduler::Info_Type_t info_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)); // Set characteristics of the RT_Info corresponding to the passed handle. @@ -78,7 +78,7 @@ public: RtecScheduler::OS_Priority& o_priority, RtecScheduler::Preemption_Subpriority_t& p_subpriority, RtecScheduler::Preemption_Priority_t& p_priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::NOT_SCHEDULED)); @@ -89,7 +89,7 @@ public: RtecScheduler::OS_Priority& o_priority, RtecScheduler::Preemption_Subpriority_t& p_subpriority, RtecScheduler::Preemption_Priority_t& p_priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::NOT_SCHEDULED)); @@ -100,7 +100,7 @@ public: RtecScheduler::handle_t dependency, CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t dependency_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)); // In the config run scheduler, this method registers a dependency between @@ -111,7 +111,7 @@ public: RtecScheduler::RT_Info_Set_out infos, RtecScheduler::Config_Info_Set_out configs, RtecScheduler::Scheduling_Anomaly_Set_out anomalies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UTILIZATION_BOUND_EXCEEDED, RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS, @@ -123,13 +123,13 @@ public: virtual void dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority, RtecScheduler::OS_Priority& o_priority, RtecScheduler::Dispatching_Type_t & d_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::NOT_SCHEDULED, RtecScheduler::UNKNOWN_PRIORITY_LEVEL)); // Provides the thread priority and queue type for the given priority level. - virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (TAO_ENV_SINGLE_ARG_DECL) + virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::NOT_SCHEDULED)); // Returns the last priority number assigned to an operation in the diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp index 5742ba7d84f..c8fa5d4df4a 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp @@ -119,7 +119,7 @@ int TAO_IIOP_SSL_Connector::connect ( TAO_GIOP_Invocation *invocation, TAO_Transport_Descriptor_Interface *desc - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h index e4e999675f5..634cedd3a73 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h @@ -53,7 +53,7 @@ public: int close (void); int connect (TAO_GIOP_Invocation *invocation, TAO_Transport_Descriptor_Interface *desc - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); public: diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp index a556252a79c..0f5907519f2 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp @@ -122,7 +122,7 @@ TAO_SSLIOP_Connector::close (void) int TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation, TAO_Transport_Descriptor_Interface *desc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -149,12 +149,12 @@ TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation, // policy for the current object. CORBA::Policy_var policy = invocation->stub ()->get_policy (Security::SecEstablishTrustPolicy - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); SecurityLevel2::EstablishTrustPolicy_var trust_policy = SecurityLevel2::EstablishTrustPolicy::_narrow (policy.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // We use a pointer and temporary to make it obvious to determine @@ -164,7 +164,7 @@ TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation, Security::EstablishTrust trust = { 0 , 0 }; if (!CORBA::is_nil (trust_policy.in ())) { - trust = trust_policy->trust (TAO_ENV_SINGLE_ARG_PARAMETER); + trust = trust_policy->trust (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } @@ -197,12 +197,12 @@ TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation, // Check if the user overrode the default Quality-of-Protection for // the current object. policy = invocation->stub ()->get_policy (Security::SecQOPPolicy - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); SecurityLevel2::QOPPolicy_var qop_policy = SecurityLevel2::QOPPolicy::_narrow (policy.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Temporary variable used to avoid overwriting the default value @@ -211,7 +211,7 @@ TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation, if (!CORBA::is_nil (qop_policy.in ())) { - qop = qop_policy->qop (TAO_ENV_SINGLE_ARG_PARAMETER); + qop = qop_policy->qop (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } @@ -239,7 +239,7 @@ TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation, { return this->iiop_connect (ssl_endpoint, invocation - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } return this->ssliop_connect (ssl_endpoint, @@ -247,7 +247,7 @@ TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation, trust, invocation, desc - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -270,7 +270,7 @@ TAO_SSLIOP_Connector::create_profile (TAO_InputCDR& cdr) } TAO_Profile * -TAO_SSLIOP_Connector::make_profile (TAO_ENV_SINGLE_ARG_DECL) +TAO_SSLIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL) { // The endpoint should be of the form: // N.n@host:port/object_key @@ -294,7 +294,7 @@ TAO_SSLIOP_Connector::make_profile (TAO_ENV_SINGLE_ARG_DECL) int TAO_SSLIOP_Connector::iiop_connect (TAO_SSLIOP_Endpoint *ssl_endpoint, TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { const SSLIOP::SSL &ssl_component = ssl_endpoint->ssl_component (); @@ -329,7 +329,7 @@ TAO_SSLIOP_Connector::iiop_connect (TAO_SSLIOP_Endpoint *ssl_endpoint, // Note that the IIOP-only transport descriptor is used! return this->TAO_IIOP_SSL_Connector::connect (invocation, &iiop_desc - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } int @@ -338,7 +338,7 @@ TAO_SSLIOP_Connector::ssliop_connect (TAO_SSLIOP_Endpoint *ssl_endpoint, const Security::EstablishTrust &trust, TAO_GIOP_Invocation *invocation, TAO_Transport_Descriptor_Interface *desc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_Transport *&transport = invocation->transport (); ACE_Time_Value *max_wait_time = invocation->max_wait_time (); @@ -486,7 +486,7 @@ TAO_SSLIOP_Connector::ssliop_connect (TAO_SSLIOP_Endpoint *ssl_endpoint, TAO_SSLIOP_Credentials_var credentials = this->retrieve_credentials (invocation->stub (), svc_handler->peer ().ssl () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); svc_handler = safe_handler.release (); @@ -569,18 +569,18 @@ TAO_SSLIOP_Connector::ssliop_connect (TAO_SSLIOP_Endpoint *ssl_endpoint, TAO_SSLIOP_Credentials * TAO_SSLIOP_Connector::retrieve_credentials (TAO_Stub *stub, SSL *ssl - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Check if the user overrode the default invocation credentials. CORBA::Policy_var policy = stub->get_policy (Security::SecInvocationCredentialsPolicy - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_SSLIOP_Credentials::_nil ()); SecurityLevel2::InvocationCredentialsPolicy_var creds_policy = SecurityLevel2::InvocationCredentialsPolicy::_narrow ( policy.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_SSLIOP_Credentials::_nil ()); TAO_SSLIOP_Credentials_var ssliop_credentials; @@ -590,7 +590,7 @@ TAO_SSLIOP_Connector::retrieve_credentials (TAO_Stub *stub, if (!CORBA::is_nil (creds_policy.in ())) { SecurityLevel2::CredentialsList_var creds_list = - creds_policy->creds (TAO_ENV_SINGLE_ARG_PARAMETER); + creds_policy->creds (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_SSLIOP_Credentials::_nil ()); if (creds_list->length () > 0) @@ -603,7 +603,7 @@ TAO_SSLIOP_Connector::retrieve_credentials (TAO_Stub *stub, ssliop_credentials = TAO_SSLIOP_Credentials::_narrow (credentials - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_SSLIOP_Credentials::_nil ()); if (!CORBA::is_nil (ssliop_credentials.in ())) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h index 2842d3a062f..3d6175aa057 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h @@ -60,7 +60,7 @@ public: virtual int close (void); virtual int connect (TAO_GIOP_Invocation *invocation, TAO_Transport_Descriptor_Interface *desc - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual TAO_Profile *create_profile (TAO_InputCDR& cdr); //@} @@ -71,7 +71,7 @@ protected: * * Please check the documentation in Pluggable.h. */ - virtual TAO_Profile * make_profile (TAO_ENV_SINGLE_ARG_DECL); + virtual TAO_Profile * make_profile (ACE_ENV_SINGLE_ARG_DECL); /// IIOP-specific connection establishment. /** @@ -79,7 +79,7 @@ protected: */ int iiop_connect (TAO_SSLIOP_Endpoint *ssliop_endpoint, TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// SSLIOP-specific connection establishment. int ssliop_connect (TAO_SSLIOP_Endpoint *ssliop_endpoint, @@ -87,14 +87,14 @@ protected: const Security::EstablishTrust &trust, TAO_GIOP_Invocation *invocation, TAO_Transport_Descriptor_Interface *desc - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Retrieve SSLIOP credentials from the policy overrides list and /// set up the underlying SSL connection to use the X.509 /// certificates stored within them. TAO_SSLIOP_Credentials * retrieve_credentials (TAO_Stub *stub, SSL *ssl - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); public: diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp index 62015c21e9a..07ed18f146f 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp @@ -40,7 +40,7 @@ TAO_SSLIOP_Credentials::~TAO_SSLIOP_Credentials (void) } SecurityLevel2::Credentials_ptr -TAO_SSLIOP_Credentials::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_SSLIOP_Credentials::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_SSLIOP_Credentials *c = 0; @@ -58,20 +58,20 @@ TAO_SSLIOP_Credentials::copy (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_SSLIOP_Credentials::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_SSLIOP_Credentials::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } Security::InvocationCredentialsType -TAO_SSLIOP_Credentials::credentials_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_SSLIOP_Credentials::credentials_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return Security::SecOwnCredentials; } Security::AuthenticationStatus -TAO_SSLIOP_Credentials::authentication_state (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_SSLIOP_Credentials::authentication_state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ Is the following statement correct? @@ -83,7 +83,7 @@ TAO_SSLIOP_Credentials::authentication_state (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } char * -TAO_SSLIOP_Credentials::mechanism (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_SSLIOP_Credentials::mechanism (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // @todo Is the following correct? @@ -97,7 +97,7 @@ TAO_SSLIOP_Credentials::mechanism (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) Security::AssociationOptions TAO_SSLIOP_Credentials::accepting_options_supported ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->accepting_options_supported_; @@ -106,7 +106,7 @@ TAO_SSLIOP_Credentials::accepting_options_supported ( void TAO_SSLIOP_Credentials::accepting_options_supported ( Security::AssociationOptions accepting_options_supported - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // @todo Verify that the given accepting options are valid @@ -130,7 +130,7 @@ TAO_SSLIOP_Credentials::accepting_options_supported ( Security::AssociationOptions TAO_SSLIOP_Credentials::accepting_options_required ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->accepting_options_required_; @@ -139,7 +139,7 @@ TAO_SSLIOP_Credentials::accepting_options_required ( void TAO_SSLIOP_Credentials::accepting_options_required ( Security::AssociationOptions accepting_options_required - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // "accepting_options_required" should not have "more" capability @@ -158,7 +158,7 @@ TAO_SSLIOP_Credentials::accepting_options_required ( Security::AssociationOptions TAO_SSLIOP_Credentials::invocation_options_supported ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->invocation_options_supported_; @@ -167,7 +167,7 @@ TAO_SSLIOP_Credentials::invocation_options_supported ( void TAO_SSLIOP_Credentials::invocation_options_supported ( Security::AssociationOptions invocation_options_supported - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if ((invocation_options_supported & ::TAO_SSLIOP_DISALLOWED_ASSOCIATIONS) @@ -183,7 +183,7 @@ TAO_SSLIOP_Credentials::invocation_options_supported ( Security::AssociationOptions TAO_SSLIOP_Credentials::invocation_options_required ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->invocation_options_required_; @@ -192,7 +192,7 @@ TAO_SSLIOP_Credentials::invocation_options_required ( void TAO_SSLIOP_Credentials::invocation_options_required ( Security::AssociationOptions invocation_options_required - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if ((invocation_options_required & ::TAO_SSLIOP_DISALLOWED_ASSOCIATIONS) @@ -210,7 +210,7 @@ CORBA::Boolean TAO_SSLIOP_Credentials::get_security_feature ( Security::CommunicationDirection /* direction */, Security::SecurityFeature /* feature */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -225,7 +225,7 @@ CORBA::Boolean TAO_SSLIOP_Credentials::set_attributes ( const Security::AttributeList & /* requested_attributes */, Security::AttributeList_out /* actual_attributes */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -239,7 +239,7 @@ TAO_SSLIOP_Credentials::set_attributes ( Security::AttributeList * TAO_SSLIOP_Credentials::get_attributes ( const Security::AttributeTypeList & /* attributes */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -253,7 +253,7 @@ TAO_SSLIOP_Credentials::get_attributes ( CORBA::Boolean TAO_SSLIOP_Credentials::is_valid ( Security::UtcT_out expiry_time - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { X509 *x = this->x509_.in (); @@ -301,7 +301,7 @@ TAO_SSLIOP_Credentials::is_valid ( CORBA::Boolean TAO_SSLIOP_Credentials::refresh (const CORBA::Any & /* refresh_data */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Until it is clear the code below is correct, throw a @@ -416,15 +416,15 @@ TAO_SSLIOP_Credentials::hash (void) const TAO_SSLIOP_Credentials_ptr TAO_SSLIOP_Credentials::_narrow (CORBA::Object_ptr obj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { return TAO_SSLIOP_Credentials::_unchecked_narrow (obj - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } TAO_SSLIOP_Credentials_ptr TAO_SSLIOP_Credentials::_unchecked_narrow (CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (CORBA::is_nil (obj)) return TAO_SSLIOP_Credentials::_nil (); @@ -512,10 +512,10 @@ tao_TAO_SSLIOP_Credentials_nil ( TAO_SSLIOP_Credentials_ptr tao_TAO_SSLIOP_Credentials_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return TAO_SSLIOP_Credentials::_narrow (p TAO_ENV_ARG_PARAMETER); + return TAO_SSLIOP_Credentials::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -637,10 +637,10 @@ TAO_SSLIOP_Credentials_var::tao_nil (void) ::TAO_SSLIOP_Credentials_ptr TAO_SSLIOP_Credentials_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::TAO_SSLIOP_Credentials::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::TAO_SSLIOP_Credentials::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h index b3ec3619e01..68f70b49f06 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h @@ -58,7 +58,7 @@ public: static TAO_SSLIOP_Credentials_ptr tao_nil (void); static TAO_SSLIOP_Credentials_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -109,11 +109,11 @@ public: /// Return a duplicate (specifically a deep copy) of this credential /// object. virtual SecurityLevel2::Credentials_ptr copy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the invocation credentials type this object is. @@ -133,79 +133,79 @@ public: * (i.e. Security::SecTargetCredentials) is returned. */ virtual Security::InvocationCredentialsType credentials_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::AuthenticationStatus authentication_state ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * mechanism ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::AssociationOptions accepting_options_supported ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void accepting_options_supported ( Security::AssociationOptions accepting_options_supported - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::AssociationOptions accepting_options_required ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void accepting_options_required ( Security::AssociationOptions accepting_options_required - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::AssociationOptions invocation_options_supported ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void invocation_options_supported ( Security::AssociationOptions invocation_options_supported - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::AssociationOptions invocation_options_required ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void invocation_options_required ( Security::AssociationOptions invocation_options_required - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean get_security_feature ( Security::CommunicationDirection direction, Security::SecurityFeature feature - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean set_attributes ( const Security::AttributeList & requested_attributes, Security::AttributeList_out actual_attributes - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::AttributeList * get_attributes ( const Security::AttributeTypeList & attributes - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Verify that this credential is still valid. virtual CORBA::Boolean is_valid ( Security::UtcT_out expiry_time - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean refresh ( const CORBA::Any & refresh_data - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@{ @@ -244,12 +244,12 @@ public: static TAO_SSLIOP_Credentials_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static TAO_SSLIOP_Credentials_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static TAO_SSLIOP_Credentials_ptr _nil (void) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp index 896c4041c50..b7289fb5256 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp @@ -29,7 +29,7 @@ TAO_SSLIOP_Current::~TAO_SSLIOP_Current (void) SSLIOP::ASN_1_Cert * TAO_SSLIOP_Current::get_peer_certificate ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, SSLIOP::Current::NoContext)) { @@ -63,7 +63,7 @@ TAO_SSLIOP_Current::get_peer_certificate ( SSLIOP::SSL_Cert * TAO_SSLIOP_Current::get_peer_certificate_chain ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, SSLIOP::Current::NoContext)) { @@ -96,7 +96,7 @@ TAO_SSLIOP_Current::get_peer_certificate_chain ( } CORBA::Boolean -TAO_SSLIOP_Current::no_context (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_SSLIOP_Current::no_context (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return (this->implementation () == 0 ? 1 : 0); @@ -132,15 +132,15 @@ TAO_SSLIOP_Current::teardown (TAO_SSLIOP_Current_Impl *prev_impl, TAO_SSLIOP_Current_ptr TAO_SSLIOP_Current::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - return TAO_SSLIOP_Current::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return TAO_SSLIOP_Current::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } TAO_SSLIOP_Current_ptr TAO_SSLIOP_Current::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (CORBA::is_nil (obj)) return TAO_SSLIOP_Current::_nil (); @@ -247,10 +247,10 @@ tao_TAO_SSLIOP_Current_nil ( TAO_SSLIOP_Current_ptr tao_TAO_SSLIOP_Current_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return TAO_SSLIOP_Current::_narrow (p TAO_ENV_ARG_PARAMETER); + return TAO_SSLIOP_Current::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -375,10 +375,10 @@ TAO_SSLIOP_Current_var::tao_nil (void) ::TAO_SSLIOP_Current_ptr TAO_SSLIOP_Current_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::TAO_SSLIOP_Current::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::TAO_SSLIOP_Current::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h index 7c27bf20d1d..a3798369bac 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h @@ -63,7 +63,7 @@ public: /// Return the peer certificate associated with the current /// request. virtual SSLIOP::ASN_1_Cert * get_peer_certificate ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, SSLIOP::Current::NoContext)); @@ -75,7 +75,7 @@ public: /// certficate. However, the certificate chain on the server side /// does NOT contain the peer (client) certificate. virtual SSLIOP::SSL_Cert * get_peer_certificate_chain ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, SSLIOP::Current::NoContext)); @@ -84,7 +84,7 @@ public: /// means of determining whether or not SSL session state is /// available. virtual CORBA::Boolean no_context ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Set the TSS slot ID assigned to this object. @@ -118,12 +118,12 @@ public: static TAO_SSLIOP_Current_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static TAO_SSLIOP_Current_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static TAO_SSLIOP_Current_ptr _nil (void) @@ -197,7 +197,7 @@ public: static TAO_SSLIOP_Current_ptr tao_nil (void); static TAO_SSLIOP_Current_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp index e65c3d59886..2264ace46b3 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp @@ -23,7 +23,7 @@ TAO_SSLIOP_Current_Impl::~TAO_SSLIOP_Current_Impl (void) Security::AttributeList * TAO_SSLIOP_Current_Impl::get_attributes ( const Security::AttributeTypeList &attributes - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong len = attributes.length (); @@ -126,7 +126,7 @@ TAO_SSLIOP_Current_Impl::get_attributes ( SecurityLevel2::ReceivedCredentials_ptr TAO_SSLIOP_Current_Impl::received_credentials ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_SSLIOP_X509_var cert = ::SSL_get_peer_certificate (this->ssl_); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h index db6de036f3d..29d834ea4ef 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h @@ -50,13 +50,13 @@ public: /// SecurityLevel1::Current::get_attributes() method. virtual Security::AttributeList * get_attributes ( const Security::AttributeTypeList &attributes - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// SSLIOP-specific version of the /// SecurityLevel2::Current::received_credentials() method. virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the SSL peer certificate associated with the diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp index 0900543150e..a2778ea49eb 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp @@ -212,7 +212,7 @@ TAO_SSLIOP_Protocol_Factory::init (int argc, int TAO_SSLIOP_Protocol_Factory::register_orb_initializer (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // @todo: This hard-coding should be fixed once SECIOP is @@ -231,7 +231,7 @@ TAO_SSLIOP_Protocol_Factory::register_orb_initializer (void) PortableInterceptor::ORBInitializer_var initializer = tmp; PortableInterceptor::register_orb_initializer (initializer.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Register the SSLIOP ORB initializer. @@ -249,7 +249,7 @@ TAO_SSLIOP_Protocol_Factory::register_orb_initializer (void) initializer = tmp; PortableInterceptor::register_orb_initializer (initializer.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp index f708da783fa..e10055a6dab 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp @@ -25,7 +25,7 @@ TAO_SSLIOP_Server_Invocation_Interceptor:: char * TAO_SSLIOP_Server_Invocation_Interceptor::name ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("TAO_SSLIOP_Server_Invocation_Interceptor"); @@ -33,7 +33,7 @@ TAO_SSLIOP_Server_Invocation_Interceptor::name ( void TAO_SSLIOP_Server_Invocation_Interceptor::destroy ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -42,7 +42,7 @@ TAO_SSLIOP_Server_Invocation_Interceptor::destroy ( void TAO_SSLIOP_Server_Invocation_Interceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr /* ri */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -56,7 +56,7 @@ TAO_SSLIOP_Server_Invocation_Interceptor::receive_request_service_contexts ( // accept or reject requests on a per-object basis // instead on a per-endpoint basis. CORBA::Boolean no_ssl = - this->ssliop_current_->no_context (TAO_ENV_SINGLE_ARG_PARAMETER); + this->ssliop_current_->no_context (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (no_ssl && this->qop_ != Security::SecQOPNoProtection) @@ -70,7 +70,7 @@ TAO_SSLIOP_Server_Invocation_Interceptor::receive_request_service_contexts ( // exception. Otherwise, it will return a DER encoded X509 // certificate. SSLIOP::ASN_1_Cert_var cert = - this->ssliop_current_->get_peer_certificate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->ssliop_current_->get_peer_certificate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // @@ The following debugging code works but I don't think that @@ -128,7 +128,7 @@ TAO_SSLIOP_Server_Invocation_Interceptor::receive_request_service_contexts ( void TAO_SSLIOP_Server_Invocation_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr /* ri */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -137,7 +137,7 @@ TAO_SSLIOP_Server_Invocation_Interceptor::receive_request ( void TAO_SSLIOP_Server_Invocation_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr /* ri */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -145,7 +145,7 @@ TAO_SSLIOP_Server_Invocation_Interceptor::send_reply ( void TAO_SSLIOP_Server_Invocation_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr /* ri */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -154,7 +154,7 @@ TAO_SSLIOP_Server_Invocation_Interceptor::send_exception ( void TAO_SSLIOP_Server_Invocation_Interceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr /* ri */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h index e71ec09950f..433244598e1 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h @@ -61,38 +61,38 @@ public: * PortableInterceptor::ServerRequestInterceptor interface. */ //@{ - virtual char * name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_request ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_reply ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_exception ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_other ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); //@} diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp index a4bf5a6112a..129bc080131 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp @@ -27,12 +27,12 @@ TAO_SSLIOP_ORBInitializer::TAO_SSLIOP_ORBInitializer (Security::QOP qop) void TAO_SSLIOP_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (tao_info.in ())) @@ -63,14 +63,14 @@ TAO_SSLIOP_ORBInitializer::pre_init ( // Register the SSLIOP::Current object reference with the ORB. info->register_initial_reference ("SSLIOPCurrent", ssliop_current.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_SSLIOP_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Note we do not store the SSLIOP::Current as a class member since @@ -84,11 +84,11 @@ TAO_SSLIOP_ORBInitializer::post_init ( // pre_init() method. CORBA::Object_var obj = - info->resolve_initial_references ("SSLIOPCurrent" TAO_ENV_ARG_PARAMETER); + info->resolve_initial_references ("SSLIOPCurrent" ACE_ENV_ARG_PARAMETER); ACE_CHECK; SSLIOP::Current_var ssliop_current = - SSLIOP::Current::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + SSLIOP::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!CORBA::is_nil (ssliop_current.in ())) @@ -99,7 +99,7 @@ TAO_SSLIOP_ORBInitializer::post_init ( if (tao_current != 0) { - size_t slot = this->get_tss_slot_id (info TAO_ENV_ARG_PARAMETER); + size_t slot = this->get_tss_slot_id (info ACE_ENV_ARG_PARAMETER); ACE_CHECK; tao_current->tss_slot (slot); @@ -128,27 +128,27 @@ TAO_SSLIOP_ORBInitializer::post_init ( // Register the SSLIOP secure invocation server request interceptor // with the ORB. info->add_server_request_interceptor (si_interceptor.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Register the SSLIOP-specific vault with the // PrincipalAuthenticator. obj = info->resolve_initial_references ("SecurityManager" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; SecurityLevel2::SecurityManager_var manager = SecurityLevel2::SecurityManager::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; SecurityLevel2::PrincipalAuthenticator_var pa = - manager->principal_authenticator (TAO_ENV_SINGLE_ARG_PARAMETER); + manager->principal_authenticator (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; TAO_PrincipalAuthenticator_var tao_pa = TAO_PrincipalAuthenticator::_narrow (pa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; SecurityReplaceable::Vault_ptr vault; @@ -160,25 +160,25 @@ TAO_SSLIOP_ORBInitializer::post_init ( SecurityReplaceable::Vault_var safe_vault = vault; // :-) tao_pa->register_vault (vault - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } size_t TAO_SSLIOP_ORBInitializer::get_tss_slot_id ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Obtain the Security Service TSS slot ID from the SecurityCurrent // object. CORBA::Object_var obj = info->resolve_initial_references ("SecurityCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); SecurityLevel2::Current_var current = SecurityLevel2::Current::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Security_Current *security_current = diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h index 874ec46fa91..1c610432e8e 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h @@ -53,11 +53,11 @@ public: TAO_SSLIOP_ORBInitializer (Security::QOP qop); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -65,7 +65,7 @@ private: // Obtain the TSS slot ID assigned to the "SSLIOPCurrent" object. size_t get_tss_slot_id ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.cpp index a28808b374b..08c2f808c35 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.cpp @@ -14,7 +14,7 @@ TAO_SSLIOP_ReceivedCredentials::TAO_SSLIOP_ReceivedCredentials (X509 *cert, } SecurityLevel2::Credentials_ptr -TAO_SSLIOP_ReceivedCredentials::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_SSLIOP_ReceivedCredentials::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_SSLIOP_ReceivedCredentials *c = 0; @@ -33,7 +33,7 @@ TAO_SSLIOP_ReceivedCredentials::copy (TAO_ENV_SINGLE_ARG_DECL) Security::InvocationCredentialsType TAO_SSLIOP_ReceivedCredentials::credentials_type ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return Security::SecReceivedCredentials; @@ -41,7 +41,7 @@ TAO_SSLIOP_ReceivedCredentials::credentials_type ( SecurityLevel2::Credentials_ptr TAO_SSLIOP_ReceivedCredentials::accepting_credentials ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -54,7 +54,7 @@ TAO_SSLIOP_ReceivedCredentials::accepting_credentials ( Security::AssociationOptions TAO_SSLIOP_ReceivedCredentials::association_options_used ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -69,7 +69,7 @@ TAO_SSLIOP_ReceivedCredentials::association_options_used ( Security::DelegationState TAO_SSLIOP_ReceivedCredentials::delegation_state ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // It is not possible to perform credentials delegation with SSLIOP, @@ -80,7 +80,7 @@ TAO_SSLIOP_ReceivedCredentials::delegation_state ( Security::DelegationMode TAO_SSLIOP_ReceivedCredentials::delegation_mode ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // SSLIOP does not support delegation. @@ -91,16 +91,16 @@ TAO_SSLIOP_ReceivedCredentials::delegation_mode ( TAO_SSLIOP_ReceivedCredentials_ptr TAO_SSLIOP_ReceivedCredentials::_narrow (CORBA::Object_ptr obj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { return TAO_SSLIOP_ReceivedCredentials::_unchecked_narrow (obj - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } TAO_SSLIOP_ReceivedCredentials_ptr TAO_SSLIOP_ReceivedCredentials::_unchecked_narrow (CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (CORBA::is_nil (obj)) return TAO_SSLIOP_ReceivedCredentials::_nil (); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.h index 820dce9b20a..778a6ac28ae 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.h @@ -52,11 +52,11 @@ public: */ //@{ virtual SecurityLevel2::Credentials_ptr copy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::InvocationCredentialsType credentials_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} @@ -68,19 +68,19 @@ public: */ //@{ virtual SecurityLevel2::Credentials_ptr accepting_credentials ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::AssociationOptions association_options_used ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::DelegationState delegation_state ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::DelegationMode delegation_mode ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} @@ -97,12 +97,12 @@ public: static TAO_SSLIOP_ReceivedCredentials_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static TAO_SSLIOP_ReceivedCredentials_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static TAO_SSLIOP_ReceivedCredentials_ptr _nil (void) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp index 4fd1c9b7c59..eff8dbf4820 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp @@ -15,7 +15,7 @@ TAO_SSLIOP_TargetCredentials::TAO_SSLIOP_TargetCredentials (X509 *cert, } SecurityLevel2::Credentials_ptr -TAO_SSLIOP_TargetCredentials::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_SSLIOP_TargetCredentials::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_SSLIOP_TargetCredentials *c = 0; @@ -34,7 +34,7 @@ TAO_SSLIOP_TargetCredentials::copy (TAO_ENV_SINGLE_ARG_DECL) Security::InvocationCredentialsType TAO_SSLIOP_TargetCredentials::credentials_type ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return Security::SecTargetCredentials; @@ -42,7 +42,7 @@ TAO_SSLIOP_TargetCredentials::credentials_type ( SecurityLevel2::Credentials_ptr TAO_SSLIOP_TargetCredentials::initiating_credentials ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -55,7 +55,7 @@ TAO_SSLIOP_TargetCredentials::initiating_credentials ( Security::AssociationOptions TAO_SSLIOP_TargetCredentials::association_options_used ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -70,16 +70,16 @@ TAO_SSLIOP_TargetCredentials::association_options_used ( TAO_SSLIOP_TargetCredentials_ptr TAO_SSLIOP_TargetCredentials::_narrow (CORBA::Object_ptr obj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { return TAO_SSLIOP_TargetCredentials::_unchecked_narrow (obj - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } TAO_SSLIOP_TargetCredentials_ptr TAO_SSLIOP_TargetCredentials::_unchecked_narrow (CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (CORBA::is_nil (obj)) return TAO_SSLIOP_TargetCredentials::_nil (); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h index c7057863cf6..7bf32d6c168 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h @@ -50,11 +50,11 @@ public: */ //@{ virtual SecurityLevel2::Credentials_ptr copy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::InvocationCredentialsType credentials_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} @@ -66,11 +66,11 @@ public: */ //@{ virtual SecurityLevel2::Credentials_ptr initiating_credentials ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::AssociationOptions association_options_used ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} @@ -87,12 +87,12 @@ public: static TAO_SSLIOP_TargetCredentials_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static TAO_SSLIOP_TargetCredentials_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static TAO_SSLIOP_TargetCredentials_ptr _nil (void) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp index 17f3c2aa201..834df616b15 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp @@ -19,7 +19,7 @@ TAO_SSLIOP_Util::setup_handler_state (TAO_ORB_Core *orb_core, TAO_IIOP_Properties *tcp_properties, TAO_SSLIOP_Connection_Handler_State &s) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Go straight to the object_ref_table in the ORB Core to avoid @@ -29,12 +29,12 @@ TAO_SSLIOP_Util::setup_handler_state (TAO_ORB_Core *orb_core, CORBA::Object_var obj = orb_core->object_ref_table ().resolve_initial_references ( "SSLIOPCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; SSLIOP::Current_var current = SSLIOP::Current::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (current.in ())) @@ -42,7 +42,7 @@ TAO_SSLIOP_Util::setup_handler_state (TAO_ORB_Core *orb_core, TAO_SSLIOP_Current_var tao_current = TAO_SSLIOP_Current::_narrow (current.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (tao_current.in ())) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Vault.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Vault.cpp index be9c69c55d8..b98f379155f 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Vault.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Vault.cpp @@ -67,7 +67,7 @@ TAO_SSLIOP_Vault::~TAO_SSLIOP_Vault (void) Security::AuthenticationMethodList * TAO_SSLIOP_Vault::get_supported_authen_methods ( const char * /* mechanism */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -79,7 +79,7 @@ TAO_SSLIOP_Vault::get_supported_authen_methods ( } Security::OIDList * -TAO_SSLIOP_Vault::supported_mech_oids (TAO_ENV_SINGLE_ARG_DECL) +TAO_SSLIOP_Vault::supported_mech_oids (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -100,7 +100,7 @@ TAO_SSLIOP_Vault::acquire_credentials ( SecurityLevel2::Credentials_out creds, CORBA::Any_out /* continuation_data */, CORBA::Any_out /* auth_specific_data */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Check if we support the given mechanism. @@ -147,7 +147,7 @@ TAO_SSLIOP_Vault::continue_credentials_acquisition ( SecurityLevel2::Credentials_ptr /* creds */, CORBA::Any_out /* continuation_data */, CORBA::Any_out /* auth_specific_data */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -161,7 +161,7 @@ TAO_SSLIOP_Vault::continue_credentials_acquisition ( IOP::TaggedComponentList * TAO_SSLIOP_Vault::create_ior_components ( SecurityLevel2::Credentials_ptr /* creds_list */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -184,7 +184,7 @@ TAO_SSLIOP_Vault::init_security_context ( const Security::ChannelBindings & /* chan_binding */, Security::OpaqueBuffer_out /* security_token */, SecurityReplaceable::ClientSecurityContext_out /* security_context */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -201,7 +201,7 @@ TAO_SSLIOP_Vault::accept_security_context ( const Security::ChannelBindings & /* chan_bindings */, const Security::Opaque & /* in_token */, Security::Opaque_out /* out_token */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -214,7 +214,7 @@ TAO_SSLIOP_Vault::accept_security_context ( Security::MechandOptionsList * TAO_SSLIOP_Vault::get_supported_mechs ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Vault.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Vault.h index b8d61031994..ab699654a5a 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Vault.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Vault.h @@ -66,11 +66,11 @@ public: virtual Security::AuthenticationMethodList * get_supported_authen_methods ( const char * mechanism - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::OIDList * supported_mech_oids ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Authenticate the principal, request privileges and create @@ -93,7 +93,7 @@ public: SecurityLevel2::Credentials_out creds, CORBA::Any_out continuation_data, CORBA::Any_out auth_specific_data - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::AuthenticationStatus continue_credentials_acquisition ( @@ -101,12 +101,12 @@ public: SecurityLevel2::Credentials_ptr creds, CORBA::Any_out continuation_data, CORBA::Any_out auth_specific_data - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual IOP::TaggedComponentList * create_ior_components ( SecurityLevel2::Credentials_ptr creds_list - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::AssociationStatus init_security_context ( @@ -120,7 +120,7 @@ public: const Security::ChannelBindings & chan_binding, Security::OpaqueBuffer_out security_token, SecurityReplaceable::ClientSecurityContext_out security_context - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::AssociationStatus accept_security_context ( @@ -128,11 +128,11 @@ public: const Security::ChannelBindings & chan_bindings, const Security::Opaque & in_token, Security::Opaque_out out_token - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::MechandOptionsList * get_supported_mechs ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp index 8fdf9cde9ee..9b2933bf66b 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp @@ -34,7 +34,7 @@ ACE_Config_Scheduler::~ACE_Config_Scheduler (void) RtecScheduler::handle_t ACE_Config_Scheduler::create (const char * entry_point - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME)) { @@ -86,7 +86,7 @@ ACE_Config_Scheduler::create (const char * entry_point RtecScheduler::handle_t ACE_Config_Scheduler::lookup (const char * entry_point - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { RtecScheduler::RT_Info* rt_info = 0; @@ -108,7 +108,7 @@ ACE_Config_Scheduler::lookup (const char * entry_point RtecScheduler::RT_Info* ACE_Config_Scheduler::get (RtecScheduler::handle_t handle - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)) { @@ -144,7 +144,7 @@ void ACE_Config_Scheduler::set (RtecScheduler::handle_t handle, RtecScheduler::Quantum_t quantum, CORBA::Long threads, RtecScheduler::Info_Type_t info_type - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)) { @@ -176,7 +176,7 @@ void ACE_Config_Scheduler::priority (RtecScheduler::handle_t handle, RtecScheduler::OS_Priority& priority, RtecScheduler::Preemption_Subpriority_t& p_subpriority, RtecScheduler::Preemption_Priority_t& p_priority - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::NOT_SCHEDULED)) @@ -193,14 +193,14 @@ void ACE_Config_Scheduler::entry_point_priority (const char * entry_point, RtecScheduler::OS_Priority& priority, RtecScheduler::Preemption_Subpriority_t& p_subpriority, RtecScheduler::Preemption_Priority_t& p_priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::NOT_SCHEDULED)) { - this->priority (lookup (entry_point TAO_ENV_ARG_PARAMETER), + this->priority (lookup (entry_point ACE_ENV_ARG_PARAMETER), priority, p_subpriority, p_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void ACE_Config_Scheduler::add_dependency (RtecScheduler::handle_t handle, @@ -208,7 +208,7 @@ void ACE_Config_Scheduler::add_dependency (RtecScheduler::handle_t handle, CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t dependency_type - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)) { @@ -244,7 +244,7 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority, RtecScheduler::RT_Info_Set_out infos, RtecScheduler::Config_Info_Set_out configs, RtecScheduler::Scheduling_Anomaly_Set_out anomalies - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UTILIZATION_BOUND_EXCEEDED, RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS, @@ -445,7 +445,7 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority, void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority, RtecScheduler::OS_Priority& priority, RtecScheduler::Dispatching_Type_t & d_type - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::NOT_SCHEDULED, RtecScheduler::UNKNOWN_PRIORITY_LEVEL)) @@ -462,7 +462,7 @@ void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Pri RtecScheduler::Preemption_Priority_t -ACE_Config_Scheduler::last_scheduled_priority (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ACE_Config_Scheduler::last_scheduled_priority (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::NOT_SCHEDULED)) { diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h index ab2efe18810..7288bb466dc 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h @@ -37,15 +37,15 @@ public: virtual ~ACE_Config_Scheduler (void); virtual RtecScheduler::handle_t create (const char * entry_point - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME)); virtual RtecScheduler::handle_t lookup (const char * entry_point - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC((CORBA::SystemException)); virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)); virtual void set (RtecScheduler::handle_t handle, @@ -58,14 +58,14 @@ public: RtecScheduler::Quantum_t quantum, CORBA::Long threads, RtecScheduler::Info_Type_t info_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)); virtual void priority (RtecScheduler::handle_t handle, RtecScheduler::OS_Priority& priority, RtecScheduler::Preemption_Subpriority_t& p_subpriority, RtecScheduler::Preemption_Priority_t& p_priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::NOT_SCHEDULED)); @@ -74,7 +74,7 @@ public: RtecScheduler::OS_Priority& priority, RtecScheduler::Preemption_Subpriority_t& p_subpriority, RtecScheduler::Preemption_Priority_t& p_priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::NOT_SCHEDULED)); @@ -83,7 +83,7 @@ public: RtecScheduler::handle_t dependency, CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t dependency_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)); @@ -92,7 +92,7 @@ public: RtecScheduler::RT_Info_Set_out infos, RtecScheduler::Config_Info_Set_out configs, RtecScheduler::Scheduling_Anomaly_Set_out anomalies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC((CORBA::SystemException, RtecScheduler::UTILIZATION_BOUND_EXCEEDED, RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS, @@ -101,14 +101,14 @@ public: virtual void dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority, RtecScheduler::OS_Priority& priority, RtecScheduler::Dispatching_Type_t & d_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::NOT_SCHEDULED, RtecScheduler::UNKNOWN_PRIORITY_LEVEL)); // provide the thread priority and queue type for the given priority level virtual RtecScheduler::Preemption_Priority_t - last_scheduled_priority (TAO_ENV_SINGLE_ARG_DECL) + last_scheduled_priority (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::NOT_SCHEDULED)); // Returns the last priority number assigned to an operation in the diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp index 22449341278..cd0d5ef21a5 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp @@ -88,7 +88,7 @@ TAO_Reconfig_Scheduler (int config_count, this->init (config_count, config_infos, rt_info_count, rt_infos, dependency_count, dependency_infos, - stability_flags TAO_ENV_ARG_PARAMETER); + stability_flags ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, corba_sysex) @@ -110,7 +110,7 @@ init (int config_count, int dependency_count, ACE_Scheduler_Factory::POD_Dependency_Info dependency_info[], u_long stability_flags - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME, RtecScheduler::UNKNOWN_TASK, @@ -124,7 +124,7 @@ init (int config_count, int result = 0; // Clear out the previous entries, if any. - this->close (TAO_ENV_SINGLE_ARG_PARAMETER); + this->close (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // (Re)initialize using the new settings. @@ -185,7 +185,7 @@ init (int config_count, { new_rt_info = create_i (rt_info [num_rt_infos].entry_point, rt_info [num_rt_infos].handle - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Fill in the portions to which the user has access. @@ -218,7 +218,7 @@ init (int config_count, dependency_info [dependency_count_].info_depended_on, dependency_info [dependency_count_].number_of_calls, dependency_info [dependency_count_].dependency_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } @@ -233,7 +233,7 @@ init (int config_count, // Closes the scheduler, releasing all current resources. template void -TAO_Reconfig_Scheduler::close (TAO_ENV_SINGLE_ARG_DECL) +TAO_Reconfig_Scheduler::close (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::SYNCHRONIZATION_FAILURE)) @@ -306,7 +306,7 @@ template RtecScheduler::handle_t TAO_Reconfig_Scheduler:: create (const char *entry_point - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME, RtecScheduler::INTERNAL, @@ -317,7 +317,7 @@ create (const char *entry_point ACE_CHECK_RETURN (0); RtecScheduler::handle_t handle = next_handle_; - create_i (entry_point, handle TAO_ENV_ARG_PARAMETER); + create_i (entry_point, handle ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (handle); // Set affected stability flags. @@ -335,7 +335,7 @@ template RtecScheduler::handle_t TAO_Reconfig_Scheduler:: lookup (const char * entry_point - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::SYNCHRONIZATION_FAILURE)) @@ -345,7 +345,7 @@ lookup (const char * entry_point ACE_CHECK_RETURN (0); RtecScheduler::handle_t handle; - handle = this->lookup_i (entry_point TAO_ENV_ARG_PARAMETER); + handle = this->lookup_i (entry_point ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (handle); return handle; @@ -358,7 +358,7 @@ template RtecScheduler::RT_Info * TAO_Reconfig_Scheduler:: get (RtecScheduler::handle_t handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::SYNCHRONIZATION_FAILURE)) @@ -402,7 +402,7 @@ set (RtecScheduler::handle_t handle, RtecScheduler::Quantum_t quantum, CORBA::Long threads, RtecScheduler::Info_Type_t info_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::INTERNAL, @@ -506,7 +506,7 @@ priority (RtecScheduler::handle_t handle, RtecScheduler::OS_Priority& o_priority, RtecScheduler::Preemption_Subpriority_t& subpriority, RtecScheduler::Preemption_Priority_t& p_priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::SYNCHRONIZATION_FAILURE, @@ -545,7 +545,7 @@ entry_point_priority (const char * entry_point, RtecScheduler::OS_Priority& priority, RtecScheduler::Preemption_Subpriority_t& subpriority, RtecScheduler::Preemption_Priority_t& p_priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::SYNCHRONIZATION_FAILURE, @@ -556,14 +556,14 @@ entry_point_priority (const char * entry_point, ACE_CHECK; RtecScheduler::handle_t handle = - this->lookup_i (entry_point TAO_ENV_ARG_PARAMETER); + this->lookup_i (entry_point ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->priority_i (handle, priority, subpriority, p_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -577,7 +577,7 @@ add_dependency (RtecScheduler::handle_t handle /* RT_Info that has the dependenc RtecScheduler::handle_t dependency /* RT_Info on which it depends */, CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t dependency_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::SYNCHRONIZATION_FAILURE, RtecScheduler::UNKNOWN_TASK)) @@ -588,7 +588,7 @@ add_dependency (RtecScheduler::handle_t handle /* RT_Info that has the dependenc // Delegate to the internal method. add_dependency_i (handle, dependency, number_of_calls, - dependency_type TAO_ENV_ARG_PARAMETER); + dependency_type ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Since the call graph topology has changed, set *all* @@ -611,7 +611,7 @@ compute_scheduling (CORBA::Long minimum_priority, RtecScheduler::RT_Info_Set_out infos, RtecScheduler::Config_Info_Set_out configs, RtecScheduler::Scheduling_Anomaly_Set_out anomalies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UTILIZATION_BOUND_EXCEEDED, RtecScheduler::SYNCHRONIZATION_FAILURE, @@ -640,16 +640,16 @@ compute_scheduling (CORBA::Long minimum_priority, if (this->stability_flags_ & SCHED_PROPAGATION_NOT_STABLE) { // Traverse dependency graph, assigning a topological ordering and identifying threads. - dfs_traverse_i (TAO_ENV_SINGLE_ARG_PARAMETER); + dfs_traverse_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Sort an array of RT_info handles in topological order, check // for loops using the strongly connected components algorithm. - detect_cycles_i (TAO_ENV_SINGLE_ARG_PARAMETER); + detect_cycles_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Propagate effective execution time and period, set total frame size. - propagate_characteristics_i (TAO_ENV_SINGLE_ARG_PARAMETER); + propagate_characteristics_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -658,14 +658,14 @@ compute_scheduling (CORBA::Long minimum_priority, // Sort operations by urgency (done by strategy), then // assign priorities and subpriorities in one pass. // Sets last scheduled priority. - assign_priorities_i (TAO_ENV_SINGLE_ARG_PARAMETER); + assign_priorities_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } if (this->stability_flags_ & SCHED_UTILIZATION_NOT_STABLE) { // Compute utilization, set last feasible priority. - compute_utilization_i (TAO_ENV_SINGLE_ARG_PARAMETER); + compute_utilization_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -737,7 +737,7 @@ TAO_Reconfig_Scheduler:: dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority, RtecScheduler::OS_Priority& t_priority, RtecScheduler::Dispatching_Type_t & d_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::NOT_SCHEDULED, RtecScheduler::SYNCHRONIZATION_FAILURE, @@ -773,7 +773,7 @@ dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority, template RtecScheduler::Preemption_Priority_t TAO_Reconfig_Scheduler:: -last_scheduled_priority (TAO_ENV_SINGLE_ARG_DECL) +last_scheduled_priority (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::SYNCHRONIZATION_FAILURE, RtecScheduler::NOT_SCHEDULED)) @@ -803,7 +803,7 @@ RtecScheduler::RT_Info * TAO_Reconfig_Scheduler:: create_i (const char *entry_point, RtecScheduler::handle_t handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME, RtecScheduler::INTERNAL)) @@ -986,7 +986,7 @@ template RtecScheduler::handle_t TAO_Reconfig_Scheduler:: lookup_i (const char * entry_point - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)) { @@ -1009,7 +1009,7 @@ priority_i (RtecScheduler::handle_t handle, RtecScheduler::OS_Priority& o_priority, RtecScheduler::Preemption_Subpriority_t& subpriority, RtecScheduler::Preemption_Priority_t& p_priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::NOT_SCHEDULED)) @@ -1041,7 +1041,7 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende RtecScheduler::handle_t dependency /* RT_Info on which it depends */, CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t dependency_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::INTERNAL, RtecScheduler::UNKNOWN_TASK)) @@ -1065,7 +1065,7 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende calling_dependency_set_map_, // calling map number_of_calls, dependency_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Add the called dependency map entry @@ -1074,7 +1074,7 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende called_dependency_set_map_, // called map number_of_calls, dependency_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; break; @@ -1089,7 +1089,7 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende calling_dependency_set_map_, // calling map number_of_calls, dependency_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Add the called dependency map entry @@ -1098,7 +1098,7 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende called_dependency_set_map_, // called map number_of_calls, dependency_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; break; @@ -1124,7 +1124,7 @@ map_dependency_i (RtecScheduler::handle_t key, ACE_LOCK> & map, CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t dependency_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)) { @@ -1162,7 +1162,7 @@ map_dependency_i (RtecScheduler::handle_t key, // has_unresolved_remote_dependencies_, has_unresolved_local_dependencies_, template void TAO_Reconfig_Scheduler:: -dfs_traverse_i (TAO_ENV_SINGLE_ARG_DECL) +dfs_traverse_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::INTERNAL)) { @@ -1197,7 +1197,7 @@ dfs_traverse_i (TAO_ENV_SINGLE_ARG_DECL) // checks for loops, marks unresolved remote dependencies. template void TAO_Reconfig_Scheduler:: -detect_cycles_i (TAO_ENV_SINGLE_ARG_DECL) +detect_cycles_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::INTERNAL, RtecScheduler::CYCLIC_DEPENDENCIES)) @@ -1237,7 +1237,7 @@ detect_cycles_i (TAO_ENV_SINGLE_ARG_DECL) // Propagates effective execution time and period, sets total frame size. template void TAO_Reconfig_Scheduler:: -propagate_characteristics_i (TAO_ENV_SINGLE_ARG_DECL) +propagate_characteristics_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::INTERNAL, RtecScheduler::UNRESOLVED_LOCAL_DEPENDENCIES, @@ -1275,7 +1275,7 @@ propagate_characteristics_i (TAO_ENV_SINGLE_ARG_DECL) // Sets last scheduled priority. template void TAO_Reconfig_Scheduler:: -assign_priorities_i (TAO_ENV_SINGLE_ARG_DECL) +assign_priorities_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::INTERNAL, RtecScheduler::DUPLICATE_NAME)) @@ -1383,7 +1383,7 @@ assign_priorities_i (TAO_ENV_SINGLE_ARG_DECL) // Compute utilization, set last feasible priority. template void TAO_Reconfig_Scheduler:: -compute_utilization_i (TAO_ENV_SINGLE_ARG_DECL) +compute_utilization_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::INTERNAL)) { diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h index 3d5e7c090fd..d067452daf6 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h @@ -94,7 +94,7 @@ public: int dependency_count, ACE_Scheduler_Factory::POD_Dependency_Info dependency_info[], u_long stability_flags - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME, RtecScheduler::UNKNOWN_TASK, @@ -102,14 +102,14 @@ public: RtecScheduler::INTERNAL)); // Initializes the scheduler with the passed information. - void close (TAO_ENV_SINGLE_ARG_DECL) + void close (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::SYNCHRONIZATION_FAILURE)); // Closes the scheduler, releasing all current resources. virtual RtecScheduler::handle_t create (const char * entry_point - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME, RtecScheduler::INTERNAL, @@ -120,7 +120,7 @@ public: // is thrown. virtual RtecScheduler::handle_t lookup (const char * entry_point - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::SYNCHRONIZATION_FAILURE)); @@ -128,7 +128,7 @@ public: // value if it's not present. virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::SYNCHRONIZATION_FAILURE)); @@ -144,7 +144,7 @@ public: RtecScheduler::Quantum_t quantum, CORBA::Long threads, RtecScheduler::Info_Type_t info_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::INTERNAL, @@ -155,7 +155,7 @@ public: RtecScheduler::OS_Priority& o_priority, RtecScheduler::Preemption_Subpriority_t& p_subpriority, RtecScheduler::Preemption_Priority_t& p_priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::SYNCHRONIZATION_FAILURE, @@ -167,7 +167,7 @@ public: RtecScheduler::OS_Priority& o_priority, RtecScheduler::Preemption_Subpriority_t& p_subpriority, RtecScheduler::Preemption_Priority_t& p_priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::SYNCHRONIZATION_FAILURE, @@ -179,7 +179,7 @@ public: RtecScheduler::handle_t dependency, CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t dependency_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::SYNCHRONIZATION_FAILURE, RtecScheduler::UNKNOWN_TASK)); @@ -190,7 +190,7 @@ public: RtecScheduler::RT_Info_Set_out infos, RtecScheduler::Config_Info_Set_out configs, RtecScheduler::Scheduling_Anomaly_Set_out anomalies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UTILIZATION_BOUND_EXCEEDED, RtecScheduler::SYNCHRONIZATION_FAILURE, @@ -206,14 +206,14 @@ public: virtual void dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority, RtecScheduler::OS_Priority& o_priority, RtecScheduler::Dispatching_Type_t & d_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::NOT_SCHEDULED, RtecScheduler::SYNCHRONIZATION_FAILURE, RtecScheduler::UNKNOWN_PRIORITY_LEVEL)); // Provides the thread priority and queue type for the given priority level. - virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (TAO_ENV_SINGLE_ARG_DECL) + virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::SYNCHRONIZATION_FAILURE, RtecScheduler::NOT_SCHEDULED)); @@ -288,7 +288,7 @@ protected: virtual RtecScheduler::RT_Info * create_i (const char * entry_point, RtecScheduler::handle_t handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME, RtecScheduler::INTERNAL)); @@ -310,7 +310,7 @@ protected: // Internal method to set characteristics of the passed RT_Info. virtual RtecScheduler::handle_t lookup_i (const char * entry_point - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)); // Internal method to look up a handle for an RT_Info, and return @@ -320,7 +320,7 @@ protected: RtecScheduler::OS_Priority& o_priority, RtecScheduler::Preemption_Subpriority_t& p_subpriority, RtecScheduler::Preemption_Priority_t& p_priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::NOT_SCHEDULED)); @@ -331,7 +331,7 @@ protected: RtecScheduler::handle_t dependency, CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t dependency_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::INTERNAL, RtecScheduler::UNKNOWN_TASK)); @@ -349,33 +349,33 @@ protected: ACE_LOCK> &map, CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t dependency_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)); // This method installs a dependency in a dependency set map. - virtual void dfs_traverse_i (TAO_ENV_SINGLE_ARG_DECL) + virtual void dfs_traverse_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::INTERNAL)); // Traverses dependency graph, assigning a topological ordering. // Resets DFS map entries, do DFS traversal, constructs DFS map. - virtual void detect_cycles_i (TAO_ENV_SINGLE_ARG_DECL) + virtual void detect_cycles_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::INTERNAL, RtecScheduler::CYCLIC_DEPENDENCIES)); // Sorts an array of RT_info handles in topological order, then // checks for loops, marks unresolved remote dependencies. - virtual void propagate_characteristics_i (TAO_ENV_SINGLE_ARG_DECL) + virtual void propagate_characteristics_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::INTERNAL, RtecScheduler::UNRESOLVED_LOCAL_DEPENDENCIES, RtecScheduler::THREAD_SPECIFICATION)); // Propagates effective execution time and period, sets total frame size. - virtual void assign_priorities_i (TAO_ENV_SINGLE_ARG_DECL) + virtual void assign_priorities_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::INTERNAL, RtecScheduler::DUPLICATE_NAME)); @@ -383,7 +383,7 @@ protected: // assign priorities and subpriorities in one pass. // Sets last scheduled priority. - virtual void compute_utilization_i (TAO_ENV_SINGLE_ARG_DECL) + virtual void compute_utilization_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::INTERNAL)); // Compute utilization, set last feasible priority. diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp index 7c83d45c13d..091f2d250c9 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp @@ -86,10 +86,10 @@ static_server (void) ACE_Null_Mutex>::instance ()) == 0) return 0; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - server_ = ace_scheduler_factory_data->scheduler_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + server_ = ace_scheduler_factory_data->scheduler_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -122,7 +122,7 @@ ACE_Scheduler_Factory::use_config (CosNaming::NamingContext_ptr naming, // config runs. return 0; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CosNaming::Name schedule_name (1); @@ -130,12 +130,12 @@ ACE_Scheduler_Factory::use_config (CosNaming::NamingContext_ptr naming, schedule_name[0].id = CORBA::string_dup (name); CORBA::Object_var objref = naming->resolve (schedule_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; server_ = RtecScheduler::Scheduler::_narrow(objref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.cpp index 33af822572f..0e88335606d 100644 --- a/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.cpp @@ -17,14 +17,14 @@ TAO_EstablishTrustPolicy::~TAO_EstablishTrustPolicy (void) } CORBA::PolicyType -TAO_EstablishTrustPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EstablishTrustPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return Security::SecEstablishTrustPolicy; } CORBA::Policy_ptr -TAO_EstablishTrustPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_EstablishTrustPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_EstablishTrustPolicy *policy = 0; @@ -41,13 +41,13 @@ TAO_EstablishTrustPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_EstablishTrustPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EstablishTrustPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } Security::EstablishTrust -TAO_EstablishTrustPolicy::trust (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EstablishTrustPolicy::trust (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->trust_; diff --git a/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.h b/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.h index 5fd059b6a07..d83f0efe367 100644 --- a/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.h @@ -51,20 +51,20 @@ public: * @name CORBA::Policy Methods */ //@{ - virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} /// Return the "establish trust" value associated with this /// policy. virtual Security::EstablishTrust trust ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.cpp index 9d724bd1bf1..08842a884d3 100644 --- a/TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.cpp @@ -20,14 +20,14 @@ TAO_InvocationCredentialsPolicy::~TAO_InvocationCredentialsPolicy (void) CORBA::PolicyType TAO_InvocationCredentialsPolicy::policy_type ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return Security::SecInvocationCredentialsPolicy; } CORBA::Policy_ptr -TAO_InvocationCredentialsPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_InvocationCredentialsPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_InvocationCredentialsPolicy *policy = 0; @@ -45,13 +45,13 @@ TAO_InvocationCredentialsPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) void TAO_InvocationCredentialsPolicy::destroy ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } SecurityLevel2::CredentialsList * -TAO_InvocationCredentialsPolicy::creds (TAO_ENV_SINGLE_ARG_DECL) +TAO_InvocationCredentialsPolicy::creds (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { SecurityLevel2::CredentialsList *creds = 0; diff --git a/TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.h b/TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.h index 8f9fa4ef129..6482e1815a4 100644 --- a/TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.h @@ -57,20 +57,20 @@ public: */ //@{ virtual CORBA::PolicyType policy_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} /// Return the list of invocation credentials associated with this /// policy. virtual SecurityLevel2::CredentialsList * creds ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.cpp index b5be5045b7a..d5cb2b2d989 100644 --- a/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.cpp @@ -17,14 +17,14 @@ TAO_MechanismPolicy::~TAO_MechanismPolicy (void) } CORBA::PolicyType -TAO_MechanismPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_MechanismPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return Security::SecMechanismsPolicy; } CORBA::Policy_ptr -TAO_MechanismPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_MechanismPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_MechanismPolicy *policy = 0; @@ -41,13 +41,13 @@ TAO_MechanismPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_MechanismPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_MechanismPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } Security::MechanismTypeList * -TAO_MechanismPolicy::mechanisms (TAO_ENV_SINGLE_ARG_DECL) +TAO_MechanismPolicy::mechanisms (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Security::MechanismTypeList *mechs = 0; diff --git a/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.h b/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.h index 7a61ec97227..0e2785c53f9 100644 --- a/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.h @@ -52,19 +52,19 @@ public: * @name CORBA::Policy Methods */ //@{ - virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} /// Return the list of mechanism types associated with this policy. virtual Security::MechanismTypeList mechanisms ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.cpp b/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.cpp index 8d7ae7ea699..f5f8d674bc3 100644 --- a/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.cpp @@ -32,7 +32,7 @@ TAO_PrincipalAuthenticator::~TAO_PrincipalAuthenticator (void) Security::AuthenticationMethodList * TAO_PrincipalAuthenticator::get_supported_authen_methods ( const char * /* mechanism */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { #if 0 @@ -77,7 +77,7 @@ TAO_PrincipalAuthenticator::authenticate ( SecurityLevel2::Credentials_out creds, CORBA::Any_out continuation_data, CORBA::Any_out auth_specific_data - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Security::AuthenticationStatus status = Security::SecAuthFailure; @@ -100,7 +100,7 @@ TAO_PrincipalAuthenticator::authenticate ( creds, continuation_data, auth_specific_data - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Security::SecAuthFailure); if (status == Security::SecAuthSuccess @@ -111,7 +111,7 @@ TAO_PrincipalAuthenticator::authenticate ( if (status == Security::SecAuthSuccess) { this->security_manager_->add_own_credentials (creds - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Security::SecAuthFailure); } @@ -124,7 +124,7 @@ TAO_PrincipalAuthenticator::continue_authentication ( SecurityLevel2::Credentials_ptr creds, CORBA::Any_out continuation_data, CORBA::Any_out auth_specific_data - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Security::AuthenticationStatus status = Security::SecAuthFailure; @@ -144,7 +144,7 @@ TAO_PrincipalAuthenticator::continue_authentication ( creds, continuation_data, auth_specific_data - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Security::SecAuthFailure); if (status == Security::SecAuthSuccess @@ -155,7 +155,7 @@ TAO_PrincipalAuthenticator::continue_authentication ( if (status == Security::SecAuthSuccess) { this->security_manager_->add_own_credentials (creds - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Security::SecAuthFailure); } @@ -165,7 +165,7 @@ TAO_PrincipalAuthenticator::continue_authentication ( void TAO_PrincipalAuthenticator::register_vault ( SecurityReplaceable::Vault_ptr vault - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (!CORBA::is_nil (vault)) { @@ -207,10 +207,10 @@ tao_TAO_PrincipalAuthenticator_nil ( TAO_PrincipalAuthenticator_ptr tao_TAO_PrincipalAuthenticator_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return TAO_PrincipalAuthenticator::_narrow (p TAO_ENV_ARG_PARAMETER); + return TAO_PrincipalAuthenticator::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -333,10 +333,10 @@ TAO_PrincipalAuthenticator_var::tao_nil (void) ::TAO_PrincipalAuthenticator_ptr TAO_PrincipalAuthenticator_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::TAO_PrincipalAuthenticator::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::TAO_PrincipalAuthenticator::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -410,17 +410,17 @@ TAO_PrincipalAuthenticator_out::operator-> (void) TAO_PrincipalAuthenticator_ptr TAO_PrincipalAuthenticator::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { return TAO_PrincipalAuthenticator::_unchecked_narrow (obj - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } TAO_PrincipalAuthenticator_ptr TAO_PrincipalAuthenticator::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) diff --git a/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.h b/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.h index 82b6feb7269..36601d95469 100644 --- a/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.h +++ b/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.h @@ -62,7 +62,7 @@ public: /// mechanism. virtual Security::AuthenticationMethodList * get_supported_authen_methods ( const char * mechanism - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Authenticate the principal, request privileges and create @@ -85,7 +85,7 @@ public: SecurityLevel2::Credentials_out creds, CORBA::Any_out continuation_data, CORBA::Any_out auth_specific_data - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Continue partially completed authentication process. @@ -94,7 +94,7 @@ public: SecurityLevel2::Credentials_ptr creds, CORBA::Any_out continuation_data, CORBA::Any_out auth_specific_data - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} @@ -105,7 +105,7 @@ public: * @note This is a TAO-specific extension. */ void register_vault (SecurityReplaceable::Vault_ptr vault - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** * @name Downcast Related Methods @@ -126,12 +126,12 @@ public: static TAO_PrincipalAuthenticator_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static TAO_PrincipalAuthenticator_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static TAO_PrincipalAuthenticator_ptr _nil (void) @@ -193,7 +193,7 @@ public: static TAO_PrincipalAuthenticator_ptr tao_nil (void); static TAO_PrincipalAuthenticator_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); diff --git a/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.cpp index 7cf77b5dc24..647c40061fc 100644 --- a/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.cpp @@ -16,14 +16,14 @@ TAO_QOPPolicy::~TAO_QOPPolicy (void) } CORBA::PolicyType -TAO_QOPPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_QOPPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return Security::SecQOPPolicy; } CORBA::Policy_ptr -TAO_QOPPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_QOPPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_QOPPolicy *policy = 0; @@ -40,13 +40,13 @@ TAO_QOPPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_QOPPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_QOPPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } Security::QOP -TAO_QOPPolicy::qop (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_QOPPolicy::qop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->qop_; diff --git a/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.h b/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.h index 0579628d355..8af3d440076 100644 --- a/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.h @@ -51,19 +51,19 @@ public: * @name CORBA::Policy Methods */ //@{ - virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} /// Return the Quality-of-Protection value associated with this /// policy. - virtual Security::QOP qop (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual Security::QOP qop (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/orbsvcs/orbsvcs/Security/SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SecurityManager.cpp index ed5f8993976..28ccaa60bbd 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SecurityManager.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SecurityManager.cpp @@ -21,7 +21,7 @@ TAO_SecurityManager::~TAO_SecurityManager (void) } Security::MechandOptionsList * -TAO_SecurityManager::supported_mechanisms (TAO_ENV_SINGLE_ARG_DECL) +TAO_SecurityManager::supported_mechanisms (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -33,7 +33,7 @@ TAO_SecurityManager::supported_mechanisms (TAO_ENV_SINGLE_ARG_DECL) } SecurityLevel2::CredentialsList * -TAO_SecurityManager::own_credentials (TAO_ENV_SINGLE_ARG_DECL) +TAO_SecurityManager::own_credentials (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, @@ -55,7 +55,7 @@ TAO_SecurityManager::own_credentials (TAO_ENV_SINGLE_ARG_DECL) } SecurityLevel2::RequiredRights_ptr -TAO_SecurityManager::required_rights_object (TAO_ENV_SINGLE_ARG_DECL) +TAO_SecurityManager::required_rights_object (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -67,7 +67,7 @@ TAO_SecurityManager::required_rights_object (TAO_ENV_SINGLE_ARG_DECL) } SecurityLevel2::PrincipalAuthenticator_ptr -TAO_SecurityManager::principal_authenticator (TAO_ENV_SINGLE_ARG_DECL) +TAO_SecurityManager::principal_authenticator (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { { @@ -98,7 +98,7 @@ TAO_SecurityManager::principal_authenticator (TAO_ENV_SINGLE_ARG_DECL) } SecurityLevel2::AccessDecision_ptr -TAO_SecurityManager::access_decision (TAO_ENV_SINGLE_ARG_DECL) +TAO_SecurityManager::access_decision (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -110,7 +110,7 @@ TAO_SecurityManager::access_decision (TAO_ENV_SINGLE_ARG_DECL) } SecurityLevel2::AuditDecision_ptr -TAO_SecurityManager::audit_decision (TAO_ENV_SINGLE_ARG_DECL) +TAO_SecurityManager::audit_decision (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -123,7 +123,7 @@ TAO_SecurityManager::audit_decision (TAO_ENV_SINGLE_ARG_DECL) SecurityLevel2::TargetCredentials_ptr TAO_SecurityManager::get_target_credentials (CORBA::Object_ptr /* obj_ref */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -137,7 +137,7 @@ TAO_SecurityManager::get_target_credentials (CORBA::Object_ptr /* obj_ref */ void TAO_SecurityManager::remove_own_credentials ( SecurityLevel2::Credentials_ptr creds - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_); @@ -172,7 +172,7 @@ TAO_SecurityManager::remove_own_credentials ( CORBA::Policy_ptr TAO_SecurityManager::get_security_policy (CORBA::PolicyType /* policy_type */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -185,7 +185,7 @@ TAO_SecurityManager::get_security_policy (CORBA::PolicyType /* policy_type */ void TAO_SecurityManager::add_own_credentials (SecurityLevel2::Credentials_ptr creds - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_); diff --git a/TAO/orbsvcs/orbsvcs/Security/SecurityManager.h b/TAO/orbsvcs/orbsvcs/Security/SecurityManager.h index 9260e4f3565..15667932dc1 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SecurityManager.h +++ b/TAO/orbsvcs/orbsvcs/Security/SecurityManager.h @@ -52,13 +52,13 @@ public: /// Return a sequence containing the security mechanisms supported /// by the Security Service. virtual Security::MechandOptionsList * supported_mechanisms ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the list of Credentials currently associated with the /// application itself, i.e. its own credentials. virtual SecurityLevel2::CredentialsList * own_credentials ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return a reference to the RequiredRights object. @@ -68,7 +68,7 @@ public: * control. */ virtual SecurityLevel2::RequiredRights_ptr required_rights_object ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return a reference to the PrincipalAuthenticator object. @@ -77,7 +77,7 @@ public: * create credentials for them. */ virtual SecurityLevel2::PrincipalAuthenticator_ptr principal_authenticator ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return a reference to the AccessDecision object. @@ -86,7 +86,7 @@ public: * of objects. */ virtual SecurityLevel2::AccessDecision_ptr access_decision ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return a reference to the AuditDecision object. @@ -95,14 +95,14 @@ public: * be audited for a given object. */ virtual SecurityLevel2::AuditDecision_ptr audit_decision ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the TargetCredentials associated with the given object /// reference. virtual SecurityLevel2::TargetCredentials_ptr get_target_credentials ( CORBA::Object_ptr obj_ref - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Remove the given credential from the application's own @@ -114,14 +114,14 @@ public: */ virtual void remove_own_credentials ( SecurityLevel2::Credentials_ptr creds - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the security policy currently in effect corresponding to /// the given policy type. virtual CORBA::Policy_ptr get_security_policy ( CORBA::PolicyType policy_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} @@ -138,7 +138,7 @@ public: * when credentials are created and authenticated. */ void add_own_credentials (SecurityLevel2::Credentials_ptr creds - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); //@} protected: diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp index bccb5842a4d..d0cb2584117 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp @@ -26,7 +26,7 @@ TAO_Security_Current::~TAO_Security_Current (void) Security::AttributeList * TAO_Security_Current::get_attributes ( const Security::AttributeTypeList &attributes - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Security_Current_Impl *impl = this->implementation (); @@ -37,12 +37,12 @@ TAO_Security_Current::get_attributes ( if (impl == 0) ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0); - return impl->get_attributes (attributes TAO_ENV_ARG_PARAMETER); + return impl->get_attributes (attributes ACE_ENV_ARG_PARAMETER); } SecurityLevel2::ReceivedCredentials_ptr TAO_Security_Current::received_credentials ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Security_Current_Impl *impl = this->implementation (); @@ -53,7 +53,7 @@ TAO_Security_Current::received_credentials ( if (impl == 0) ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0); - return impl->received_credentials (TAO_ENV_SINGLE_ARG_PARAMETER); + return impl->received_credentials (ACE_ENV_SINGLE_ARG_PARAMETER); } int @@ -61,7 +61,7 @@ TAO_Security_Current::init (void) { int result = 0; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { int argc = 0; @@ -69,7 +69,7 @@ TAO_Security_Current::init (void) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, this->orb_id_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->orb_core_ = orb.in ()->orb_core (); diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h index 2dd683bf77c..afe05f12842 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h @@ -63,7 +63,7 @@ public: /// given attribute type list associated with the current request. virtual Security::AttributeList * get_attributes ( const Security::AttributeTypeList & attributes - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} @@ -77,7 +77,7 @@ public: /// Return the Credentials received from the client associate with /// the current request. virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h index a911373a459..6de0cea0c47 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h @@ -53,7 +53,7 @@ public: /// given attribute type list associated with the current request. virtual Security::AttributeList * get_attributes ( const Security::AttributeTypeList & attributes - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; //@} @@ -67,7 +67,7 @@ public: /// Return the Credentials received from the client associate with /// the current request. virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; //@} diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp index c7377f36b48..552bd7a9e6f 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp @@ -17,13 +17,13 @@ ACE_RCSID (TAO_Security, void TAO_Security_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Narrow to a TAO_ORBInitInfo object to get access to the // allocate_tss_slot_id() TAO extension. TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (tao_info.in ())) @@ -41,10 +41,10 @@ TAO_Security_ORBInitializer::pre_init ( // Reserve a TSS slot in the ORB core internal TSS resources for the // thread-specific portion of Security::Current. size_t tss_slot = tao_info->allocate_tss_slot_id (0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::String_var orb_id = info->orb_id (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var orb_id = info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Create the SecurityLevel2::Current object. @@ -64,7 +64,7 @@ TAO_Security_ORBInitializer::pre_init ( // ORB. info->register_initial_reference ("SecurityCurrent", security_current.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Create the SecurityLevel2::SecurityManager object. @@ -85,25 +85,25 @@ TAO_Security_ORBInitializer::pre_init ( // ORB. info->register_initial_reference ("SecurityManager", security_manager.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_Security_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->register_policy_factories (info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_Security_ORBInitializer::register_policy_factories ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Register the security policy factories. @@ -121,37 +121,37 @@ TAO_Security_ORBInitializer::register_policy_factories ( type = Security::SecQOPPolicy; info->register_policy_factory (type, policy_factory - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; type = Security::SecMechanismsPolicy; info->register_policy_factory (type, policy_factory - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; type = Security::SecInvocationCredentialsPolicy; info->register_policy_factory (type, policy_factory - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; type = Security::SecFeaturePolicy; // Deprecated info->register_policy_factory (type, policy_factory - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; type = Security::SecDelegationDirectivePolicy; info->register_policy_factory (type, policy_factory - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; type = Security::SecEstablishTrustPolicy; info->register_policy_factory (type, policy_factory - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // ---------------------------------------------------------------- diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h index af1aecce473..d7d0d4490e5 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h @@ -48,11 +48,11 @@ class TAO_Security_Export TAO_Security_ORBInitializer public: virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -60,7 +60,7 @@ private: /// Register Security policy factories. void register_policy_factories ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp index 6d69fbbcd95..ee11a590271 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp @@ -15,7 +15,7 @@ CORBA::Policy_ptr TAO_Security_PolicyFactory::create_policy ( CORBA::PolicyType type, const CORBA::Any &value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)) { diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h index f0f5b66640e..d5c4a57571b 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h @@ -43,7 +43,7 @@ public: virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)); }; diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp index f1e64ebe556..0da9f75664f 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp @@ -19,7 +19,7 @@ TAO_TIO::~TAO_TIO (void) // This is the get method for the attribute time interval. TimeBase::IntervalT -TAO_TIO::time_interval (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_TIO::time_interval (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return attr_time_interval; @@ -34,7 +34,7 @@ TAO_TIO::time_interval (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) CosTime::OverlapType TAO_TIO::spans (CosTime::UTO_ptr uto, CosTime::TIO_out overlap - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TIO *tio = 0; @@ -47,19 +47,19 @@ TAO_TIO::spans (CosTime::UTO_ptr uto, TimeBase::TimeT up1 = this->time_interval ().upper_bound; - TimeBase::TimeT tmp1 = uto->time (TAO_ENV_SINGLE_ARG_PARAMETER); + TimeBase::TimeT tmp1 = uto->time (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - TimeBase::TimeT tmp2 = uto->inaccuracy (TAO_ENV_SINGLE_ARG_PARAMETER); + TimeBase::TimeT tmp2 = uto->inaccuracy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; TimeBase::TimeT lb2 = tmp1 - tmp2; - tmp1 = uto->time (TAO_ENV_SINGLE_ARG_PARAMETER); + tmp1 = uto->time (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - tmp2 = uto->inaccuracy (TAO_ENV_SINGLE_ARG_PARAMETER); + tmp2 = uto->inaccuracy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; TimeBase::TimeT up2 = tmp1 + tmp2; @@ -155,7 +155,7 @@ TAO_TIO::spans (CosTime::UTO_ptr uto, CosTime::OverlapType TAO_TIO::overlaps (CosTime::TIO_ptr tio, CosTime::TIO_out overlap - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TIO *tio_i = 0; @@ -254,7 +254,7 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio, } CosTime::UTO_ptr -TAO_TIO::time (TAO_ENV_SINGLE_ARG_DECL) +TAO_TIO::time (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_UTO *uto = 0; diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h index a9ed61cf860..a6dc5388edc 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h @@ -46,13 +46,13 @@ public: // Destructor. virtual TimeBase::IntervalT time_interval ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // This is the get method for the attribute time interval. virtual CosTime::OverlapType spans (CosTime::UTO_ptr time, CosTime::TIO_out overlap - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This operation returns a value of type OverlapType depending on // how the interval in the object and the time range represented by @@ -63,7 +63,7 @@ public: virtual CosTime::OverlapType overlaps (CosTime::TIO_ptr interval, CosTime::TIO_out overlap - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This operation returns a value of type OverlapType depending on // how the interval in the object and interval in the parameter TIO @@ -71,7 +71,7 @@ public: // parameter overlap contains the overlap interval, otherwise the // out parameter contains the gap between the two intervals. - virtual CosTime::UTO_ptr time (TAO_ENV_SINGLE_ARG_DECL) + virtual CosTime::UTO_ptr time (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns a UTO in which the inaccuracy interval is equal to the // time interval in the TIO and time value is the midpoint of the diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp index 2f9616ef174..30344431070 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp @@ -37,7 +37,7 @@ TAO_Time_Service_Clerk::~TAO_Time_Service_Clerk (void) // in a UTO. CosTime::UTO_ptr -TAO_Time_Service_Clerk::universal_time (TAO_ENV_SINGLE_ARG_DECL) +TAO_Time_Service_Clerk::universal_time (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTime::TimeUnavailable)) { @@ -59,7 +59,7 @@ TAO_Time_Service_Clerk::universal_time (TAO_ENV_SINGLE_ARG_DECL) // implemented currently. CosTime::UTO_ptr -TAO_Time_Service_Clerk::secure_universal_time (TAO_ENV_SINGLE_ARG_DECL) +TAO_Time_Service_Clerk::secure_universal_time (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTime::TimeUnavailable)) { @@ -72,7 +72,7 @@ CosTime::UTO_ptr TAO_Time_Service_Clerk::new_universal_time (TimeBase::TimeT time, TimeBase::InaccuracyT inaccuracy, TimeBase::TdfT tdf - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_UTO *uto = 0; @@ -90,7 +90,7 @@ TAO_Time_Service_Clerk::new_universal_time (TimeBase::TimeT time, CosTime::UTO_ptr TAO_Time_Service_Clerk::uto_from_utc (const TimeBase::UtcT &utc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_UTO *uto = 0; @@ -116,7 +116,7 @@ TAO_Time_Service_Clerk::uto_from_utc (const TimeBase::UtcT &utc CosTime::TIO_ptr TAO_Time_Service_Clerk::new_interval (TimeBase::TimeT lower, TimeBase::TimeT upper - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TIO *tio = 0; diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h index 083f8a8c3b6..16de6ba9bc0 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h @@ -57,13 +57,13 @@ public: ~TAO_Time_Service_Clerk (void); // Destructor. - virtual CosTime::UTO_ptr universal_time (TAO_ENV_SINGLE_ARG_DECL) + virtual CosTime::UTO_ptr universal_time (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTime::TimeUnavailable)); // This operation returns the global time and an estimate of // inaccuracy in a UTO. - virtual CosTime::UTO_ptr secure_universal_time (TAO_ENV_SINGLE_ARG_DECL) + virtual CosTime::UTO_ptr secure_universal_time (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTime::TimeUnavailable)); // This operation returns the global time in a UTO only if the time @@ -74,18 +74,18 @@ public: virtual CosTime::UTO_ptr new_universal_time (TimeBase::TimeT time, TimeBase::InaccuracyT inaccuracy, TimeBase::TdfT tdf - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This creates a new UTO based on the given parameters. virtual CosTime::UTO_ptr uto_from_utc (const TimeBase::UtcT &utc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This creates a new UTO given a time in the UtcT form. virtual CosTime::TIO_ptr new_interval (TimeBase::TimeT lower, TimeBase::TimeT upper - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This creates a new TIO with the given parameters. diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp index 5ba026e5798..9fc02513790 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp @@ -19,7 +19,7 @@ TAO_Time_Service_Server::~TAO_Time_Service_Server (void) // inaccuracy in a UTO. CosTime::UTO_ptr -TAO_Time_Service_Server::universal_time (TAO_ENV_SINGLE_ARG_DECL) +TAO_Time_Service_Server::universal_time (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTime::TimeUnavailable)) { @@ -74,7 +74,7 @@ TAO_Time_Service_Server::universal_time (TAO_ENV_SINGLE_ARG_DECL) // implemented currently. CosTime::UTO_ptr -TAO_Time_Service_Server::secure_universal_time (TAO_ENV_SINGLE_ARG_DECL) +TAO_Time_Service_Server::secure_universal_time (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTime::TimeUnavailable)) { @@ -87,7 +87,7 @@ CosTime::UTO_ptr TAO_Time_Service_Server::new_universal_time (TimeBase::TimeT time, TimeBase::InaccuracyT inaccuracy, TimeBase::TdfT tdf - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_UTO *uto = 0; @@ -107,7 +107,7 @@ TAO_Time_Service_Server::new_universal_time (TimeBase::TimeT time, CosTime::UTO_ptr TAO_Time_Service_Server::uto_from_utc (const TimeBase::UtcT &utc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_UTO *uto = 0; @@ -126,7 +126,7 @@ TAO_Time_Service_Server::uto_from_utc (const TimeBase::UtcT &utc CosTime::TIO_ptr TAO_Time_Service_Server::new_interval (TimeBase::TimeT lower, TimeBase::TimeT upper - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TIO *tio = 0; diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h index 62215491365..095e3be0a68 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h @@ -45,13 +45,13 @@ public: ~TAO_Time_Service_Server (void); // Destructor. - virtual CosTime::UTO_ptr universal_time (TAO_ENV_SINGLE_ARG_DECL) + virtual CosTime::UTO_ptr universal_time (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTime::TimeUnavailable)); // This operation returns the current system time and an estimate of // inaccuracy in a UTO. - virtual CosTime::UTO_ptr secure_universal_time (TAO_ENV_SINGLE_ARG_DECL) + virtual CosTime::UTO_ptr secure_universal_time (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTime::TimeUnavailable)); // This operation returns the current time in a UTO only if the time @@ -61,18 +61,18 @@ public: virtual CosTime::UTO_ptr new_universal_time (TimeBase::TimeT time, TimeBase::InaccuracyT inaccuracy, TimeBase::TdfT tdf - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This creates a new UTO based on the given parameters. virtual CosTime::UTO_ptr uto_from_utc (const TimeBase::UtcT &utc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This creates a new UTO given a time in the UtcT form. virtual CosTime::TIO_ptr new_interval (TimeBase::TimeT lower, TimeBase::TimeT upper - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This creates a new TIO with the given parameters. diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp index 5b2595df2fd..defc778d3db 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp @@ -42,7 +42,7 @@ TAO_UTO::~TAO_UTO (void) // Get Method for the readonly attribute time. TimeBase::TimeT -TAO_UTO::time (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_UTO::time (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return attr_utc_time_.time; @@ -51,7 +51,7 @@ TAO_UTO::time (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) // Get method for the readonly attribute inaccuracy. TimeBase::InaccuracyT -TAO_UTO::inaccuracy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_UTO::inaccuracy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Construct the Inaccuracy from the @@ -66,7 +66,7 @@ TAO_UTO::inaccuracy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) // Get method for the readonly attribute tdf. TimeBase::TdfT -TAO_UTO::tdf (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_UTO::tdf (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return attr_utc_time_.tdf; @@ -75,7 +75,7 @@ TAO_UTO::tdf (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) // Get method for the readonly attribute utc_time. TimeBase::UtcT -TAO_UTO::utc_time (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_UTO::utc_time (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return attr_utc_time_; @@ -85,7 +85,7 @@ TAO_UTO::utc_time (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) // the Base Time, UTC and Distributed Time Sync. Algos. [3]. CosTime::UTO_ptr -TAO_UTO::absolute_time (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_UTO::absolute_time (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; @@ -97,20 +97,20 @@ TAO_UTO::absolute_time (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) CosTime::TimeComparison TAO_UTO::compare_time (CosTime::ComparisonType comparison_type, CosTime::UTO_ptr uto - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { - TimeBase::TimeT uto_time = uto->time (TAO_ENV_SINGLE_ARG_PARAMETER); + TimeBase::TimeT uto_time = uto->time (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; TimeBase::InaccuracyT this_inaccuracy = - this->inaccuracy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->inaccuracy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; TimeBase::InaccuracyT uto_inaccuracy = - uto->inaccuracy (TAO_ENV_SINGLE_ARG_PARAMETER); + uto->inaccuracy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (comparison_type == CosTime::MidC) @@ -172,14 +172,14 @@ TAO_UTO::compare_time (CosTime::ComparisonType comparison_type, CosTime::TIO_ptr TAO_UTO::time_to_interval (CosTime::UTO_ptr uto - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TIO *tio = 0; ACE_TRY { - TimeBase::TimeT uto_time = uto->time (TAO_ENV_SINGLE_ARG_PARAMETER); + TimeBase::TimeT uto_time = uto->time (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (this->time () > uto_time) @@ -216,7 +216,7 @@ TAO_UTO::time_to_interval (CosTime::UTO_ptr uto // time value in the UTO. CosTime::TIO_ptr -TAO_UTO::interval (TAO_ENV_SINGLE_ARG_DECL) +TAO_UTO::interval (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TIO *tio = 0; @@ -224,7 +224,7 @@ TAO_UTO::interval (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { TimeBase::TimeT this_inaccuracy = - this->inaccuracy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->inaccuracy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; TimeBase::TimeT lower = diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h index 4c57b221c4c..3c742d610cd 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h @@ -56,24 +56,24 @@ public: // Destructor. virtual TimeBase::TimeT time ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // For the readonly attribute